* [GIT PULL 1/7] omap non-critical fixes for v3.7 merge window
@ 2012-09-14 2:34 Tony Lindgren
2012-09-14 2:34 ` [GIT PULL 2/7] omap device changes " Tony Lindgren
` (7 more replies)
0 siblings, 8 replies; 11+ messages in thread
From: Tony Lindgren @ 2012-09-14 2:34 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 55d512e245bc7699a8800e23df1a24195dd08217:
Linux 3.6-rc5 (2012-09-08 16:43:45 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-fixes-noncritical-for-v3.7
for you to fetch changes up to 3c5dc4a7daa6e64e39412fe9c7daa298834de623:
ARM: OMAP4: wakeupgen: remove duplicate AUXCOREBOOT* read/write (2012-09-12 21:14:34 -0700)
----------------------------------------------------------------
Non critical omap fixes that we not considered necessary
for the v3.6 -rc cycle.
----------------------------------------------------------------
Paul Walmsley (1):
ARM: OMAP4: wakeupgen: remove duplicate AUXCOREBOOT* read/write
Santosh Shilimkar (1):
ARM: OMAP4: wakeupgen: Fix the typo in AUXCOREBOOT register save
Wei Yongjun (1):
gpio/omap: fix possible memory leak in omap2_gpio_dev_init()
arch/arm/mach-omap2/gpio.c | 2 ++
arch/arm/mach-omap2/omap-wakeupgen.c | 8 +-------
2 files changed, 3 insertions(+), 7 deletions(-)
^ permalink raw reply [flat|nested] 11+ messages in thread* [GIT PULL 2/7] omap device changes for v3.7 merge window
2012-09-14 2:34 [GIT PULL 1/7] omap non-critical fixes for v3.7 merge window Tony Lindgren
@ 2012-09-14 2:34 ` Tony Lindgren
2012-09-14 2:34 ` [GIT PULL 3/7] omap gpmc cleanup " Tony Lindgren
` (6 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Tony Lindgren @ 2012-09-14 2:34 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 55d512e245bc7699a8800e23df1a24195dd08217:
Linux 3.6-rc5 (2012-09-08 16:43:45 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/devel-omap-device-for-v3.7
for you to fetch changes up to 47d85ec2a23552fd3d8b56778a23a5a843c5b9b1:
Merge tag 'for_3.7-omap_device' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-omap-device (2012-09-12 21:17:56 -0700)
----------------------------------------------------------------
Kevin Hilman <khilman@ti.com>:
Updates for omap_device layer for v3.7.
Allows omap_device layer to keep track of driver bound status in order
to make more intelligent decisions about idling unused devices.
----------------------------------------------------------------
Kevin Hilman (3):
ARM: OMAP: omap_device: keep track of driver bound status
ARM: OMAP: omap_device: don't attempt late suspend if no driver bound
ARM: OMAP: omap_device: idle devices with no driver bound
Tony Lindgren (1):
Merge tag 'for_3.7-omap_device' of git://git.kernel.org/.../khilman/linux-omap-pm into devel-omap-device
arch/arm/plat-omap/include/plat/omap_device.h | 2 +
arch/arm/plat-omap/omap_device.c | 56 ++++++++++++++++++++++---
2 files changed, 53 insertions(+), 5 deletions(-)
^ permalink raw reply [flat|nested] 11+ messages in thread* [GIT PULL 3/7] omap gpmc cleanup for v3.7 merge window
2012-09-14 2:34 [GIT PULL 1/7] omap non-critical fixes for v3.7 merge window Tony Lindgren
2012-09-14 2:34 ` [GIT PULL 2/7] omap device changes " Tony Lindgren
@ 2012-09-14 2:34 ` Tony Lindgren
2012-09-14 2:34 ` [GIT PULL 4/7] omap custom atag removal " Tony Lindgren
` (5 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Tony Lindgren @ 2012-09-14 2:34 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit fea7a08acb13524b47711625eebea40a0ede69a0:
Linux 3.6-rc3 (2012-08-22 13:29:06 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-gpmc-fixed-for-v3.7
for you to fetch changes up to 5c4684557b7e37afd42fa35f420f2f28bfb75442:
mtd: nand: omap2: use gpmc provided irqs (2012-08-30 12:53:24 -0700)
----------------------------------------------------------------
Changes for GPMC (General Purpose Memory Controller) that take it
closer for being just a regular device driver.
----------------------------------------------------------------
Afzal Mohammed (10):
ARM: OMAP2+: gpmc: update nand register helper
ARM: OMAP2+: gpmc-nand: update gpmc-nand regs
mtd: nand: omap2: handle nand on gpmc
ARM: OMAP2+: gpmc-nand: update resource with memory
ARM: OMAP2+: gpmc-onenand: provide memory as resource
mtd: nand: omap2: obtain memory from resource
mtd: onenand: omap2: obtain memory from resource
ARM: OMAP2+: gpmc: Modify interrupt handling
ARM: OMAP2+: gpmc-nand: Modify Interrupt handling
mtd: nand: omap2: use gpmc provided irqs
arch/arm/mach-omap2/gpmc-nand.c | 28 ++-
arch/arm/mach-omap2/gpmc-onenand.c | 23 ++-
arch/arm/mach-omap2/gpmc.c | 156 +++++++++++++++--
arch/arm/plat-omap/include/plat/gpmc.h | 19 ++
arch/arm/plat-omap/include/plat/nand.h | 2 +-
drivers/mtd/nand/omap2.c | 301 ++++++++++++++++++++++++--------
drivers/mtd/onenand/omap2.c | 29 +--
7 files changed, 445 insertions(+), 113 deletions(-)
^ permalink raw reply [flat|nested] 11+ messages in thread* [GIT PULL 4/7] omap custom atag removal for v3.7 merge window
2012-09-14 2:34 [GIT PULL 1/7] omap non-critical fixes for v3.7 merge window Tony Lindgren
2012-09-14 2:34 ` [GIT PULL 2/7] omap device changes " Tony Lindgren
2012-09-14 2:34 ` [GIT PULL 3/7] omap gpmc cleanup " Tony Lindgren
@ 2012-09-14 2:34 ` Tony Lindgren
2012-09-14 2:34 ` [GIT PULL 5/7] omap sparse irq and local hardware.h cleanup " Tony Lindgren
` (4 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Tony Lindgren @ 2012-09-14 2:34 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 55d512e245bc7699a8800e23df1a24195dd08217:
Linux 3.6-rc5 (2012-09-08 16:43:45 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/cleanup-omap-tags-for-v3.7
for you to fetch changes up to cf3a6ec2c0a499ef019d25d4dbc79df66e7d3f0c:
ARM: OMAP: remove plat/board.h file (2012-09-10 16:39:21 -0700)
----------------------------------------------------------------
Remove the ancient omap specific atags that are no longer needed.
At some point we were planning to pass the bootloader information
with custom atags that did not work out too well.
There's no need for these any longer as the kernel has been booting
fine without them for quite some time. And Now we have device tree
support that can be used instead.
----------------------------------------------------------------
Igor Grinberg (9):
ARM: OMAP: cleanup struct omap_board_config_kernel
ARM: OMAP: omap3evm: cleanup revision bits
ARM: OMAP: remove the sti console workaround
ARM: OMAP1: remove the crystal type tag parsing
ARM: OMAP: remove the omap custom tags
ARM: OMAP1: move omap1_bl pdata out of arch/arm/*
ARM: OMAP1: move lcd pdata out of arch/arm/*
ARM: OMAP: move debug_card_init() function
ARM: OMAP: remove plat/board.h file
arch/arm/mach-omap1/board-ams-delta.c | 1 -
arch/arm/mach-omap1/board-fsample.c | 1 -
arch/arm/mach-omap1/board-generic.c | 6 -
arch/arm/mach-omap1/board-htcherald.c | 1 -
arch/arm/mach-omap1/board-nokia770.c | 1 -
arch/arm/mach-omap1/board-osk.c | 1 +
arch/arm/mach-omap1/board-palmte.c | 2 +-
arch/arm/mach-omap1/board-palmtt.c | 2 +-
arch/arm/mach-omap1/board-palmz71.c | 2 +-
arch/arm/mach-omap1/board-perseus2.c | 1 -
arch/arm/mach-omap1/board-sx1.c | 1 -
arch/arm/mach-omap1/board-voiceblue.c | 6 -
arch/arm/mach-omap1/clock_data.c | 8 --
arch/arm/mach-omap1/devices.c | 1 -
arch/arm/mach-omap1/serial.c | 1 -
arch/arm/mach-omap2/board-2430sdp.c | 1 -
arch/arm/mach-omap2/board-3430sdp.c | 6 -
arch/arm/mach-omap2/board-3630sdp.c | 6 -
arch/arm/mach-omap2/board-4430sdp.c | 1 -
arch/arm/mach-omap2/board-am3517crane.c | 9 --
arch/arm/mach-omap2/board-am3517evm.c | 6 -
arch/arm/mach-omap2/board-apollon.c | 1 -
arch/arm/mach-omap2/board-cm-t35.c | 6 -
arch/arm/mach-omap2/board-cm-t3517.c | 6 -
arch/arm/mach-omap2/board-devkit8000.c | 1 -
arch/arm/mach-omap2/board-generic.c | 1 -
arch/arm/mach-omap2/board-h4.c | 2 +-
arch/arm/mach-omap2/board-igep0020.c | 1 -
arch/arm/mach-omap2/board-ldp.c | 1 -
arch/arm/mach-omap2/board-n8x0.c | 1 -
arch/arm/mach-omap2/board-omap3beagle.c | 1 -
arch/arm/mach-omap2/board-omap3evm.c | 19 ++--
arch/arm/mach-omap2/board-omap3logic.c | 1 -
arch/arm/mach-omap2/board-omap3pandora.c | 1 -
arch/arm/mach-omap2/board-omap3stalker.c | 6 -
arch/arm/mach-omap2/board-omap3touchbook.c | 1 -
arch/arm/mach-omap2/board-omap4panda.c | 1 -
arch/arm/mach-omap2/board-overo.c | 1 -
arch/arm/mach-omap2/board-rx51-peripherals.c | 1 -
arch/arm/mach-omap2/board-rx51.c | 1 -
arch/arm/mach-omap2/board-ti8168evm.c | 6 -
arch/arm/mach-omap2/board-zoom.c | 1 -
arch/arm/mach-omap2/common.c | 1 -
arch/arm/mach-omap2/devices.c | 1 -
arch/arm/mach-omap2/gpmc-nand.c | 1 -
arch/arm/mach-omap2/gpmc-onenand.c | 1 -
arch/arm/mach-omap2/gpmc-smc91x.c | 1 -
arch/arm/mach-omap2/gpmc-smsc911x.c | 1 -
arch/arm/mach-omap2/pm-debug.c | 1 -
arch/arm/mach-omap2/pm24xx.c | 11 --
arch/arm/mach-omap2/serial.c | 1 -
arch/arm/plat-omap/common.c | 40 -------
arch/arm/plat-omap/counter_32k.c | 1 -
arch/arm/plat-omap/debug-devices.c | 3 -
arch/arm/plat-omap/devices.c | 1 -
arch/arm/plat-omap/fb.c | 2 -
arch/arm/plat-omap/include/plat/board.h | 138 -----------------------
arch/arm/plat-omap/include/plat/debug-devices.h | 9 ++
arch/arm/plat-omap/include/plat/mmc.h | 1 -
arch/arm/plat-omap/include/plat/usb.h | 1 -
arch/arm/plat-omap/sram.c | 1 -
drivers/mmc/host/omap.c | 1 -
drivers/mmc/host/omap_hsmmc.c | 1 -
drivers/mtd/onenand/omap2.c | 2 -
drivers/video/backlight/omap1_bl.c | 2 +-
include/linux/omapfb.h | 7 +-
include/linux/platform_data/omap1_bl.h | 11 ++
67 files changed, 44 insertions(+), 320 deletions(-)
delete mode 100644 arch/arm/plat-omap/include/plat/board.h
create mode 100644 arch/arm/plat-omap/include/plat/debug-devices.h
create mode 100644 include/linux/platform_data/omap1_bl.h
^ permalink raw reply [flat|nested] 11+ messages in thread* [GIT PULL 5/7] omap sparse irq and local hardware.h cleanup for v3.7 merge window
2012-09-14 2:34 [GIT PULL 1/7] omap non-critical fixes for v3.7 merge window Tony Lindgren
` (2 preceding siblings ...)
2012-09-14 2:34 ` [GIT PULL 4/7] omap custom atag removal " Tony Lindgren
@ 2012-09-14 2:34 ` Tony Lindgren
2012-09-14 2:34 ` [GIT PULL 6/7] omap makefile and sparse " Tony Lindgren
` (3 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Tony Lindgren @ 2012-09-14 2:34 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit a1e01703bacbadd22eb4aaca0bbba59bcba7d3b3:
Merge tags 'omap-devel-gpmc-fixed-for-v3.7' and 'cleanup-omap-tags-for-v3.7' into cleanup-sparseirq (2012-09-12 18:05:19 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-cleanup-sparseirq-for-v3.7
for you to fetch changes up to 68cb700c59fae6cd539c9dc1e9f2584f671935a0:
ARM: OMAP1: Move SoC specific headers from plat to mach for omap1 (2012-09-12 18:06:31 -0700)
----------------------------------------------------------------
This branch contains changes needed to make omap2+
work properly with sparse IRQ. It also removes
dependencies to mach/hardware.h. These help moving
things towards ARM single zImage support.
This branch is based on a commit in tty-next
branch with omap-devel-gpmc-fixed-for-v3.7 and
cleanup-omap-tags-for-v3.7 merged in to keep things
compiling and sort out some merge conflicts.
----------------------------------------------------------------
Tony Lindgren (15):
ARM: OMAP1: Move define of OMAP_LCD_DMA to dma.h
ARM: OMAP1: Define OMAP1_INT_I2C locally
ARM: OMAP2+: Make INTCPS_NR_IRQS local for mach-omap2/irq.c
ARM: OMAP2+: Remove unused nand_irq for GPMC
ARM: OMAP2+: Remove hardcoded twl4030 gpio_base, irq_base and irq_end
ARM: OMAP: Move gpio.h to include/linux/platform_data
Input: omap-keypad: Remove dependencies to mach includes
W1: OMAP HDQ1W: Remove dependencies to mach/hardware.h
ARM: OMAP2+: Prepare for irqs.h removal
ARM: OMAP2+: Remove hardcoded IRQs and enable SPARSE_IRQ
ARM: OMAP1: Move plat/irqs.h to mach/irqs.h
ARM: OMAP: Remove unused old gpio-switch.h
ARM: OMAP: Split plat/hardware.h, use local soc.h for omap2+
ARM: OMAP2+ Move SoC specific headers to be local to mach-omap2
ARM: OMAP1: Move SoC specific headers from plat to mach for omap1
arch/arm/mach-omap1/ams-delta-fiq-handler.S | 1 +
arch/arm/mach-omap1/board-ams-delta.c | 1 +
arch/arm/mach-omap1/board-htcherald.c | 2 +-
arch/arm/mach-omap1/board-osk.c | 1 +
arch/arm/mach-omap1/devices.c | 2 +-
arch/arm/mach-omap1/dma.c | 3 +-
arch/arm/mach-omap1/gpio15xx.c | 1 +
arch/arm/mach-omap1/gpio16xx.c | 1 +
arch/arm/mach-omap1/gpio7xx.c | 1 +
arch/arm/mach-omap1/include/mach/ams-delta-fiq.h | 2 -
arch/arm/mach-omap1/include/mach/gpio.h | 2 -
arch/arm/mach-omap1/include/mach/hardware.h | 285 +++++++++++-
arch/arm/mach-omap1/include/mach/irqs.h | 267 +++++++++++-
.../plat => mach-omap1/include/mach}/omap1510.h | 3 +-
.../plat => mach-omap1/include/mach}/omap16xx.h | 3 +-
.../plat => mach-omap1/include/mach}/omap7xx.h | 3 +-
arch/arm/mach-omap1/leds-h2p2-debug.c | 1 +
arch/arm/mach-omap1/leds.c | 1 +
.../include/plat => mach-omap2}/am33xx.h | 0
arch/arm/mach-omap2/board-2430sdp.c | 5 +-
arch/arm/mach-omap2/board-3430sdp.c | 4 -
arch/arm/mach-omap2/board-4430sdp.c | 5 +-
arch/arm/mach-omap2/board-am3517crane.c | 1 -
arch/arm/mach-omap2/board-am3517evm.c | 5 +-
arch/arm/mach-omap2/board-apollon.c | 1 -
arch/arm/mach-omap2/board-cm-t35.c | 4 +-
arch/arm/mach-omap2/board-cm-t3517.c | 3 +-
arch/arm/mach-omap2/board-devkit8000.c | 6 -
arch/arm/mach-omap2/board-flash.c | 4 +-
arch/arm/mach-omap2/board-generic.c | 1 -
arch/arm/mach-omap2/board-h4.c | 3 +-
arch/arm/mach-omap2/board-igep0020.c | 4 +-
arch/arm/mach-omap2/board-ldp.c | 6 -
arch/arm/mach-omap2/board-n8x0.c | 4 +-
arch/arm/mach-omap2/board-omap3beagle.c | 4 -
arch/arm/mach-omap2/board-omap3evm.c | 4 -
arch/arm/mach-omap2/board-omap3logic.c | 17 +-
arch/arm/mach-omap2/board-omap3pandora.c | 4 -
arch/arm/mach-omap2/board-omap3stalker.c | 9 +-
arch/arm/mach-omap2/board-omap3touchbook.c | 4 -
arch/arm/mach-omap2/board-omap4panda.c | 5 +-
arch/arm/mach-omap2/board-overo.c | 5 -
arch/arm/mach-omap2/board-rm680.c | 6 +-
arch/arm/mach-omap2/board-rx51-peripherals.c | 5 +-
arch/arm/mach-omap2/board-rx51.c | 1 -
arch/arm/mach-omap2/board-ti8168evm.c | 2 -
arch/arm/mach-omap2/board-zoom-debugboard.c | 3 +
arch/arm/mach-omap2/board-zoom-display.c | 2 +
arch/arm/mach-omap2/board-zoom-peripherals.c | 6 +-
arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 2 +-
arch/arm/mach-omap2/clkt_dpll.c | 2 +-
arch/arm/mach-omap2/clock.c | 8 +-
arch/arm/mach-omap2/clock2420_data.c | 2 +-
arch/arm/mach-omap2/clock2430.c | 2 +-
arch/arm/mach-omap2/clock2430_data.c | 2 +-
arch/arm/mach-omap2/clock2xxx.c | 2 +-
arch/arm/mach-omap2/clock33xx_data.c | 2 +-
arch/arm/mach-omap2/clock3xxx.c | 2 +-
arch/arm/mach-omap2/clock3xxx_data.c | 2 +-
arch/arm/mach-omap2/clock44xx_data.c | 2 +-
arch/arm/mach-omap2/cm2xxx_3xxx.c | 3 +-
arch/arm/mach-omap2/common-board-devices.c | 1 +
arch/arm/mach-omap2/common.c | 2 +-
arch/arm/mach-omap2/common.h | 9 +-
arch/arm/mach-omap2/control.c | 2 +-
arch/arm/mach-omap2/control.h | 2 +-
arch/arm/mach-omap2/cpuidle34xx.c | 1 -
arch/arm/mach-omap2/devices.c | 18 +-
arch/arm/mach-omap2/dpll3xxx.c | 2 +-
arch/arm/mach-omap2/dpll44xx.c | 2 +-
arch/arm/mach-omap2/emu.c | 3 +-
arch/arm/mach-omap2/gpio.c | 1 +
arch/arm/mach-omap2/gpmc-nand.c | 3 +-
arch/arm/mach-omap2/gpmc-onenand.c | 3 +-
arch/arm/mach-omap2/gpmc-smc91x.c | 2 +
arch/arm/mach-omap2/gpmc.c | 11 +-
arch/arm/mach-omap2/hsmmc.c | 2 +
arch/arm/mach-omap2/i2c.c | 1 -
arch/arm/mach-omap2/id.c | 2 +-
arch/arm/mach-omap2/include/mach/gpio.h | 2 -
arch/arm/mach-omap2/include/mach/hardware.h | 2 -
arch/arm/mach-omap2/include/mach/irqs.h | 2 -
arch/arm/mach-omap2/io.c | 1 +
arch/arm/mach-omap2/irq.c | 5 +-
arch/arm/mach-omap2/mailbox.c | 4 +-
arch/arm/mach-omap2/mcbsp.c | 2 -
arch/arm/mach-omap2/msdi.c | 1 +
arch/arm/mach-omap2/omap-iommu.c | 12 +-
arch/arm/mach-omap2/omap-mpuss-lowpower.c | 3 +-
arch/arm/mach-omap2/omap-smp.c | 2 +-
arch/arm/mach-omap2/omap-wakeupgen.c | 1 +
.../include/plat => mach-omap2}/omap24xx.h | 2 -
.../include/plat => mach-omap2}/omap34xx.h | 2 -
arch/arm/mach-omap2/omap4-common.c | 9 +-
.../include/plat => mach-omap2}/omap44xx.h | 2 +-
.../include/plat => mach-omap2}/omap54xx.h | 0
arch/arm/mach-omap2/omap_hwmod.c | 8 +-
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 25 +-
arch/arm/mach-omap2/omap_hwmod_2430_data.c | 73 ++--
.../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 108 +++--
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 8 +-
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 152 +++----
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 3 +-
arch/arm/mach-omap2/omap_hwmod_common_data.h | 1 +
arch/arm/mach-omap2/omap_l3_noc.c | 5 +-
arch/arm/mach-omap2/omap_phy_internal.c | 2 +
arch/arm/mach-omap2/opp2420_data.c | 2 +-
arch/arm/mach-omap2/opp2430_data.c | 2 +-
arch/arm/mach-omap2/opp3xxx_data.c | 2 -
arch/arm/mach-omap2/opp4xxx_data.c | 3 +-
arch/arm/mach-omap2/pm24xx.c | 3 +-
arch/arm/mach-omap2/pm34xx.c | 2 +
arch/arm/mach-omap2/powerdomain.c | 6 +-
arch/arm/mach-omap2/powerdomains3xxx_data.c | 4 +-
arch/arm/mach-omap2/prcm.c | 1 -
arch/arm/mach-omap2/prm2xxx_3xxx.c | 7 +-
arch/arm/mach-omap2/prm44xx.c | 5 +-
arch/arm/mach-omap2/prm_common.c | 1 -
arch/arm/mach-omap2/sdrc2xxx.c | 2 +-
arch/arm/mach-omap2/serial.c | 1 +
arch/arm/mach-omap2/sleep24xx.S | 3 +-
arch/arm/mach-omap2/sleep34xx.S | 2 +-
arch/arm/mach-omap2/sleep44xx.S | 2 +-
arch/arm/mach-omap2/soc.h | 7 +
arch/arm/mach-omap2/sram242x.S | 3 +-
arch/arm/mach-omap2/sram243x.S | 3 +-
arch/arm/mach-omap2/sram34xx.S | 3 +-
.../include/plat => mach-omap2}/ti81xx.h | 0
arch/arm/mach-omap2/timer.c | 9 +-
arch/arm/mach-omap2/twl-common.c | 3 +-
arch/arm/mach-omap2/twl-common.h | 6 +-
arch/arm/mach-omap2/usb-host.c | 2 -
arch/arm/mach-omap2/usb-musb.c | 7 +-
arch/arm/mach-omap2/vc.c | 3 +-
arch/arm/mach-omap2/voltagedomains3xxx_data.c | 3 +-
arch/arm/plat-omap/Kconfig | 1 +
arch/arm/plat-omap/Makefile | 3 +-
arch/arm/plat-omap/counter_32k.c | 2 -
arch/arm/plat-omap/debug-leds.c | 1 +
arch/arm/plat-omap/devices.c | 91 ----
arch/arm/plat-omap/dma.c | 3 +-
arch/arm/plat-omap/i2c.c | 3 +-
arch/arm/plat-omap/include/plat/cpu.h | 3 +
arch/arm/plat-omap/include/plat/dma.h | 2 +
arch/arm/plat-omap/include/plat/gpio-switch.h | 54 ---
arch/arm/plat-omap/include/plat/hardware.h | 293 -------------
arch/arm/plat-omap/include/plat/irqs-44xx.h | 144 -------
arch/arm/plat-omap/include/plat/irqs.h | 453 --------------------
arch/arm/plat-omap/include/plat/nand.h | 1 -
arch/arm/plat-omap/include/plat/omap4-keypad.h | 2 +
drivers/dma/omap-dma.c | 2 +
drivers/gpio/gpio-omap.c | 15 +-
drivers/gpio/gpio-twl4030.c | 15 +-
drivers/input/keyboard/Kconfig | 2 +-
drivers/input/keyboard/omap-keypad.c | 154 ++-----
drivers/media/video/omap/omap_vout.c | 1 +
drivers/media/video/omap3isp/isp.c | 2 +
drivers/mfd/twl-core.c | 2 +
drivers/mtd/nand/ams-delta.c | 8 +-
drivers/mtd/onenand/omap2.c | 1 +
drivers/power/avs/smartreflex.c | 2 +
drivers/spi/spi-omap-uwire.c | 3 +-
drivers/staging/tidspbridge/core/wdt.c | 2 +-
drivers/video/omap2/dss/dispc.c | 1 +
drivers/video/omap2/omapfb/omapfb-main.c | 1 +
drivers/w1/masters/omap_hdq.c | 3 +-
drivers/watchdog/omap_wdt.c | 5 +
include/linux/i2c/twl.h | 3 -
include/linux/mfd/twl6040.h | 1 -
.../linux/platform_data/gpio-omap.h | 15 +-
sound/soc/omap/mcbsp.c | 2 +
sound/soc/omap/omap-abe-twl6040.c | 4 -
sound/soc/omap/omap-mcbsp.c | 1 +
sound/soc/omap/omap-mcpdm.c | 2 +
sound/soc/omap/omap-pcm.c | 1 +
sound/soc/omap/sdp3430.c | 1 +
176 files changed, 1013 insertions(+), 1637 deletions(-)
rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/omap1510.h (97%)
rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/omap16xx.h (99%)
rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/omap7xx.h (98%)
rename arch/arm/{plat-omap/include/plat => mach-omap2}/am33xx.h (100%)
rename arch/arm/{plat-omap/include/plat => mach-omap2}/omap24xx.h (98%)
rename arch/arm/{plat-omap/include/plat => mach-omap2}/omap34xx.h (98%)
rename arch/arm/{plat-omap/include/plat => mach-omap2}/omap44xx.h (97%)
rename arch/arm/{plat-omap/include/plat => mach-omap2}/omap54xx.h (100%)
create mode 100644 arch/arm/mach-omap2/soc.h
rename arch/arm/{plat-omap/include/plat => mach-omap2}/ti81xx.h (100%)
delete mode 100644 arch/arm/plat-omap/devices.c
delete mode 100644 arch/arm/plat-omap/include/plat/gpio-switch.h
delete mode 100644 arch/arm/plat-omap/include/plat/hardware.h
delete mode 100644 arch/arm/plat-omap/include/plat/irqs-44xx.h
delete mode 100644 arch/arm/plat-omap/include/plat/irqs.h
rename arch/arm/plat-omap/include/plat/gpio.h => include/linux/platform_data/gpio-omap.h (94%)
^ permalink raw reply [flat|nested] 11+ messages in thread* [GIT PULL 6/7] omap makefile and sparse cleanup for v3.7 merge window
2012-09-14 2:34 [GIT PULL 1/7] omap non-critical fixes for v3.7 merge window Tony Lindgren
` (3 preceding siblings ...)
2012-09-14 2:34 ` [GIT PULL 5/7] omap sparse irq and local hardware.h cleanup " Tony Lindgren
@ 2012-09-14 2:34 ` Tony Lindgren
2012-09-14 2:34 ` [GIT PULL 7/7] am33xx hwmod data " Tony Lindgren
` (2 subsequent siblings)
7 siblings, 0 replies; 11+ messages in thread
From: Tony Lindgren @ 2012-09-14 2:34 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 68cb700c59fae6cd539c9dc1e9f2584f671935a0:
ARM: OMAP1: Move SoC specific headers from plat to mach for omap1 (2012-09-12 18:06:31 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-cleanup-makefile-sparse-for-v3.7
for you to fetch changes up to 3c101c41fbe5daf88afbbd575542aa1d047812bb:
Merge tag 'omap-cleanup-b-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into cleanup-makefile-sparse (2012-09-12 20:42:36 -0700)
----------------------------------------------------------------
>From Paul Walmsley <paul@pwsan.com>:
Clean up and standardize several parts of
arch/arm/mach-omap2/Makefile. Beyond readability and diffstat
improvements, the series should reduce the risk of conflicts during
future cleanups by ensuring related lines are in the same section of the
Makefile.
smatch and string-wrapping cleanups for the OMAP subarch code.
These changes fix some of the more meaningful warnings that smatch
returns for the OMAP subarch code, and unwraps strings that are
wrapped at the 80-column boundary, to conform with the current
practice.
----------------------------------------------------------------
Paul Walmsley (8):
ARM: OMAP2+: clean up whitespace in Makefile
ARM: OMAP2+: clean up omap_hwmod.o build directives in Makefile
ARM: OMAP2+: move MPU INTCPS, secure monitor, SDRC build directives in Makefile
ARM: OMAP2+: clean up OMAP4 PRM & sleep build directives in Makefile
ARM: OMAP2+: clean up OMAP clock Makefile sections
ARM: OMAP2+: clean up PRCM sections of the Makefile
ARM: OMAP: clean up some smatch warnings, fix some printk(KERN_ERR ...
ARM: OMAP: unwrap strings
Tony Lindgren (2):
Merge tag 'omap-cleanup-a-for-3.7' of git://git.kernel.org/.../pjw/omap-pending into cleanup-makefile-sparse
Merge tag 'omap-cleanup-b-for-3.7' of git://git.kernel.org/.../pjw/omap-pending into cleanup-makefile-sparse
arch/arm/mach-omap1/board-htcherald.c | 3 +-
arch/arm/mach-omap1/clock.c | 4 +-
arch/arm/mach-omap1/clock_data.c | 13 ++--
arch/arm/mach-omap1/dma.c | 5 +-
arch/arm/mach-omap1/lcd_dma.c | 6 +-
arch/arm/mach-omap1/leds-h2p2-debug.c | 12 +--
arch/arm/mach-omap2/Makefile | 108 +++++++++++----------------
arch/arm/mach-omap2/board-n8x0.c | 7 +-
arch/arm/mach-omap2/board-overo.c | 6 +-
arch/arm/mach-omap2/board-zoom-debugboard.c | 7 +-
arch/arm/mach-omap2/clkt34xx_dpll3m2.c | 10 +--
arch/arm/mach-omap2/clkt_clksel.c | 28 ++++---
arch/arm/mach-omap2/clkt_dpll.c | 8 +-
arch/arm/mach-omap2/clock.c | 20 ++---
arch/arm/mach-omap2/clock3xxx.c | 3 +-
arch/arm/mach-omap2/clockdomain.c | 74 +++++++++---------
arch/arm/mach-omap2/common-board-devices.c | 3 +-
arch/arm/mach-omap2/dpll3xxx.c | 7 +-
arch/arm/mach-omap2/gpio.c | 1 +
arch/arm/mach-omap2/gpmc.c | 2 +-
arch/arm/mach-omap2/id.c | 5 +-
arch/arm/mach-omap2/irq.c | 5 +-
arch/arm/mach-omap2/omap_hwmod.c | 16 ++--
arch/arm/mach-omap2/opp.c | 15 ++--
arch/arm/mach-omap2/pm.c | 4 +-
arch/arm/mach-omap2/pm34xx.c | 8 +-
arch/arm/mach-omap2/pm44xx.c | 8 +-
arch/arm/mach-omap2/powerdomain.c | 36 +++++----
arch/arm/mach-omap2/powerdomain2xxx_3xxx.c | 4 +-
arch/arm/mach-omap2/powerdomain44xx.c | 4 +-
arch/arm/mach-omap2/prcm.c | 8 +-
arch/arm/mach-omap2/serial.c | 12 +--
arch/arm/mach-omap2/sr_device.c | 13 ++--
arch/arm/mach-omap2/timer.c | 2 +-
arch/arm/mach-omap2/vc.c | 5 +-
arch/arm/mach-omap2/voltage.c | 12 +--
arch/arm/mach-omap2/vp.c | 16 ++--
arch/arm/plat-omap/dma.c | 51 ++++++-------
arch/arm/plat-omap/mux.c | 2 +-
arch/arm/plat-omap/omap-pm-noop.c | 39 +++++-----
arch/arm/plat-omap/omap_device.c | 25 +++----
41 files changed, 277 insertions(+), 340 deletions(-)
^ permalink raw reply [flat|nested] 11+ messages in thread* [GIT PULL 7/7] am33xx hwmod data for v3.7 merge window
2012-09-14 2:34 [GIT PULL 1/7] omap non-critical fixes for v3.7 merge window Tony Lindgren
` (4 preceding siblings ...)
2012-09-14 2:34 ` [GIT PULL 6/7] omap makefile and sparse " Tony Lindgren
@ 2012-09-14 2:34 ` Tony Lindgren
[not found] ` <E1TCLkq-0006f8-Qp@merlin.infradead.org>
[not found] ` <E1TCLkx-0006iv-9h@merlin.infradead.org>
7 siblings, 0 replies; 11+ messages in thread
From: Tony Lindgren @ 2012-09-14 2:34 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 68cb700c59fae6cd539c9dc1e9f2584f671935a0:
ARM: OMAP1: Move SoC specific headers from plat to mach for omap1 (2012-09-12 18:06:31 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-am33xx-for-v3.7
for you to fetch changes up to 11964f53eb4d9ce59a058be9999d9cfcb1ced878:
Merge tag 'omap-devel-a2-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-am33xx (2012-09-12 21:29:07 -0700)
----------------------------------------------------------------
>From Paul Walmsley <paul@pwsan.com>:
AM33xx hwmod data and miscellaneous clock and hwmod fixes. AM33xx
should now boot on mainline after this is applied, according to
Vaibhav.
----------------------------------------------------------------
Tony Lindgren (1):
Merge tag 'omap-devel-a2-for-3.7' of git://git.kernel.org/.../pjw/omap-pending into devel-am33xx
Vaibhav Hiremath (4):
ARM: OMAP2+: hwmod: Hook-up am33xx support in omap_hwmod framework
ARM: OMAP3+: hwmod: Add AM33XX HWMOD data
ARM: OMAP2+: dpll: Add missing soc_is_am33xx() check for common functions
ARM: AM33XX: clock: Add dcan clock aliases for device-tree
arch/arm/mach-omap2/Makefile | 1 +
arch/arm/mach-omap2/clkt_dpll.c | 4 +-
arch/arm/mach-omap2/clock33xx_data.c | 2 +
arch/arm/mach-omap2/dpll3xxx.c | 4 +-
arch/arm/mach-omap2/io.c | 2 +
arch/arm/mach-omap2/omap_hwmod.c | 178 ++
arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 3381 ++++++++++++++++++++++++++
arch/arm/plat-omap/include/plat/omap_hwmod.h | 1 +
8 files changed, 3569 insertions(+), 4 deletions(-)
create mode 100644 arch/arm/mach-omap2/omap_hwmod_33xx_data.c
^ permalink raw reply [flat|nested] 11+ messages in thread[parent not found: <E1TCLkq-0006f8-Qp@merlin.infradead.org>]
* [GIT PULL 5/7] omap sparse irq and local hardware.h cleanup for v3.7 merge window
[not found] ` <E1TCLkq-0006f8-Qp@merlin.infradead.org>
@ 2012-09-14 17:55 ` Tony Lindgren
0 siblings, 0 replies; 11+ messages in thread
From: Tony Lindgren @ 2012-09-14 17:55 UTC (permalink / raw)
To: linux-arm-kernel
* Tony Lindgren <tony@atomide.com> [120914 08:28]:
> The following changes since commit a1e01703bacbadd22eb4aaca0bbba59bcba7d3b3:
>
> Merge tags 'omap-devel-gpmc-fixed-for-v3.7' and 'cleanup-omap-tags-for-v3.7' into cleanup-sparseirq (2012-09-12 18:05:19 -0700)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-cleanup-sparseirq-for-v3.7
>
> for you to fetch changes up to 68cb700c59fae6cd539c9dc1e9f2584f671935a0:
>
> ARM: OMAP1: Move SoC specific headers from plat to mach for omap1 (2012-09-12 18:06:31 -0700)
>
> ----------------------------------------------------------------
> This branch contains changes needed to make omap2+
> work properly with sparse IRQ. It also removes
> dependencies to mach/hardware.h. These help moving
> things towards ARM single zImage support.
>
> This branch is based on a commit in tty-next
> branch with omap-devel-gpmc-fixed-for-v3.7 and
> cleanup-omap-tags-for-v3.7 merged in to keep things
> compiling and sort out some merge conflicts.
This will need some manual merging with what's in
testing/platform-data, so please let me know if
you need help with that. But basically it's mostly:
remove #include <plat/board.h> for both mach-omap1 & mach-omap2
remove #include <mach/hardware.h> for mach-omap2
remove #include <mach/irqs.h> for mach-omap2
Regards,
Tony
^ permalink raw reply [flat|nested] 11+ messages in thread
[parent not found: <E1TCLkx-0006iv-9h@merlin.infradead.org>]
* [GIT PULL 1/7] omap non-critical fixes for v3.7 merge window
@ 2012-09-14 2:18 Tony Lindgren
2012-09-14 2:18 ` [GIT PULL 7/7] am33xx hwmod data " Tony Lindgren
[not found] ` <E1TCLVa-0003Ea-Ej@merlin.infradead.org>
0 siblings, 2 replies; 11+ messages in thread
From: Tony Lindgren @ 2012-09-14 2:18 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 55d512e245bc7699a8800e23df1a24195dd08217:
Linux 3.6-rc5 (2012-09-08 16:43:45 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-fixes-noncritical-for-v3.7
for you to fetch changes up to 3c5dc4a7daa6e64e39412fe9c7daa298834de623:
ARM: OMAP4: wakeupgen: remove duplicate AUXCOREBOOT* read/write (2012-09-12 21:14:34 -0700)
----------------------------------------------------------------
Non critical omap fixes that we not considered necessary
for the v3.6 -rc cycle.
----------------------------------------------------------------
Paul Walmsley (1):
ARM: OMAP4: wakeupgen: remove duplicate AUXCOREBOOT* read/write
Santosh Shilimkar (1):
ARM: OMAP4: wakeupgen: Fix the typo in AUXCOREBOOT register save
Wei Yongjun (1):
gpio/omap: fix possible memory leak in omap2_gpio_dev_init()
arch/arm/mach-omap2/gpio.c | 2 ++
arch/arm/mach-omap2/omap-wakeupgen.c | 8 +-------
2 files changed, 3 insertions(+), 7 deletions(-)
^ permalink raw reply [flat|nested] 11+ messages in thread* [GIT PULL 7/7] am33xx hwmod data for v3.7 merge window
2012-09-14 2:18 [GIT PULL 1/7] omap non-critical fixes " Tony Lindgren
@ 2012-09-14 2:18 ` Tony Lindgren
[not found] ` <E1TCLVa-0003Ea-Ej@merlin.infradead.org>
1 sibling, 0 replies; 11+ messages in thread
From: Tony Lindgren @ 2012-09-14 2:18 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 68cb700c59fae6cd539c9dc1e9f2584f671935a0:
ARM: OMAP1: Move SoC specific headers from plat to mach for omap1 (2012-09-12 18:06:31 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap
for you to fetch changes up to 11964f53eb4d9ce59a058be9999d9cfcb1ced878:
Merge tag 'omap-devel-a2-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-am33xx (2012-09-12 21:29:07 -0700)
----------------------------------------------------------------
>From Paul Walmsley <paul@pwsan.com>:
AM33xx hwmod data and miscellaneous clock and hwmod fixes. AM33xx
should now boot on mainline after this is applied, according to
Vaibhav.
----------------------------------------------------------------
Tony Lindgren (1):
Merge tag 'omap-devel-a2-for-3.7' of git://git.kernel.org/.../pjw/omap-pending into devel-am33xx
Vaibhav Hiremath (4):
ARM: OMAP2+: hwmod: Hook-up am33xx support in omap_hwmod framework
ARM: OMAP3+: hwmod: Add AM33XX HWMOD data
ARM: OMAP2+: dpll: Add missing soc_is_am33xx() check for common functions
ARM: AM33XX: clock: Add dcan clock aliases for device-tree
arch/arm/mach-omap2/Makefile | 1 +
arch/arm/mach-omap2/clkt_dpll.c | 4 +-
arch/arm/mach-omap2/clock33xx_data.c | 2 +
arch/arm/mach-omap2/dpll3xxx.c | 4 +-
arch/arm/mach-omap2/io.c | 2 +
arch/arm/mach-omap2/omap_hwmod.c | 178 ++
arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 3381 ++++++++++++++++++++++++++
arch/arm/plat-omap/include/plat/omap_hwmod.h | 1 +
8 files changed, 3569 insertions(+), 4 deletions(-)
create mode 100644 arch/arm/mach-omap2/omap_hwmod_33xx_data.c
^ permalink raw reply [flat|nested] 11+ messages in thread[parent not found: <E1TCLVa-0003Ea-Ej@merlin.infradead.org>]
* [GIT PULL 7/7] am33xx hwmod data for v3.7 merge window
[not found] ` <E1TCLVa-0003Ea-Ej@merlin.infradead.org>
@ 2012-09-17 3:16 ` Olof Johansson
0 siblings, 0 replies; 11+ messages in thread
From: Olof Johansson @ 2012-09-17 3:16 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Sep 13, 2012 at 07:18:45PM -0700, Tony Lindgren wrote:
> The following changes since commit 68cb700c59fae6cd539c9dc1e9f2584f671935a0:
>
> ARM: OMAP1: Move SoC specific headers from plat to mach for omap1 (2012-09-12 18:06:31 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap
>
> for you to fetch changes up to 11964f53eb4d9ce59a058be9999d9cfcb1ced878:
>
> Merge tag 'omap-devel-a2-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-am33xx (2012-09-12 21:29:07 -0700)
Looks like you did the request-pull before the tag had propagated out to the
public git here, since it's not in the message above. Looking at your tree, it
seems to be at tags/omap-devel-am33xx-for-v3.7, so I pulled that into next/soc.
-Olof
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2012-09-17 3:16 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-14 2:34 [GIT PULL 1/7] omap non-critical fixes for v3.7 merge window Tony Lindgren
2012-09-14 2:34 ` [GIT PULL 2/7] omap device changes " Tony Lindgren
2012-09-14 2:34 ` [GIT PULL 3/7] omap gpmc cleanup " Tony Lindgren
2012-09-14 2:34 ` [GIT PULL 4/7] omap custom atag removal " Tony Lindgren
2012-09-14 2:34 ` [GIT PULL 5/7] omap sparse irq and local hardware.h cleanup " Tony Lindgren
2012-09-14 2:34 ` [GIT PULL 6/7] omap makefile and sparse " Tony Lindgren
2012-09-14 2:34 ` [GIT PULL 7/7] am33xx hwmod data " Tony Lindgren
[not found] ` <E1TCLkq-0006f8-Qp@merlin.infradead.org>
2012-09-14 17:55 ` [GIT PULL 5/7] omap sparse irq and local hardware.h cleanup " Tony Lindgren
[not found] ` <E1TCLkx-0006iv-9h@merlin.infradead.org>
2012-09-17 3:08 ` [GIT PULL 6/7] omap makefile and sparse " Olof Johansson
-- strict thread matches above, loose matches on Subject: below --
2012-09-14 2:18 [GIT PULL 1/7] omap non-critical fixes " Tony Lindgren
2012-09-14 2:18 ` [GIT PULL 7/7] am33xx hwmod data " Tony Lindgren
[not found] ` <E1TCLVa-0003Ea-Ej@merlin.infradead.org>
2012-09-17 3:16 ` Olof Johansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).