Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-14 07:02:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
2b8318881d
linux/arch/arm/mach-davinci
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: arm-soc: SoC updates for 3.8 2012-12-12 12:05:15 -08:00
aemif.c ARM: davinci: move platform_data definitions 2012-09-14 11:16:54 +02:00
asp.h ASoC/ARM: Davinci: McASP: split asp header into platform and audio specific 2012-08-27 11:12:09 -07:00
board-da830-evm.c ARM: davinci: move platform_data definitions 2012-09-14 11:16:54 +02:00
board-da850-evm.c Sound updates for 3.8-rc1 2012-12-13 11:51:23 -08:00
board-dm355-evm.c ARM: davinci: convert platform code to use clk_prepare/clk_unprepare 2012-10-24 16:52:05 +05:30
board-dm355-leopard.c ARM: davinci: convert platform code to use clk_prepare/clk_unprepare 2012-10-24 16:52:05 +05:30
board-dm365-evm.c ARM: davinci: convert platform code to use clk_prepare/clk_unprepare 2012-10-24 16:52:05 +05:30
board-dm644x-evm.c ARM: arm-soc: SoC updates for 3.8 2012-12-12 12:05:15 -08:00
board-dm646x-evm.c ARM: davinci: board-dm646x-evm.c: Remove unecessary semicolon 2012-10-26 13:59:01 +05:30
board-mityomapl138.c ARM: davinci: move platform_data definitions 2012-09-14 11:16:54 +02:00
board-neuros-osd2.c ARM: davinci: convert platform code to use clk_prepare/clk_unprepare 2012-10-24 16:52:05 +05:30
board-omapl138-hawk.c ARM: davinci: use machine specific hook for late init 2012-05-05 14:20:01 +08:00
board-sffsdr.c ARM: davinci: move platform_data definitions 2012-09-14 11:16:54 +02:00
board-tnetv107x-evm.c sections: fix section conflicts in arch/arm/ 2012-10-06 03:04:38 +09:00
cdce949.c arm: fix implicit module.h users by adding it to arch/arm as required. 2011-10-31 19:30:50 -04:00
clock.c ARM: davinci: use machine specific hook for late init 2012-05-05 14:20:01 +08:00
clock.h ARM: davinci: add support for multiple power domains 2011-12-03 00:35:52 +05:30
common.c ARM: davinci: remove obsoleted init_consistent_dma_size() 2012-11-13 10:13:20 +01:00
cp_intc.c ARM: davinci: cp_intc: Add OF support for TI interrupt controller 2012-07-05 14:12:35 +05:30
cpufreq.c ARM: davinci: use machine specific hook for late init 2012-05-05 14:20:01 +08:00
cpuidle.c ARM: davinci: Fix for cpuidle consolidation changes 2012-03-22 01:19:44 -04:00
da8xx-dt.c ARM: davinci: add support for am1808 based EnBW CMC board 2012-10-29 15:43:43 +05:30
da830.c video: da8xx-fb: clk_get on connection id fck 2012-11-27 11:52:40 +02:00
da850.c fbdev changes for 3.8: 2012-12-15 13:03:48 -08:00
davinci.h Sound updates for 3.7-rc1 2012-10-09 07:07:14 +09:00
devices-da8xx.c fbdev changes for 3.8: 2012-12-15 13:03:48 -08:00
devices-tnetv107x.c ARM: davinci: fix return value check by using IS_ERR in tnetv107x_devices_init() 2012-10-30 14:03:31 +05:30
devices.c Sound updates for 3.7-rc1 2012-10-09 07:07:14 +09:00
dm355.c ARM: davinci: sram: switch from iotable to ioremapped regions 2012-10-27 16:28:33 +05:30
dm365.c ARM: davinci: sram: switch from iotable to ioremapped regions 2012-10-27 16:28:33 +05:30
dm644x.c ARM: arm-soc: SoC updates for 3.8 2012-12-12 12:05:15 -08:00
dm646x.c ARM: davinci: sram: switch from iotable to ioremapped regions 2012-10-27 16:28:33 +05:30
dma.c arm-soc: driver specific updates 2012-05-26 12:22:27 -07:00
irq.c Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-19 22:10:05 -07:00
Kconfig ARM: davinci: da850: add DT boot support 2012-10-29 15:24:42 +05:30
Makefile ARM: davinci: da850: add DT boot support 2012-10-29 15:24:42 +05:30
Makefile.boot ARM: davinci: move dtb targets to common location 2012-11-19 22:25:59 -08:00
mux.c Davinci: pinmux - use ioremap() 2010-05-13 10:05:29 -07:00
mux.h Davinci: eliminate pinmux offset verbosity 2010-05-06 15:02:09 -07:00
pm_domain.c video: da8xx-fb: clk_get on connection id fck 2012-11-27 11:52:40 +02:00
pm.c ARM: davinci: use machine specific hook for late init 2012-05-05 14:20:01 +08:00
psc.c ARM: davinci: psc: fix incorrect offsets 2011-12-05 16:47:15 +05:30
serial.c ARM: davinci: serial: provide API to initialze UART clocks 2012-10-27 16:28:31 +05:30
sleep.S Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
sram.c ARM: davinci: add platform hook to fetch the SRAM pool 2012-10-27 16:28:35 +05:30
time.c ARM: davinci: convert platform code to use clk_prepare/clk_unprepare 2012-10-24 16:52:05 +05:30
tnetv107x.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
usb.c ARM: davinci: usb: remove CONFIG_USB_MUSB_HOST etc 2012-10-24 16:37:17 +05:30