Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-19 10:31:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
462738f4f0
linux/arch/arm/mach-shmobile
History
Linus Torvalds 2b8318881d fbdev changes for 3.8: 
OMAPDSS changes, including:
 - use dynanic debug prints
 - OMAP platform dependency removals
 - Creation of compat-layer, helping us to improve omapdrm
 - Misc cleanups, aiming to make omadss more in line with the upcoming common
   display framework
 
 Exynos DP changes for the 3.8 merge window:
 - Device Tree support for Samsung Exynos DP
 - SW Link training is cleaned up.
 - HPD interrupt is supported.
 
 Samsung Framebuffer changes for the 3.8 merge window:
 - The bit definitions of header file are updated.
 - Some minor typos are fixed.
 - Some minor bugs of s3c_fb_check_var() are fixed.
 
 FB related changes for SH Mobile, Freescale DIU
 
 Add support for the Solomon SSD1307 OLED Controller
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJQyvniAAoJEPo9qoy8lh71IqkQAK9LkVjVk6UQRT2/b39hPF6i
 PKPRNYxpLxX5u98hiqQfweukGkuC/cmsAJOh5UwX1lFg0TNua8CEYg0iuHgUtLWE
 gi+HNUhHfGx1+a9yQpTKsiheq7r88IjpghFGahnFhpE4kDzhIROom7B39x8bx9gs
 1vnCptmcIq0IlMlmjIktTHw8R36Fd/8xDVEhEtDccxT9AJSePnKBY8SBuRjiyJfP
 QvXnd131kmHdshQbSVetsEwI1a9NJ9Z6MMRiQK3vtDiBJ7QHUw8wD/+kdR68gQxZ
 NqTC/s478dvx/bR5CIXHrXxQZGfOCJ0GFzT1rlcRMxECcF0dQYNr3Hid3Zas+mPZ
 hABpEJE7nV7LoDGhW3oIWPt6MZVFED/HE0F5QrG3/PWYs5UpTwkI9UTkB8Bx6LcA
 H9ypHzFaOT1SK2/jln9pAfYgo/ITCRf08gcxBvGZUPcybrQy+kbVPdYgDn09cDhR
 u6ax3k/PMF/6JRdpVRNxLaoEHw/G6vtNjoeRJivZzuIOmGDfGwADGcEnrcZEM3NM
 muOjk8TfTJgK+gzWleOfr9CQGiWWp1Tht9vF6TSApq4SEqmOK81EZpucrMXY0t6r
 9+JmFzS1/+75NeY2YjgHCuqRaqVSMiyyOp1eYV9JIY14rKINbj77OHX8xaMm+Leg
 ZU4tirie/oEALaIJUann
 =KVPX
 -----END PGP SIGNATURE-----

Merge tag 'fbdev-for-3.8' of git://gitorious.org/linux-omap-dss2/linux

Pull fbdev changes from Tomi Valkeinen:
 "OMAPDSS changes, including:
   - use dynanic debug prints
   - OMAP platform dependency removals
   - Creation of compat-layer, helping us to improve omapdrm
   - Misc cleanups, aiming to make omadss more in line with the upcoming
     common display framework

  Exynos DP changes for the 3.8 merge window:
   - Device Tree support for Samsung Exynos DP
   - SW Link training is cleaned up.
   - HPD interrupt is supported.

  Samsung Framebuffer changes for the 3.8 merge window:
   - The bit definitions of header file are updated.
   - Some minor typos are fixed.
   - Some minor bugs of s3c_fb_check_var() are fixed.

  FB related changes for SH Mobile, Freescale DIU

  Add support for the Solomon SSD1307 OLED Controller"

* tag 'fbdev-for-3.8' of git://gitorious.org/linux-omap-dss2/linux: (191 commits)
  OMAPDSS: fix TV-out issue with DSI PLL
  Revert "OMAPFB: simplify locking"
  OMAPFB: remove silly loop in fb2display()
  OMAPFB: fix error handling in omapfb_find_best_mode()
  OMAPFB: use devm_kzalloc to allocate omapfb2_device
  OMAPDSS: DISPC: remove dispc fck uses
  OMAPDSS: DISPC: get dss clock rate from dss driver
  drivers/video/console/softcursor.c: remove redundant NULL check before kfree()
  drivers/video: add support for the Solomon SSD1307 OLED Controller
  OMAPDSS: use omapdss_compat_init() in other drivers
  OMAPDSS: export dispc functions
  OMAPDSS: export dss_feat functions
  OMAPDSS: export dss_mgr_ops functions
  OMAPDSS: separate compat files in the Makefile
  OMAPDSS: move display sysfs init to compat layer
  OMAPDSS: DPI: use dispc's check_timings
  OMAPDSS: DISPC: add dispc_ovl_check()
  OMAPDSS: move irq handling to dispc-compat
  OMAPDSS: move omap_dispc_wait_for_irq_interruptible_timeout to dispc-compat.c
  OMAPDSS: move blocking mgr enable/disable to compat layer
  ...

Conflicts:
	arch/arm/mach-davinci/devices-da8xx.c
	arch/arm/plat-omap/common.c
	drivers/media/platform/omap/omap_vout.c
