* [GIT PULL 3/10] more omap soc clean-up for v3.5 merge window
2012-05-10 18:39 [GIT PULL 1/10] omap non-critical fixes for v3.5 merge window Tony Lindgren
@ 2012-05-10 18:39 ` Tony Lindgren
2012-05-10 18:39 ` [GIT PULL 2/10] " Tony Lindgren
` (11 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Tony Lindgren @ 2012-05-10 18:39 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit b2f44dc29bfab77b10f3a709f14677f51ce3a4cd:
ARM: OMAP: igep0020: Specify the VPLL2 regulator unconditionally (2012-05-09 11:21:45 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-cleanup-renames-for-v3.5
for you to fetch changes up to bb6abcf440c4c861a2131c0651b683dbd2edba84:
ARM: OMAP2+: Kconfig: convert SOC_OMAPAM33XX to SOC_AM33XX (2012-05-10 11:10:07 -0700)
----------------------------------------------------------------
Simplify some SoC config options before things get too unreadable.
Note that this depends on a fix in omap-fixes-non-critical-for-v3.5,
so it's based on that.
----------------------------------------------------------------
Kevin Hilman (2):
ARM: OMAP2+: Kconfig: convert SOC_OMAPTI81XX to SOC_TI81XX
ARM: OMAP2+: Kconfig: convert SOC_OMAPAM33XX to SOC_AM33XX
arch/arm/mach-omap2/Kconfig | 8 ++++----
arch/arm/mach-omap2/common.h | 4 ++--
arch/arm/mach-omap2/io.c | 8 ++++----
arch/arm/mach-omap2/irq.c | 2 +-
drivers/net/ethernet/ti/Kconfig | 2 +-
5 files changed, 12 insertions(+), 12 deletions(-)
^ permalink raw reply [flat|nested] 16+ messages in thread* [GIT PULL 2/10] omap soc clean-up for v3.5 merge window
2012-05-10 18:39 [GIT PULL 1/10] omap non-critical fixes for v3.5 merge window Tony Lindgren
2012-05-10 18:39 ` [GIT PULL 3/10] more omap soc clean-up " Tony Lindgren
@ 2012-05-10 18:39 ` Tony Lindgren
2012-05-10 18:39 ` [GIT PULL 5/10] omap board file changes " Tony Lindgren
` (10 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Tony Lindgren @ 2012-05-10 18:39 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 7a8bcf067d2b11964cb83ce3d753ac2d3ab9843c:
Merge branch 'devel-hwmod' into cleanup (2012-05-08 10:17:32 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-cleanup-for-v3.5
for you to fetch changes up to 2c65e7440d56b3b285d1c95563b4dcce8e40dea3:
GPMC: add ECC control definitions (2012-05-10 09:39:47 -0700)
----------------------------------------------------------------
Clean up to make it easier to add support for new SoCs.
Note that these have a merge dependency to omap-devel-hwmod-for-v3.5
branch for the Makefile changes.
----------------------------------------------------------------
Kevin Hilman (2):
ARM: OMAP: AM35xx: remove redunant cpu_is checks for AM3505
ARM: OMAP: AM35xx: convert 3517 detection/flags to AM35xx
R Sricharan (1):
ARM: OMAP2+: dma: Define dma capabilities register bitfields and use them.
Santosh Shilimkar (6):
ARM: OMAP4: Don't compile cm2xxx_3xxx.c for OMAP4 only builds.
ARM: OMAP2+: Clean up wrapping multiple objects in Makefile
ARM: OMAP4: Remove un-used WakeupGen register defines.
ARM: OMAP: dma: Make use of cpu_class_is_omap2() to avoid future patching.
ARM: All OMAP2PLUS machines use omap2 directory so just add one entry
ARM: OMAP4: Reduce the static IO mapping
Tarun Kanti DebBarma (1):
ARM: OMAP2+: dmtimer: remove redundant sysconfig context restore
Tony Lindgren (2):
Merge branch 'for_3.5/omap_misc_cleanup' of git://gitorious.org/omap-sw-develoment/linux-omap-dev into cleanup-soc
Merge branch 'cleanup-soc' into cleanup
Yegor Yefremov (1):
GPMC: add ECC control definitions
arch/arm/Makefile | 4 +-
arch/arm/mach-omap2/Makefile | 167 ++++++++++-----------
arch/arm/mach-omap2/dma.c | 11 +-
arch/arm/mach-omap2/gpmc.c | 30 +++-
arch/arm/mach-omap2/hsmmc.c | 8 +-
arch/arm/mach-omap2/id.c | 7 +-
arch/arm/mach-omap2/include/mach/omap-wakeupgen.h | 8 -
arch/arm/mach-omap2/io.c | 30 ----
arch/arm/mach-omap2/iomap.h | 28 ----
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 2 +-
arch/arm/mach-omap2/powerdomains3xxx_data.c | 2 +-
arch/arm/mach-omap2/usb-musb.c | 2 +-
arch/arm/mach-omap2/voltagedomains3xxx_data.c | 2 +-
arch/arm/plat-omap/dma.c | 4 +-
arch/arm/plat-omap/dmtimer.c | 2 -
arch/arm/plat-omap/include/plat/cpu.h | 8 +
arch/arm/plat-omap/include/plat/dma.h | 5 +
arch/arm/plat-omap/include/plat/dmtimer.h | 1 -
18 files changed, 137 insertions(+), 184 deletions(-)
^ permalink raw reply [flat|nested] 16+ messages in thread* [GIT PULL 5/10] omap board file changes for v3.5 merge window
2012-05-10 18:39 [GIT PULL 1/10] omap non-critical fixes for v3.5 merge window Tony Lindgren
2012-05-10 18:39 ` [GIT PULL 3/10] more omap soc clean-up " Tony Lindgren
2012-05-10 18:39 ` [GIT PULL 2/10] " Tony Lindgren
@ 2012-05-10 18:39 ` Tony Lindgren
2012-05-10 18:39 ` [GIT PULL 7/10] omap device init clean-up for v3.5 Tony Lindgren
` (9 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Tony Lindgren @ 2012-05-10 18:39 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit a8822e2d570bc265c9fa0347710fbcc7bef8b327:
Merge branch 'for_3.4/pm/smps-regulator' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into pm-regulator (2012-04-30 10:08:29 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-board-for-v3.5
for you to fetch changes up to 8500746fab2fd69843425fa82192a4e377905336:
OMAP: omap4panda: Use common configuration for V1V8, V2V1 supplies (2012-05-09 14:22:39 -0700)
----------------------------------------------------------------
Board specific changes for omap.
Note that these are based on omap-pm-regulator-for-v3.5 as
both branches are adding twl regulators.
----------------------------------------------------------------
Ameya Palande (1):
ARM: OMAP: rx51: Platform support for lis3lv02d accelerometer
Ashwin Bihari (1):
Add MSUB support for the LogicPD OMAP3530 DevKits
Govindraj.R (1):
ARM: OMAP: omap2plus_defconfig: Enable ehci-omap and sms95xx support
Igor Grinberg (1):
ARM: OMAP3: cm-t35: add support for power off
Javier Martinez Canillas (2):
ARM: OMAP2+: nand: Make board_onenand_init() visible to board code
ARM: OMAP3: igep0020: Add support for Micron NAND Flash storage memory
Mans Rullgard (1):
ARM: OMAP2+: craneboard: register emac device
Mircea Gherzan (1):
ARM: OMAP: WiLink platform data for the PandaBoard
Peter Ujfalusi (3):
OMAP4: twl-common: Add twl6030 V1V8, V2V1 SMPS common configuration
OMAP: 4430SDP: Use common configuration for V1V8, V2V1 supplies
OMAP: omap4panda: Use common configuration for V1V8, V2V1 supplies
Ricardo Neri (3):
ARM: OMAP: devices: Register platform devices for HDMI audio
ARM: OMAP4: board-4430sdp: Register platform device for HDMI audio codec
ARM: OMAP4: board-omap4panda: Register platform device for HDMI audio codec
Russ Dill (1):
ARM: OMAP: Mark Beagleboard-xM MMC bus as 4-bit
Santosh Shilimkar (1):
ARM: OMAP2PLUS: Enable HIGHMEM
arch/arm/configs/omap2plus_defconfig | 2 +
arch/arm/mach-omap2/Kconfig | 1 +
arch/arm/mach-omap2/board-4430sdp.c | 10 ++-
arch/arm/mach-omap2/board-am3517crane.c | 2 +
arch/arm/mach-omap2/board-cm-t35.c | 5 ++
arch/arm/mach-omap2/board-flash.c | 4 +-
arch/arm/mach-omap2/board-flash.h | 11 ++++
arch/arm/mach-omap2/board-igep0020.c | 74 +++++++++-------------
arch/arm/mach-omap2/board-omap3beagle.c | 7 +-
arch/arm/mach-omap2/board-omap3logic.c | 26 +++++++-
arch/arm/mach-omap2/board-omap4panda.c | 24 ++++++-
arch/arm/mach-omap2/board-rx51-peripherals.c | 88 +++++++++++++++++++++++++-
arch/arm/mach-omap2/devices.c | 31 +++++++++
arch/arm/mach-omap2/twl-common.c | 43 +++++++++++++
arch/arm/mach-omap2/twl-common.h | 2 +
include/linux/ti_wilink_st.h | 2 +
16 files changed, 280 insertions(+), 52 deletions(-)
^ permalink raw reply [flat|nested] 16+ messages in thread* [GIT PULL 7/10] omap device init clean-up for v3.5
2012-05-10 18:39 [GIT PULL 1/10] omap non-critical fixes for v3.5 merge window Tony Lindgren
` (2 preceding siblings ...)
2012-05-10 18:39 ` [GIT PULL 5/10] omap board file changes " Tony Lindgren
@ 2012-05-10 18:39 ` Tony Lindgren
2012-05-10 18:39 ` [GIT PULL 4/10] updates for omap PRCM (Power, Reset, Clock Management) Tony Lindgren
` (8 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Tony Lindgren @ 2012-05-10 18:39 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 65c98038394e65228490ef44353f5d4665690f55:
Merge branch 'fixes-non-critical' into cleanup-devices (2012-05-09 14:32:44 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-cleanup-devices-for-v3.5
for you to fetch changes up to 6c432f72b2bd75f7c427eec5558c72f62b35d4a0:
ARM: OMAP1: Pass dma request lines in platform data to MMC driver (2012-05-09 16:35:12 -0700)
----------------------------------------------------------------
Changes to split plat-omap/devices.c into mach-omap1 and mach-omap2
except for the RNG driver that will be done later on.
As this depends on omap-devel-hwmod-data-for-v3.5 and causes merge
conflict with omap-fixes-non-critical-for-v3.5, this branch is based
on merge of the two.
----------------------------------------------------------------
Tony Lindgren (6):
ARM: OMAP1: Move omap_init_audio() to keep the devices in alphabetical order
ARM: OMAP1: Move omap_init_uwire to mach-omap1
ARM: OMAP2+: Move omap_dsp_reserve_sdram_memblock() to mach-omap2
ARM: OMAP2: Use hwmod to initialize mmc for 2420
ARM: OMAP: Move omap_mmc_add() to mach-omap1
ARM: OMAP1: Pass dma request lines in platform data to MMC driver
arch/arm/mach-omap1/devices.c | 121 +++++++++++++++++++++++++++++---
arch/arm/mach-omap2/devices.c | 19 ++++-
arch/arm/mach-omap2/dsp.c | 27 +++++++-
arch/arm/plat-omap/devices.c | 122 ---------------------------------
arch/arm/plat-omap/include/plat/mmc.h | 9 ---
5 files changed, 151 insertions(+), 147 deletions(-)
^ permalink raw reply [flat|nested] 16+ messages in thread* [GIT PULL 4/10] updates for omap PRCM (Power, Reset, Clock Management)
2012-05-10 18:39 [GIT PULL 1/10] omap non-critical fixes for v3.5 merge window Tony Lindgren
` (3 preceding siblings ...)
2012-05-10 18:39 ` [GIT PULL 7/10] omap device init clean-up for v3.5 Tony Lindgren
@ 2012-05-10 18:39 ` Tony Lindgren
2012-05-10 18:39 ` [GIT PULL 6/10] omap hwmod data additions for v3.5, depends on devel-prcm Tony Lindgren
` (7 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Tony Lindgren @ 2012-05-10 18:39 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 1df82cd6d7673006ae2ecbe8745bcf44f61c53a8:
Merge tag 'omap-devel-a-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-hwmod (2012-04-19 17:45:33 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-prcm-for-v3.5
for you to fetch changes up to 743a6d923f803c861a24d173e1d1818ca8ac0384:
Merge tag 'omap-devel-b-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-prcm (2012-05-08 11:49:09 -0700)
----------------------------------------------------------------
Updates for PRCM (Power, Reset, Clock Management).
Note that this depends on omap-devel-hwmod-for-v3.5.
----------------------------------------------------------------
Kevin Hilman (3):
ARM: OMAP3: clock data: replace 3503/3517 flag with AM35x flag for UART4
ARM: OMAP3: clock data: treat all AM35x devices the same
ARM: OMAP: clock: convert AM3517/3505 detection/flags to AM35xx
Mark A. Greer (1):
arm: omap3: clockdomain data: Remove superfluous commas from gfx_sgx_3xxx_wkdeps[]
Paul Walmsley (2):
ARM: OMAP3: clock data: add clockdomain for HDQ functional clock
Merge branches 'clock_am35xx_cleanup_3.5', 'prm_cm_devel_a_3.5', 'clock_devel_a_3.5' and 'pwrdm_clkdm_cleanup_3.5' into prcm_devel_a_3.5
R Sricharan (1):
ARM: OMAP4+: Add prm and cm base init function.
Rajendra Nayak (1):
ARM: OMAP3: Fix CM register bit masks
Santosh Shilimkar (1):
ARM: OMAP2+: powerdomain: Get rid off duplicate pwrdm_clkdm_state_switch() API
Tarun Kanti DebBarma (1):
ARM: OMAP2+: dmtimer: cleanup iclk usage
Tony Lindgren (1):
Merge tag 'omap-devel-b-for-3.5' of git://git.kernel.org/.../pjw/omap-pending into devel-prcm
Vaibhav Bedia (1):
ARM: OMAP3+: dpll: Configure autoidle mode only if it's supported
Vaibhav Hiremath (1):
ARM: OMAP2/3: Add idle_st bits for ST_32KSYNC timer to prcm-common header
arch/arm/mach-omap2/clock.c | 2 +-
arch/arm/mach-omap2/clock3xxx_data.c | 25 +++++++---------------
arch/arm/mach-omap2/clock44xx_data.c | 11 ----------
arch/arm/mach-omap2/clockdomain.c | 7 +++----
arch/arm/mach-omap2/clockdomains3xxx_data.c | 6 +++---
arch/arm/mach-omap2/cm-regbits-34xx.h | 4 ++--
arch/arm/mach-omap2/cminst44xx.c | 28 ++++++++++++++++---------
arch/arm/mach-omap2/common.c | 1 +
arch/arm/mach-omap2/common.h | 1 +
arch/arm/mach-omap2/dpll3xxx.c | 23 +++++++++++++++-----
arch/arm/mach-omap2/powerdomain.c | 10 ---------
arch/arm/mach-omap2/powerdomain.h | 1 -
arch/arm/mach-omap2/prcm-common.h | 17 +++++++++++++++
arch/arm/mach-omap2/prcm.c | 8 +++++++
arch/arm/mach-omap2/prminst44xx.c | 27 ++++++++++++++----------
arch/arm/mach-omap2/timer.c | 7 -------
arch/arm/plat-omap/include/plat/clkdev_omap.h | 4 +---
arch/arm/plat-omap/include/plat/dmtimer.h | 2 +-
18 files changed, 97 insertions(+), 87 deletions(-)
^ permalink raw reply [flat|nested] 16+ messages in thread* [GIT PULL 6/10] omap hwmod data additions for v3.5, depends on devel-prcm
2012-05-10 18:39 [GIT PULL 1/10] omap non-critical fixes for v3.5 merge window Tony Lindgren
` (4 preceding siblings ...)
2012-05-10 18:39 ` [GIT PULL 4/10] updates for omap PRCM (Power, Reset, Clock Management) Tony Lindgren
@ 2012-05-10 18:39 ` Tony Lindgren
2012-05-10 18:39 ` [GIT PULL 9/10] omap devicetree updates for v3.5 merge window Tony Lindgren
` (6 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Tony Lindgren @ 2012-05-10 18:39 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 743a6d923f803c861a24d173e1d1818ca8ac0384:
Merge tag 'omap-devel-b-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-prcm (2012-05-08 11:49:09 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-hwmod-data-for-v3.5
for you to fetch changes up to bfd17879866b36e95c58721da070d9f2ac7f8901:
Merge tag 'omap-devel-c-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-hwmod-data (2012-05-09 09:58:42 -0700)
----------------------------------------------------------------
Data changes related to omap hwmod
----------------------------------------------------------------
Kevin Hilman (1):
ARM: OMAP2+: WDTIMER integration: fix !PM boot crash, disarm timer after hwmod reset
Paul Walmsley (4):
ARM: OMAP2+: HDQ1W: add custom reset function
ARM: OMAP2+: hwmod data: add HDQ/1-wire hwmod shared data
ARM: OMAP3: hwmod data: add HDQ/1-wire hwmod
ARM: OMAP2xxx: hwmod data: add HDQ/1-wire hwmod
Peter Ujfalusi (2):
ARM: OMAP3: hwmod_data: Rename the common irq for McBSP ports
ARM: OMAP4: hwmod_data: Name the common irq for McBSP ports
Shubhrajyoti D (1):
ARM: OMAP4: hwmod data: I2C: add flag for context restore
Tony Lindgren (2):
ARM: OMAP2420: hwmod data: Add MMC hwmod data for 2420
Merge tag 'omap-devel-c-for-3.5' of git://git.kernel.org/.../pjw/omap-pending into devel-hwmod-data
Vaibhav Hiremath (1):
ARM: OMAP2/3: hwmod data: Add 32k-sync timer data to hwmod database
arch/arm/mach-omap2/Makefile | 5 +-
arch/arm/mach-omap2/hdq1w.c | 72 +++++++++++++
arch/arm/mach-omap2/io.c | 18 ----
arch/arm/mach-omap2/msdi.c | 88 +++++++++++++++
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 112 ++++++++++++++++++++
arch/arm/mach-omap2/omap_hwmod_2430_data.c | 47 ++++++++
.../omap_hwmod_2xxx_3xxx_interconnect_data.c | 9 ++
.../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 22 ++++
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 23 +++-
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 94 ++++++++++++++--
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 12 ++-
arch/arm/mach-omap2/omap_hwmod_common_data.h | 5 +
arch/arm/mach-omap2/wd_timer.c | 45 ++++++++
arch/arm/mach-omap2/wd_timer.h | 1 +
arch/arm/plat-omap/include/plat/hdq1w.h | 36 +++++++
arch/arm/plat-omap/include/plat/mmc.h | 4 +
16 files changed, 562 insertions(+), 31 deletions(-)
create mode 100644 arch/arm/mach-omap2/hdq1w.c
create mode 100644 arch/arm/mach-omap2/msdi.c
create mode 100644 arch/arm/plat-omap/include/plat/hdq1w.h
^ permalink raw reply [flat|nested] 16+ messages in thread* [GIT PULL 9/10] omap devicetree updates for v3.5 merge window
2012-05-10 18:39 [GIT PULL 1/10] omap non-critical fixes for v3.5 merge window Tony Lindgren
` (5 preceding siblings ...)
2012-05-10 18:39 ` [GIT PULL 6/10] omap hwmod data additions for v3.5, depends on devel-prcm Tony Lindgren
@ 2012-05-10 18:39 ` Tony Lindgren
2012-05-10 18:39 ` [GIT PULL 10/10] omap dss clean up " Tony Lindgren
` (5 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Tony Lindgren @ 2012-05-10 18:39 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit b3431f5ba402a98a89b78a9408b4972d8870df4d:
arm/dts: OMAP3: Add mmc controller nodes and board data (2012-03-14 21:54:57 +0100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-dt-for-v3.5
for you to fetch changes up to 40364b9f5a4d167d97bb6a76cd239ca8cfff056a:
arm/dts: omap4-panda: Add LEDs support (2012-05-09 17:18:03 -0700)
----------------------------------------------------------------
Minor DT updates based on the dt-missed-3.4 branch
----------------------------------------------------------------
Benoit Cousson (3):
arm/dts: twl4030: Add twl4030-gpio node
arm/dts: omap4-sdp: Add LEDs support
arm/dts: omap4-panda: Add LEDs support
Peter Ujfalusi (2):
OMAP4: devices: Do not create dmic device if the dtb has been provided
OMAP4: devices: Do not create mcpdm device if the dtb has been provided
arch/arm/boot/dts/omap4-panda.dts | 15 +++++++++++++
arch/arm/boot/dts/omap4-sdp.dts | 43 +++++++++++++++++++++++++++++++++++++
arch/arm/boot/dts/twl4030.dtsi | 8 +++++++
arch/arm/mach-omap2/devices.c | 7 +++---
4 files changed, 70 insertions(+), 3 deletions(-)
^ permalink raw reply [flat|nested] 16+ messages in thread* [GIT PULL 10/10] omap dss clean up for v3.5 merge window
2012-05-10 18:39 [GIT PULL 1/10] omap non-critical fixes for v3.5 merge window Tony Lindgren
` (6 preceding siblings ...)
2012-05-10 18:39 ` [GIT PULL 9/10] omap devicetree updates for v3.5 merge window Tony Lindgren
@ 2012-05-10 18:39 ` Tony Lindgren
2012-05-10 18:39 ` [GIT PULL 8/10] omap timer cleanup " Tony Lindgren
` (4 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Tony Lindgren @ 2012-05-10 18:39 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit d48b97b403d23f6df0b990cee652bdf9a52337a3:
Linux 3.4-rc6 (2012-05-06 15:07:32 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-cleanup-dss-for-v3.5
for you to fetch changes up to 21f787b356279798a002c68d53628755c84168de:
Merge branch 'for-l-o-3.5' of git://gitorious.org/linux-omap-dss2/linux into cleanup-dss (2012-05-09 08:39:20 -0700)
----------------------------------------------------------------
Clean up for omap DSS board init in preparation for adding DT support.
----------------------------------------------------------------
Tomi Valkeinen (6):
OMAPDSS: panel-dvi: add PD gpio handling
OMAP: board-files: remove custom PD GPIO handling for DVI output
OMAPDSS: TFP410: rename dvi -> tfp410
OMAPDSS: TFP410: rename dvi files to tfp410
OMAPDSS: Taal: move reset gpio handling to taal driver
OMAPDSS: DSI: implement generic DSI pin config
Tony Lindgren (1):
Merge branch 'for-l-o-3.5' of git://gitorious.org/linux-omap-dss2/linux into cleanup-dss
arch/arm/mach-omap2/board-3430sdp.c | 38 +-----
arch/arm/mach-omap2/board-4430sdp.c | 37 ++----
arch/arm/mach-omap2/board-am3517evm.c | 25 +---
arch/arm/mach-omap2/board-cm-t35.c | 30 +----
arch/arm/mach-omap2/board-devkit8000.c | 30 +----
arch/arm/mach-omap2/board-igep0020.c | 32 +----
arch/arm/mach-omap2/board-omap3beagle.c | 37 +-----
arch/arm/mach-omap2/board-omap3evm.c | 29 +----
arch/arm/mach-omap2/board-omap3stalker.c | 29 +----
arch/arm/mach-omap2/board-omap4panda.c | 39 +-----
arch/arm/mach-omap2/board-overo.c | 25 +---
drivers/video/omap2/displays/Kconfig | 8 +-
drivers/video/omap2/displays/Makefile | 2 +-
drivers/video/omap2/displays/panel-taal.c | 22 ++++
.../omap2/displays/{panel-dvi.c => panel-tfp410.c} | 134 +++++++++++---------
drivers/video/omap2/dss/dsi.c | 133 +++++++++----------
include/video/omap-panel-nokia-dsi.h | 3 +
.../{omap-panel-dvi.h => omap-panel-tfp410.h} | 18 ++-
include/video/omapdss.h | 28 ++--
19 files changed, 251 insertions(+), 448 deletions(-)
rename drivers/video/omap2/displays/{panel-dvi.c => panel-tfp410.c} (63%)
rename include/video/{omap-panel-dvi.h => omap-panel-tfp410.h} (63%)
^ permalink raw reply [flat|nested] 16+ messages in thread* [GIT PULL 8/10] omap timer cleanup for v3.5 merge window
2012-05-10 18:39 [GIT PULL 1/10] omap non-critical fixes for v3.5 merge window Tony Lindgren
` (7 preceding siblings ...)
2012-05-10 18:39 ` [GIT PULL 10/10] omap dss clean up " Tony Lindgren
@ 2012-05-10 18:39 ` Tony Lindgren
[not found] ` <E1SSYIv-0006IZ-NG@merlin.infradead.org>
` (3 subsequent siblings)
12 siblings, 0 replies; 16+ messages in thread
From: Tony Lindgren @ 2012-05-10 18:39 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit bfd17879866b36e95c58721da070d9f2ac7f8901:
Merge tag 'omap-devel-c-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-hwmod-data (2012-05-09 09:58:42 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-cleanup-timer-for-v3.5
for you to fetch changes up to 1fe97c8f6a1de67a5f56e029a818903d5bed8017:
ARM: OMAP: Make OMAP clocksource source selection using kernel param (2012-05-09 10:07:05 -0700)
----------------------------------------------------------------
Timer changes to make it easier to support various SoCs
----------------------------------------------------------------
Vaibhav Hiremath (3):
ARM: OMAP1: Add checks for possible error condition in timer_init
ARM: OMAP2+: Replace space with underscore in the name field of system timers
ARM: OMAP: Make OMAP clocksource source selection using kernel param
arch/arm/mach-omap1/common.h | 9 ++-
arch/arm/mach-omap1/time.c | 16 +---
arch/arm/mach-omap1/timer32k.c | 28 ++++++-
arch/arm/mach-omap2/timer.c | 118 +++++++++++++++++++++++-------
arch/arm/plat-omap/counter_32k.c | 91 ++++++++++-------------
arch/arm/plat-omap/include/plat/common.h | 2 +-
6 files changed, 166 insertions(+), 98 deletions(-)
^ permalink raw reply [flat|nested] 16+ messages in thread[parent not found: <E1SSYIv-0006IZ-NG@merlin.infradead.org>]
* [GIT PULL 9/10] omap devicetree updates for v3.5 merge window
[not found] ` <E1SSYIv-0006IZ-NG@merlin.infradead.org>
@ 2012-05-10 18:50 ` Tony Lindgren
0 siblings, 0 replies; 16+ messages in thread
From: Tony Lindgren @ 2012-05-10 18:50 UTC (permalink / raw)
To: linux-arm-kernel
* Tony Lindgren <tony@atomide.com> [120510 11:49]:
> The following changes since commit b3431f5ba402a98a89b78a9408b4972d8870df4d:
>
> arm/dts: OMAP3: Add mmc controller nodes and board data (2012-03-14 21:54:57 +0100)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-dt-for-v3.5
>
> for you to fetch changes up to 40364b9f5a4d167d97bb6a76cd239ca8cfff056a:
>
> arm/dts: omap4-panda: Add LEDs support (2012-05-09 17:18:03 -0700)
>
> ----------------------------------------------------------------
> Minor DT updates based on the dt-missed-3.4 branch
>
> ----------------------------------------------------------------
For this one there's a minor merge conflict, here's a suggested
resolve.
Regards,
Tony
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@@ -743,12 -721,14 +743,15 @@@ static int __init omap2_init_devices(vo
* in alphabetical order so they're easier to sort through.
*/
omap_init_audio();
- omap_init_mcpdm();
- omap_init_dmic();
omap_init_camera();
+ omap_init_hdmi_audio();
omap_init_mbox();
- omap_init_mcspi();
+ /* If dtb is there, the devices will be created dynamically */
+ if (!of_have_populated_dt()) {
+ omap_init_dmic();
+ omap_init_mcpdm();
+ omap_init_mcspi();
+ }
omap_init_pmu();
omap_hdq_init();
omap_init_sti();
^ permalink raw reply [flat|nested] 16+ messages in thread
[parent not found: <E1SSYJA-0006UJ-4H@merlin.infradead.org>]
* [GIT PULL 8/10] omap timer cleanup for v3.5 merge window
[not found] ` <E1SSYJA-0006UJ-4H@merlin.infradead.org>
@ 2012-05-10 18:51 ` Tony Lindgren
2012-05-10 20:24 ` Tony Lindgren
0 siblings, 1 reply; 16+ messages in thread
From: Tony Lindgren @ 2012-05-10 18:51 UTC (permalink / raw)
To: linux-arm-kernel
* Tony Lindgren <tony@atomide.com> [120510 11:49]:
> The following changes since commit bfd17879866b36e95c58721da070d9f2ac7f8901:
>
> Merge tag 'omap-devel-c-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-hwmod-data (2012-05-09 09:58:42 -0700)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-cleanup-timer-for-v3.5
>
> for you to fetch changes up to 1fe97c8f6a1de67a5f56e029a818903d5bed8017:
>
> ARM: OMAP: Make OMAP clocksource source selection using kernel param (2012-05-09 10:07:05 -0700)
>
> ----------------------------------------------------------------
> Timer changes to make it easier to support various SoCs
>
> ----------------------------------------------------------------
And this has a conflict for common headers:
--- a/arch/arm/mach-omap1/common.h
+++ b/arch/arm/mach-omap1/common.h
@@@ -57,16 -56,15 +57,22 @@@ void omap1_init_early(void)
void omap1_init_irq(void);
void omap1_restart(char, const char *);
+extern void __init omap_check_revision(void);
+
+extern void omap1_nand_cmd_ctl(struct mtd_info *mtd, int cmd,
+ unsigned int ctrl);
+
- extern struct sys_timer omap1_timer;
- extern bool omap_32k_timer_init(void);
-
+extern u32 omap_irq_flags;
-
+extern int ocpi_enable(void);
++
+ extern struct sys_timer omap1_timer;
+ #ifdef CONFIG_OMAP_32K_TIMER
+ extern int omap_32k_timer_init(void);
+ #else
+ static inline int __init omap_32k_timer_init(void)
+ {
+ return -ENODEV;
+ }
+ #endif
-extern void __init omap_init_consistent_dma_size(void);
#endif /* __ARCH_ARM_MACH_OMAP1_COMMON_H */
diff --cc arch/arm/plat-omap/include/plat/common.h
index a557b84,55c514b..d1cb6f5
--- a/arch/arm/plat-omap/include/plat/common.h
+++ b/arch/arm/plat-omap/include/plat/common.h
@@@ -30,10 -30,8 +30,10 @@@
#include <plat/i2c.h>
#include <plat/omap_hwmod.h>
- extern int __init omap_init_clocksource_32k(void);
+ extern int __init omap_init_clocksource_32k(void __iomem *vbase);
+extern void __init omap_check_revision(void);
+
extern void omap_reserve(void);
extern int omap_dss_reset(struct omap_hwmod *);
^ permalink raw reply [flat|nested] 16+ messages in thread* [GIT PULL 8/10] omap timer cleanup for v3.5 merge window
2012-05-10 18:51 ` [GIT PULL 8/10] omap timer cleanup " Tony Lindgren
@ 2012-05-10 20:24 ` Tony Lindgren
2012-05-11 7:07 ` Olof Johansson
0 siblings, 1 reply; 16+ messages in thread
From: Tony Lindgren @ 2012-05-10 20:24 UTC (permalink / raw)
To: linux-arm-kernel
* Tony Lindgren <tony@atomide.com> [120510 11:55]:
> * Tony Lindgren <tony@atomide.com> [120510 11:49]:
> > The following changes since commit bfd17879866b36e95c58721da070d9f2ac7f8901:
> >
> > Merge tag 'omap-devel-c-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-hwmod-data (2012-05-09 09:58:42 -0700)
> >
> > are available in the git repository at:
> >
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-cleanup-timer-for-v3.5
> >
> > for you to fetch changes up to 1fe97c8f6a1de67a5f56e029a818903d5bed8017:
> >
> > ARM: OMAP: Make OMAP clocksource source selection using kernel param (2012-05-09 10:07:05 -0700)
> >
> > ----------------------------------------------------------------
> > Timer changes to make it easier to support various SoCs
> >
> > ----------------------------------------------------------------
>
> And this has a conflict for common headers:
...
Also looks like this produces a merge conflict with linux-next
commit bd0493ea (ARM: 7413/1: move read_{boot,persistent}_clock to
the architecture level). To resolve, the line to add
register_persistent_clock(NULL, omap_read_persistent_clock);
needs to be resolved as below.
Regards,
Tony
--- a/arch/arm/plat-omap/counter_32k.c
+++ b/arch/arm/plat-omap/counter_32k.c
@@@ -69,40 -69,55 +70,41 @@@ static void omap_read_persistent_clock(
*ts = *tsp;
}
-int __init omap_init_clocksource_32k(void)
+/**
+ * omap_init_clocksource_32k - setup and register counter 32k as a
+ * kernel clocksource
+ * @pbase: base addr of counter_32k module
+ * @size: size of counter_32k to map
+ *
+ * Returns 0 upon success or negative error code upon failure.
+ *
+ */
+int __init omap_init_clocksource_32k(void __iomem *vbase)
{
- static char err[] __initdata = KERN_ERR
- "%s: can't register clocksource!\n";
-
- if (cpu_is_omap16xx() || cpu_class_is_omap2()) {
- u32 pbase;
- unsigned long size = SZ_4K;
- void __iomem *base;
- struct clk *sync_32k_ick;
-
- if (cpu_is_omap16xx()) {
- pbase = OMAP16XX_TIMER_32K_SYNCHRONIZED;
- size = SZ_1K;
- } else if (cpu_is_omap2420())
- pbase = OMAP2420_32KSYNCT_BASE + 0x10;
- else if (cpu_is_omap2430())
- pbase = OMAP2430_32KSYNCT_BASE + 0x10;
- else if (cpu_is_omap34xx())
- pbase = OMAP3430_32KSYNCT_BASE + 0x10;
- else if (cpu_is_omap44xx())
- pbase = OMAP4430_32KSYNCT_BASE + 0x10;
- else
- return -ENODEV;
-
- /* For this to work we must have a static mapping in io.c for this area */
- base = ioremap(pbase, size);
- if (!base)
- return -ENODEV;
-
- sync_32k_ick = clk_get(NULL, "omap_32ksync_ick");
- if (!IS_ERR(sync_32k_ick))
- clk_enable(sync_32k_ick);
-
- timer_32k_base = base;
-
- /*
- * 120000 rough estimate from the calculations in
- * __clocksource_updatefreq_scale.
- */
- clocks_calc_mult_shift(&persistent_mult, &persistent_shift,
- 32768, NSEC_PER_SEC, 120000);
-
- if (clocksource_mmio_init(base, "32k_counter", 32768, 250, 32,
- clocksource_mmio_readl_up))
- printk(err, "32k_counter");
-
- setup_sched_clock(omap_32k_read_sched_clock, 32, 32768);
- register_persistent_clock(NULL, omap_read_persistent_clock);
+ int ret;
+
+ /*
+ * 32k sync Counter register offset is at 0x10
+ */
+ sync32k_cnt_reg = vbase + OMAP2_32KSYNCNT_CR_OFF;
+
+ /*
+ * 120000 rough estimate from the calculations in
+ * __clocksource_updatefreq_scale.
+ */
+ clocks_calc_mult_shift(&persistent_mult, &persistent_shift,
+ 32768, NSEC_PER_SEC, 120000);
+
+ ret = clocksource_mmio_init(sync32k_cnt_reg, "32k_counter", 32768,
+ 250, 32, clocksource_mmio_readl_up);
+ if (ret) {
+ pr_err("32k_counter: can't register clocksource\n");
+ return ret;
}
+
+ setup_sched_clock(omap_32k_read_sched_clock, 32, 32768);
+ pr_info("OMAP clocksource: 32k_counter at 32768 Hz\n");
++ register_persistent_clock(NULL, omap_read_persistent_clock);
+
return 0;
}
^ permalink raw reply [flat|nested] 16+ messages in thread* [GIT PULL 8/10] omap timer cleanup for v3.5 merge window
2012-05-10 20:24 ` Tony Lindgren
@ 2012-05-11 7:07 ` Olof Johansson
0 siblings, 0 replies; 16+ messages in thread
From: Olof Johansson @ 2012-05-11 7:07 UTC (permalink / raw)
To: linux-arm-kernel
[+sfr]
On Thu, May 10, 2012 at 1:24 PM, Tony Lindgren <tony@atomide.com> wrote:
> * Tony Lindgren <tony@atomide.com> [120510 11:55]:
>> * Tony Lindgren <tony@atomide.com> [120510 11:49]:
>> > The following changes since commit bfd17879866b36e95c58721da070d9f2ac7f8901:
>> >
>> > ? Merge tag 'omap-devel-c-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-hwmod-data (2012-05-09 09:58:42 -0700)
>> >
>> > are available in the git repository at:
>> >
>> >
>> > ? git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-cleanup-timer-for-v3.5
>> >
>> > for you to fetch changes up to 1fe97c8f6a1de67a5f56e029a818903d5bed8017:
>> >
>> > ? ARM: OMAP: Make OMAP clocksource source selection using kernel param (2012-05-09 10:07:05 -0700)
>> >
>> > ----------------------------------------------------------------
>> > Timer changes to make it easier to support various SoCs
>> >
>> > ----------------------------------------------------------------
>>
>> And this has a conflict for common headers:
> ...
>
> Also looks like this produces a merge conflict with linux-next
> commit bd0493ea (ARM: 7413/1: move read_{boot,persistent}_clock to
> the architecture level). To resolve, the line to add
> register_persistent_clock(NULL, omap_read_persistent_clock);
> needs to be resolved as below.
Thanks for the heads up. Stephen, see below for tomorrow's -next rebuild.
-Olof
>
> Regards,
>
> Tony
>
>
> --- a/arch/arm/plat-omap/counter_32k.c
> +++ b/arch/arm/plat-omap/counter_32k.c
> @@@ -69,40 -69,55 +70,41 @@@ static void omap_read_persistent_clock(
> ? ? ? ?*ts = *tsp;
> ?}
>
> ?-int __init omap_init_clocksource_32k(void)
> ?+/**
> ?+ * omap_init_clocksource_32k - setup and register counter 32k as a
> ?+ * kernel clocksource
> ?+ * @pbase: base addr of counter_32k module
> ?+ * @size: size of counter_32k to map
> ?+ *
> ?+ * Returns 0 upon success or negative error code upon failure.
> ?+ *
> ?+ */
> ?+int __init omap_init_clocksource_32k(void __iomem *vbase)
> ?{
> ?- ? ? ?static char err[] __initdata = KERN_ERR
> ?- ? ? ? ? ? ? ? ? ? ? ?"%s: can't register clocksource!\n";
> ?-
> ?- ? ? ?if (cpu_is_omap16xx() || cpu_class_is_omap2()) {
> ?- ? ? ? ? ? ? ?u32 pbase;
> ?- ? ? ? ? ? ? ?unsigned long size = SZ_4K;
> ?- ? ? ? ? ? ? ?void __iomem *base;
> ?- ? ? ? ? ? ? ?struct clk *sync_32k_ick;
> ?-
> ?- ? ? ? ? ? ? ?if (cpu_is_omap16xx()) {
> ?- ? ? ? ? ? ? ? ? ? ? ?pbase = OMAP16XX_TIMER_32K_SYNCHRONIZED;
> ?- ? ? ? ? ? ? ? ? ? ? ?size = SZ_1K;
> ?- ? ? ? ? ? ? ?} else if (cpu_is_omap2420())
> ?- ? ? ? ? ? ? ? ? ? ? ?pbase = OMAP2420_32KSYNCT_BASE + 0x10;
> ?- ? ? ? ? ? ? ?else if (cpu_is_omap2430())
> ?- ? ? ? ? ? ? ? ? ? ? ?pbase = OMAP2430_32KSYNCT_BASE + 0x10;
> ?- ? ? ? ? ? ? ?else if (cpu_is_omap34xx())
> ?- ? ? ? ? ? ? ? ? ? ? ?pbase = OMAP3430_32KSYNCT_BASE + 0x10;
> ?- ? ? ? ? ? ? ?else if (cpu_is_omap44xx())
> ?- ? ? ? ? ? ? ? ? ? ? ?pbase = OMAP4430_32KSYNCT_BASE + 0x10;
> ?- ? ? ? ? ? ? ?else
> ?- ? ? ? ? ? ? ? ? ? ? ?return -ENODEV;
> ?-
> ?- ? ? ? ? ? ? ?/* For this to work we must have a static mapping in io.c for this area */
> ?- ? ? ? ? ? ? ?base = ioremap(pbase, size);
> ?- ? ? ? ? ? ? ?if (!base)
> ?- ? ? ? ? ? ? ? ? ? ? ?return -ENODEV;
> ?-
> ?- ? ? ? ? ? ? ?sync_32k_ick = clk_get(NULL, "omap_32ksync_ick");
> ?- ? ? ? ? ? ? ?if (!IS_ERR(sync_32k_ick))
> ?- ? ? ? ? ? ? ? ? ? ? ?clk_enable(sync_32k_ick);
> ?-
> ?- ? ? ? ? ? ? ?timer_32k_base = base;
> ?-
> ?- ? ? ? ? ? ? ?/*
> ?- ? ? ? ? ? ? ? * 120000 rough estimate from the calculations in
> ?- ? ? ? ? ? ? ? * __clocksource_updatefreq_scale.
> ?- ? ? ? ? ? ? ? */
> ?- ? ? ? ? ? ? ?clocks_calc_mult_shift(&persistent_mult, &persistent_shift,
> ?- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?32768, NSEC_PER_SEC, 120000);
> ?-
> ?- ? ? ? ? ? ? ?if (clocksource_mmio_init(base, "32k_counter", 32768, 250, 32,
> ?- ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?clocksource_mmio_readl_up))
> ?- ? ? ? ? ? ? ? ? ? ? ?printk(err, "32k_counter");
> ?-
> ?- ? ? ? ? ? ? ?setup_sched_clock(omap_32k_read_sched_clock, 32, 32768);
> ?- ? ? ? ? ? ? ?register_persistent_clock(NULL, omap_read_persistent_clock);
> ?+ ? ? ?int ret;
> ?+
> ?+ ? ? ?/*
> ?+ ? ? ? * 32k sync Counter register offset is at 0x10
> ?+ ? ? ? */
> ?+ ? ? ?sync32k_cnt_reg = vbase + OMAP2_32KSYNCNT_CR_OFF;
> ?+
> ?+ ? ? ?/*
> ?+ ? ? ? * 120000 rough estimate from the calculations in
> ?+ ? ? ? * __clocksource_updatefreq_scale.
> ?+ ? ? ? */
> ?+ ? ? ?clocks_calc_mult_shift(&persistent_mult, &persistent_shift,
> ?+ ? ? ? ? ? ? ? ? ? ? ?32768, NSEC_PER_SEC, 120000);
> ?+
> ?+ ? ? ?ret = clocksource_mmio_init(sync32k_cnt_reg, "32k_counter", 32768,
> ?+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?250, 32, clocksource_mmio_readl_up);
> ?+ ? ? ?if (ret) {
> ?+ ? ? ? ? ? ? ?pr_err("32k_counter: can't register clocksource\n");
> ?+ ? ? ? ? ? ? ?return ret;
> ? ? ? ?}
> ?+
> ?+ ? ? ?setup_sched_clock(omap_32k_read_sched_clock, 32, 32768);
> ?+ ? ? ?pr_info("OMAP clocksource: 32k_counter at 32768 Hz\n");
> ++ ? ? ?register_persistent_clock(NULL, omap_read_persistent_clock);
> ?+
> ? ? ? ?return 0;
> ?}
^ permalink raw reply [flat|nested] 16+ messages in thread
[parent not found: <E1SSYJW-0006gd-Dw@merlin.infradead.org>]
* [GIT PULL 10/10] omap dss clean up for v3.5 merge window
[not found] ` <E1SSYJW-0006gd-Dw@merlin.infradead.org>
@ 2012-05-10 18:53 ` Tony Lindgren
0 siblings, 0 replies; 16+ messages in thread
From: Tony Lindgren @ 2012-05-10 18:53 UTC (permalink / raw)
To: linux-arm-kernel
* Tony Lindgren <tony@atomide.com> [120510 11:49]:
> The following changes since commit d48b97b403d23f6df0b990cee652bdf9a52337a3:
>
> Linux 3.4-rc6 (2012-05-06 15:07:32 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-cleanup-dss-for-v3.5
>
> for you to fetch changes up to 21f787b356279798a002c68d53628755c84168de:
>
> Merge branch 'for-l-o-3.5' of git://gitorious.org/linux-omap-dss2/linux into cleanup-dss (2012-05-09 08:39:20 -0700)
>
> ----------------------------------------------------------------
>
> Clean up for omap DSS board init in preparation for adding DT support.
>
> ----------------------------------------------------------------
Merging in this branch should avoid issues in linux-next for the
DSS changes. There's a small merge conflict here too:
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@@ -389,28 -420,16 +373,16 @@@ static struct omap_board_mux board_mux[
/* Display DVI */
#define PANDA_DVI_TFP410_POWER_DOWN_GPIO 0
- static int omap4_panda_enable_dvi(struct omap_dss_device *dssdev)
- {
- gpio_set_value(dssdev->reset_gpio, 1);
- return 0;
- }
-
- static void omap4_panda_disable_dvi(struct omap_dss_device *dssdev)
- {
- gpio_set_value(dssdev->reset_gpio, 0);
- }
-
/* Using generic display panel */
- static struct panel_dvi_platform_data omap4_dvi_panel = {
- .platform_enable = omap4_panda_enable_dvi,
- .platform_disable = omap4_panda_disable_dvi,
- .i2c_bus_num = 3,
+ static struct tfp410_platform_data omap4_dvi_panel = {
+ .i2c_bus_num = 3,
+ .power_down_gpio = PANDA_DVI_TFP410_POWER_DOWN_GPIO,
};
-struct omap_dss_device omap4_panda_dvi_device = {
+static struct omap_dss_device omap4_panda_dvi_device = {
.type = OMAP_DISPLAY_TYPE_DPI,
.name = "dvi",
- .driver_name = "dvi",
+ .driver_name = "tfp410",
.data = &omap4_dvi_panel,
.phy.dpi.data_lines = 24,
.reset_gpio = PANDA_DVI_TFP410_POWER_DOWN_GPIO,
@@@ -478,13 -485,8 +438,8 @@@ static struct omap_dss_board_info omap4
.default_device = &omap4_panda_dvi_device,
};
-void __init omap4_panda_display_init(void)
+static void __init omap4_panda_display_init(void)
{
- int r;
-
- r = omap4_panda_dvi_init();
- if (r)
- pr_err("error initializing panda DVI\n");
omap_display_init(&omap4_panda_dss_data);
^ permalink raw reply [flat|nested] 16+ messages in thread
[parent not found: <E1SSYHG-0005cy-Cu@merlin.infradead.org>]
* [GIT PULL 2/10] omap soc clean-up for v3.5 merge window
[not found] ` <E1SSYHG-0005cy-Cu@merlin.infradead.org>
@ 2012-05-10 18:55 ` Tony Lindgren
0 siblings, 0 replies; 16+ messages in thread
From: Tony Lindgren @ 2012-05-10 18:55 UTC (permalink / raw)
To: linux-arm-kernel
* Tony Lindgren <tony@atomide.com> [120510 11:47]:
> The following changes since commit 7a8bcf067d2b11964cb83ce3d753ac2d3ab9843c:
>
> Merge branch 'devel-hwmod' into cleanup (2012-05-08 10:17:32 -0700)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-cleanup-for-v3.5
>
> for you to fetch changes up to 2c65e7440d56b3b285d1c95563b4dcce8e40dea3:
>
> GPMC: add ECC control definitions (2012-05-10 09:39:47 -0700)
>
> ----------------------------------------------------------------
> Clean up to make it easier to add support for new SoCs.
>
> Note that these have a merge dependency to omap-devel-hwmod-for-v3.5
> branch for the Makefile changes.
>
> ----------------------------------------------------------------
FYI, sets 2/10 and 3/10 have recent commit times as I had to fix a
mismerge in the cleanup branch and drop one patch that was causing build
errors for some cases.
Regards,
Tony
^ permalink raw reply [flat|nested] 16+ messages in thread