2012-12-15 13:03:48 -08:00
..
include/mach ARM: shmobile: sh7372: sh7372_fsiXck_clk become non-global 2012-11-08 17:52:35 +09:00
board-ag5evm.c ARM: mach-shmobile: ag5evm: Use the backlight API for brightness control 2012-11-21 15:50:02 +01:00
board-ap4evb.c fbdev changes for 3.8: 2012-12-15 13:03:48 -08:00
board-armadillo800eva.c Merge branch 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards2 2012-11-12 21:59:38 +01:00
board-bonito.c ARM: shmobile: use __iomem pointers for MMIO 2012-09-18 10:15:11 +02:00
board-kota2.c ARM: SoC: convert shmobile SMP to SMP operations 2012-09-14 11:14:58 +02:00
board-kzm9d.c ARM: SoC: convert shmobile SMP to SMP operations 2012-09-14 11:14:58 +02:00
board-kzm9g.c ARM: arm-soc: Board updates for 3.8 2012-12-12 12:14:06 -08:00
board-mackerel.c fbdev changes for 3.8: 2012-12-15 13:03:48 -08:00
board-marzen.c ARM: shmobile: marzen: add USB OHCI driver support 2012-11-08 17:52:04 +09:00
clock-emev2.c mach-shmobile: Emma Mobile EV2 DT support V3 2012-05-18 00:14:03 +02:00
clock-r8a7740.c ARM: shmobile: add fsi external clock on r8a7740 2012-11-08 15:22:01 +09:00
clock-r8a7779.c Merge branches 'depends/asoc', 'renesas/boards', 'renesas/soc' and 'renesas/soc2' into next/boards2 2012-11-12 21:59:00 +01:00
clock-sh73a0.c ARM: shmobile: use __iomem pointers for MMIO 2012-09-18 10:15:11 +02:00
clock-sh7372.c ARM: shmobile: sh7372: sh7372_fsiXck_clk become non-global 2012-11-08 17:52:35 +09:00
clock.c ARM: mach-shmobile: rename clk_init() to shmobile_clk_init() 2012-03-12 22:19:43 +01:00
console.c
cpuidle.c ARM: shmobile: Make sh7372 cpuidle handling more straightforward 2012-09-04 01:45:01 +02:00
entry-intc.S ARM: gic: consolidate PPI handling 2011-10-23 13:32:29 +01:00
headsmp.S ARM / mach-shmobile: Invalidate caches when booting secondary cores 2012-05-12 22:13:52 +02:00
hotplug.c ARM: SoC: convert shmobile SMP to SMP operations 2012-09-14 11:14:58 +02:00
intc-r8a7740.c ARM: shmobile: r8a7740: add HDMI interrupt support 2012-06-20 12:27:47 +02:00
intc-r8a7779.c ARM: shmobile: use __iomem pointers for MMIO 2012-09-18 10:15:11 +02:00
intc-sh73a0.c Merge branch 'cleanup/__iomem' into next/cleanup 2012-09-22 10:24:29 -07:00
intc-sh7372.c ARM: shmobile: use __iomem pointers for MMIO 2012-09-18 10:15:11 +02:00
Kconfig ARM: arm-soc: Board updates for 3.8 2012-12-12 12:14:06 -08:00
Makefile ARM: arm-soc: Board updates for 3.8 2012-12-12 12:14:06 -08:00
Makefile.boot ARM: dtb: move all dtb targets to common Makefile 2012-09-20 22:58:17 -07:00
pfc-r8a7740.c ARM: shmobile: move custom gpio functions to sh-gpio.h 2012-09-14 09:21:58 -05:00
pfc-r8a7779.c ARM: shmobile: r8a7779: PFC rename PENCx -> USB_PENCx 2012-11-07 17:11:22 +09:00
pfc-sh73a0.c ARM: shmobile: move custom gpio functions to sh-gpio.h 2012-09-14 09:21:58 -05:00
pfc-sh7372.c ARM: shmobile: move custom gpio functions to sh-gpio.h 2012-09-14 09:21:58 -05:00
platsmp.c ARM: SoC: convert shmobile SMP to SMP operations 2012-09-14 11:14:58 +02:00
pm-r8a7740.c ARM: shmobile: Move r8a7740's PM domain objects to a table 2012-09-04 01:44:57 +02:00
pm-r8a7779.c ARM: shmobile: Move r8a7779's PM domain objects to a table 2012-09-04 01:44:58 +02:00
pm-rmobile.c Power management updates for 3.7-rc1 2012-10-02 18:32:35 -07:00
pm-sh7372.c Power management updates for 3.7-rc1 2012-10-02 18:32:35 -07:00
setup-emev2.c Merge branch 'multiplatform/smp_ops' into next/multiplatform 2012-09-22 00:16:04 -07:00
setup-r8a7740.c ARM: arm-soc: SoC updates for 3.8 2012-12-12 12:05:15 -08:00
setup-r8a7779.c Merge branches 'depends/asoc', 'renesas/boards' and 'renesas/soc' into next/boards2 2012-11-12 21:57:52 +01:00
setup-sh73a0.c ARM: soc: soc-specific updates 2012-10-01 18:24:44 -07:00
setup-sh7372.c ARM: arm-soc: SoC updates for 3.8 2012-12-12 12:05:15 -08:00
sh-gpio.h ARM: soc: multiplatform enablement 2012-10-01 19:11:38 -07:00
sleep-sh7372.S PM / shmobile: Add support for the sh7372 A4S power domain / sleep mode 2011-12-25 23:39:03 +01:00
smp-emev2.c Revert "ARM: shmobile: emev2: Replace modify_scu_cpu_psr with scu_power_mode" 2012-11-13 11:41:09 +09:00
smp-r8a7779.c Revert "ARM: shmobile: r8a7779: Replace modify_scu_cpu_psr with scu_power_mode" 2012-11-13 11:42:54 +09:00
smp-sh73a0.c Revert "ARM: shmobile: sh73a0: Replace modify_scu_cpu_psr with scu_power_mode" 2012-11-13 11:42:28 +09:00
suspend.c ARM: shmobile: use machine specific hook for late init 2012-05-08 20:36:35 +08:00
timer.c ARM / mach-shmobile: Use preset_lpj with calibrate_delay() 2012-05-12 22:21:36 +02:00