* [GIT PULL 1/3] omap plat header removal for v3.8 merge window, part2
@ 2012-10-26 21:23 Tony Lindgren
2012-10-26 21:23 ` [GIT PULL 3/3] omap prcm cleanup for v3.8 merge window, part1 Tony Lindgren
` (4 more replies)
0 siblings, 5 replies; 11+ messages in thread
From: Tony Lindgren @ 2012-10-26 21:23 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 3e9a6321f9895eac9a3d241d3126e44021e7102b:
Merge tag 'omap-for-v3.8/cleanup-headers-signed' into omap-for-v3.8/cleanup-headers-serial-take2 (2012-10-24 13:25:44 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-headers-serial-take2-signed
for you to fetch changes up to 3d82cbbb3aadb4f8a30e3f614e51be96574a0855:
ARM: OMAP: Split plat/serial.h for omap1 and omap2+ (2012-10-24 13:34:31 -0700)
----------------------------------------------------------------
These changes remove plat/serial.h usage for omap2+.
Note that this branch is based on a tty commit 3e9a6321
(tty/serial/8250: Make omap hardware workarounds local to 8250.h)
merged with omap-for-v3.8/cleanup-headers-signed.
The tty commit is needed to keep things compiling for omaps,
and omap-for-v3.8/cleanup-headers-signed is needed to avoid
multiple merge conflicts with the includes. I've verified
with Greg KH that the tty commit above is immutable and OK
to use as a base.
----------------------------------------------------------------
Tony Lindgren (2):
ARM: OMAP: Split uncompress.h to mach-omap1 and mach-omap2
ARM: OMAP: Split plat/serial.h for omap1 and omap2+
arch/arm/mach-omap1/include/mach/debug-macro.S | 2 +-
arch/arm/mach-omap1/include/mach/hardware.h | 2 +-
arch/arm/mach-omap1/include/mach/serial.h | 53 +++++
arch/arm/mach-omap1/include/mach/uncompress.h | 121 +++++++++++-
arch/arm/mach-omap2/board-rm680.c | 1 -
arch/arm/mach-omap2/common.h | 3 +-
arch/arm/mach-omap2/include/mach/debug-macro.S | 2 +-
arch/arm/mach-omap2/include/mach/uncompress.h | 175 ++++++++++++++++-
arch/arm/mach-omap2/io.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 1 +
.../omap_hwmod_2xxx_3xxx_interconnect_data.c | 2 -
.../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 1 -
.../mach-omap2/omap_hwmod_2xxx_interconnect_data.c | 3 +-
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 1 -
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 3 +-
arch/arm/mach-omap2/serial.c | 2 +-
.../include/plat => mach-omap2}/serial.h | 11 --
arch/arm/plat-omap/include/plat/uncompress.h | 204 --------------------
18 files changed, 354 insertions(+), 235 deletions(-)
create mode 100644 arch/arm/mach-omap1/include/mach/serial.h
rename arch/arm/{plat-omap/include/plat => mach-omap2}/serial.h (91%)
delete mode 100644 arch/arm/plat-omap/include/plat/uncompress.h
^ permalink raw reply [flat|nested] 11+ messages in thread
* [GIT PULL 2/3] omap plat header removal for v3.8 merge window, part3
2012-10-26 21:23 [GIT PULL 1/3] omap plat header removal for v3.8 merge window, part2 Tony Lindgren
` (2 preceding siblings ...)
2012-10-26 21:23 ` [GIT PULL 3/3] omap prcm cleanup for v3.8 merge window, part1 Tony Lindgren
@ 2012-10-26 21:23 ` Tony Lindgren
[not found] ` <508aff60.4688e50a.0457.ffff898bSMTPIN_ADDED@mx.google.com>
4 siblings, 0 replies; 11+ messages in thread
From: Tony Lindgren @ 2012-10-26 21:23 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
The following changes since commit 3d82cbbb3aadb4f8a30e3f614e51be96574a0855:
ARM: OMAP: Split plat/serial.h for omap1 and omap2+ (2012-10-24 13:34:31 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-headers-part3-signed
for you to fetch changes up to a0212796b58061a9716178d261f318925c246643:
Merge tag 'omap-cleanup-fixes-a-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/cleanup-headers (2012-10-26 13:18:19 -0700)
----------------------------------------------------------------
Here is the third set of plat header removal for omap2+.
This is based on the following minimal topic branches
coordinated with the related driver maintainers:
omap-for-v3.8/cleanup-headers-usb
omap-for-v3.8/cleanup-headers-menelaus
In addition to that, there are few fixes to the previously
merged patches that can show up with customized configs.
----------------------------------------------------------------
Felipe Balbi (1):
ARM: OMAP: move OMAP USB platform data to <linux/platform_data/omap-usb.h>
Paul Walmsley (3):
ARM: OMAP2+: fix build breakage introduced by commit b7754452b3e27716347a528b47b0a1083af32520
ARM: OMAP1: fix build breakage introduced by commit 25c7d49ed48b4843da7dea56a81ae7f620211ee0
ARM: OMAP1: fix sparse warning added by commit 4c98dc6b8ef2f73bdbfa78186db9a76507ba9ea3
Tony Lindgren (5):
ARM: OMAP2: Move plat/menelaus.h to linux/mfd/menelaus.h
ARM: OMAP2+: Introduce local usb.h
Merge branch 'omap-for-v3.8/cleanup-headers-usb' into omap-for-v3.8/cleanup-headers
Merge branch 'omap-for-v3.8/cleanup-headers-menelaus' into omap-for-v3.8/cleanup-headers
Merge tag 'omap-cleanup-fixes-a-for-3.8' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v3.8/cleanup-headers
arch/arm/mach-omap1/clock.c | 4 +-
arch/arm/mach-omap1/fpga.c | 1 +
arch/arm/mach-omap1/pm_bus.c | 2 +
arch/arm/mach-omap2/board-2430sdp.c | 1 -
arch/arm/mach-omap2/board-3430sdp.c | 1 -
arch/arm/mach-omap2/board-3630sdp.c | 1 -
arch/arm/mach-omap2/board-4430sdp.c | 2 +-
arch/arm/mach-omap2/board-am3517crane.c | 1 -
arch/arm/mach-omap2/board-am3517evm.c | 2 +-
arch/arm/mach-omap2/board-cm-t35.c | 5 +-
arch/arm/mach-omap2/board-cm-t3517.c | 1 -
arch/arm/mach-omap2/board-devkit8000.c | 1 -
arch/arm/mach-omap2/board-h4.c | 2 +-
arch/arm/mach-omap2/board-igep0020.c | 6 +-
arch/arm/mach-omap2/board-ldp.c | 3 +-
arch/arm/mach-omap2/board-n8x0.c | 2 +-
arch/arm/mach-omap2/board-omap3beagle.c | 7 +-
arch/arm/mach-omap2/board-omap3evm.c | 2 +-
arch/arm/mach-omap2/board-omap3logic.c | 2 -
arch/arm/mach-omap2/board-omap3pandora.c | 1 -
arch/arm/mach-omap2/board-omap3stalker.c | 1 -
arch/arm/mach-omap2/board-omap3touchbook.c | 1 -
arch/arm/mach-omap2/board-omap4panda.c | 4 +-
arch/arm/mach-omap2/board-overo.c | 4 +-
arch/arm/mach-omap2/board-rm680.c | 4 +-
arch/arm/mach-omap2/board-rx51.c | 2 +-
arch/arm/mach-omap2/board-ti8168evm.c | 3 +-
arch/arm/mach-omap2/board-zoom-peripherals.c | 1 -
arch/arm/mach-omap2/board-zoom.c | 1 -
arch/arm/mach-omap2/common.h | 2 +
arch/arm/mach-omap2/omap_phy_internal.c | 4 +-
arch/arm/mach-omap2/twl-common.c | 2 -
arch/arm/mach-omap2/usb-host.c | 3 +-
arch/arm/mach-omap2/usb-musb.c | 3 +-
arch/arm/mach-omap2/usb-tusb6010.c | 1 +
arch/arm/mach-omap2/usb.h | 82 +++++++++
arch/arm/plat-omap/include/plat/usb.h | 179 --------------------
drivers/mfd/menelaus.c | 2 +-
drivers/mfd/omap-usb-host.c | 5 +-
drivers/mfd/omap-usb-tll.c | 2 +-
drivers/mfd/omap-usb.h | 2 +
drivers/mtd/onenand/omap2.c | 36 ++--
drivers/usb/host/ehci-omap.c | 3 +-
drivers/usb/host/ohci-omap3.c | 1 -
drivers/usb/musb/am35x.c | 3 +-
drivers/usb/musb/musb_dsps.c | 3 +-
drivers/usb/musb/omap2430.h | 2 +-
.../include/plat => include/linux/mfd}/menelaus.h | 2 -
include/linux/platform_data/usb-omap.h | 80 +++++++++
49 files changed, 231 insertions(+), 254 deletions(-)
create mode 100644 arch/arm/mach-omap2/usb.h
delete mode 100644 arch/arm/plat-omap/include/plat/usb.h
create mode 100644 drivers/mfd/omap-usb.h
rename {arch/arm/plat-omap/include/plat => include/linux/mfd}/menelaus.h (96%)
create mode 100644 include/linux/platform_data/usb-omap.h
^ permalink raw reply [flat|nested] 11+ messages in thread
* [GIT PULL 3/3] omap prcm cleanup for v3.8 merge window, part1
2012-10-26 21:23 [GIT PULL 1/3] omap plat header removal for v3.8 merge window, part2 Tony Lindgren
2012-10-26 21:23 ` [GIT PULL 3/3] omap prcm cleanup for v3.8 merge window, part1 Tony Lindgren
2012-10-26 21:23 ` [GIT PULL 2/3] omap plat header removal for v3.8 merge window, part3 Tony Lindgren
@ 2012-10-26 21:23 ` Tony Lindgren
2012-11-05 18:51 ` Olof Johansson
2012-10-26 21:23 ` [GIT PULL 2/3] omap plat header removal for v3.8 merge window, part3 Tony Lindgren
[not found] ` <508aff60.4688e50a.0457.ffff898bSMTPIN_ADDED@mx.google.com>
4 siblings, 1 reply; 11+ messages in thread
From: Tony Lindgren @ 2012-10-26 21:23 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
The following changes since commit a0212796b58061a9716178d261f318925c246643:
Merge tag 'omap-cleanup-fixes-a-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/cleanup-headers (2012-10-26 13:18:19 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-prcm-part1-take2-signed
for you to fetch changes up to 7fc54fd3084457c7f11b9e2e1e3fcd19a3badc33:
Merge branch 'omap-for-v3.8/cleanup-headers' into omap-for-v3.8/cleanup-prcm (2012-10-26 13:32:22 -0700)
----------------------------------------------------------------
>From Paul Walmsley <paul@pwsan.com>:
The first set of OMAP PRM/CM-related cleanup patches for 3.8.
Prepares for the future move of the PRM/CM code to drivers/. Also
includes some prcm.[ch] cleanup patches from the WDTIMER cleanup
series that don't need external acks.
----------------------------------------------------------------
Paul Walmsley (9):
ARM: OMAP2+: PRM: remove PRM weak functions
ARM: OMAP2+: PRM: split PRM functions into OMAP2, OMAP3-specific files
ARM: OMAP2+: powerdomain/PRM: move the low-level powerdomain functions into PRM
ARM: OMAP2+: CM/hwmod: split CM functions into OMAP2, OMAP3-specific files
ARM: OMAP2/3: clockdomain/PRM/CM: move the low-level clockdomain functions into PRM/CM
ARM: OMAP2+: PRM: prepare for use of prm_ll_data function pointers
ARM: OMAP2+: CM: prepare for use of cm_ll_data function pointers
ARM: OMAP1: create read_reset_sources() function (for initial use by watchdog)
ARM: OMAP2+: PRM: create PRM reset source API for the watchdog timer driver
Tony Lindgren (2):
Merge tag 'omap-cleanup-a-for-3.8' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v3.8/cleanup-prcm
Merge branch 'omap-for-v3.8/cleanup-headers' into omap-for-v3.8/cleanup-prcm
arch/arm/mach-omap1/common.h | 2 +
arch/arm/mach-omap1/reset.c | 38 +++
arch/arm/mach-omap2/Makefile | 110 ++++---
arch/arm/mach-omap2/clkt2xxx_apll.c | 2 +-
arch/arm/mach-omap2/clkt2xxx_dpll.c | 2 +-
arch/arm/mach-omap2/clock.c | 3 +-
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/clock34xx.c | 2 +-
arch/arm/mach-omap2/clock3517.c | 2 +-
arch/arm/mach-omap2/clock3xxx_data.c | 2 +-
arch/arm/mach-omap2/clockdomain2xxx_3xxx.c | 341 -------------------
arch/arm/mach-omap2/clockdomain33xx.c | 74 -----
arch/arm/mach-omap2/clockdomain44xx.c | 151 ---------
arch/arm/mach-omap2/cm.h | 12 +
arch/arm/mach-omap2/cm2xxx.c | 255 ++++++++++++++
arch/arm/mach-omap2/cm2xxx.h | 66 ++++
arch/arm/mach-omap2/cm2xxx_3xxx.h | 119 +++----
arch/arm/mach-omap2/cm33xx.c | 56 ++++
arch/arm/mach-omap2/{cm2xxx_3xxx.c => cm3xxx.c} | 307 +++++++++--------
arch/arm/mach-omap2/cm3xxx.h | 86 +++++
arch/arm/mach-omap2/cm_common.c | 71 ++++
arch/arm/mach-omap2/cminst44xx.c | 142 +++++++-
arch/arm/mach-omap2/control.c | 4 +-
arch/arm/mach-omap2/omap_hwmod.c | 51 ++-
arch/arm/mach-omap2/pm24xx.c | 4 +-
arch/arm/mach-omap2/pm34xx.c | 5 +-
arch/arm/mach-omap2/powerdomain2xxx_3xxx.c | 242 --------------
arch/arm/mach-omap2/powerdomain33xx.c | 229 -------------
arch/arm/mach-omap2/powerdomain44xx.c | 285 ----------------
arch/arm/mach-omap2/prm-regbits-24xx.h | 6 +-
arch/arm/mach-omap2/prm-regbits-34xx.h | 12 +-
arch/arm/mach-omap2/prm.h | 53 +++
arch/arm/mach-omap2/prm2xxx.c | 126 +++++++
arch/arm/mach-omap2/prm2xxx.h | 132 ++++++++
arch/arm/mach-omap2/prm2xxx_3xxx.c | 332 +++++++------------
arch/arm/mach-omap2/prm2xxx_3xxx.h | 277 ++++------------
arch/arm/mach-omap2/prm33xx.c | 202 ++++++++++++
arch/arm/mach-omap2/prm3xxx.c | 403 +++++++++++++++++++++++
arch/arm/mach-omap2/prm3xxx.h | 160 +++++++++
arch/arm/mach-omap2/prm44xx.c | 355 +++++++++++++++++++-
arch/arm/mach-omap2/prm44xx.h | 2 +
arch/arm/mach-omap2/prm_common.c | 104 +++---
arch/arm/mach-omap2/sdrc2xxx.c | 2 +-
arch/arm/mach-omap2/sleep34xx.S | 4 +-
arch/arm/mach-omap2/sram242x.S | 4 +-
arch/arm/mach-omap2/sram243x.S | 4 +-
arch/arm/mach-omap2/sram34xx.S | 2 +-
49 files changed, 2750 insertions(+), 2099 deletions(-)
delete mode 100644 arch/arm/mach-omap2/clockdomain2xxx_3xxx.c
delete mode 100644 arch/arm/mach-omap2/clockdomain33xx.c
delete mode 100644 arch/arm/mach-omap2/clockdomain44xx.c
create mode 100644 arch/arm/mach-omap2/cm2xxx.c
create mode 100644 arch/arm/mach-omap2/cm2xxx.h
rename arch/arm/mach-omap2/{cm2xxx_3xxx.c => cm3xxx.c} (72%)
create mode 100644 arch/arm/mach-omap2/cm3xxx.h
create mode 100644 arch/arm/mach-omap2/cm_common.c
delete mode 100644 arch/arm/mach-omap2/powerdomain2xxx_3xxx.c
delete mode 100644 arch/arm/mach-omap2/powerdomain33xx.c
delete mode 100644 arch/arm/mach-omap2/powerdomain44xx.c
create mode 100644 arch/arm/mach-omap2/prm2xxx.c
create mode 100644 arch/arm/mach-omap2/prm2xxx.h
create mode 100644 arch/arm/mach-omap2/prm3xxx.c
create mode 100644 arch/arm/mach-omap2/prm3xxx.h
^ permalink raw reply [flat|nested] 11+ messages in thread
* [GIT PULL 2/3] omap plat header removal for v3.8 merge window, part3
2012-10-26 21:23 [GIT PULL 1/3] omap plat header removal for v3.8 merge window, part2 Tony Lindgren
2012-10-26 21:23 ` [GIT PULL 3/3] omap prcm cleanup for v3.8 merge window, part1 Tony Lindgren
@ 2012-10-26 21:23 ` Tony Lindgren
2012-10-26 21:23 ` [GIT PULL 3/3] omap prcm cleanup for v3.8 merge window, part1 Tony Lindgren
` (2 subsequent siblings)
4 siblings, 0 replies; 11+ messages in thread
From: Tony Lindgren @ 2012-10-26 21:23 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 3d82cbbb3aadb4f8a30e3f614e51be96574a0855:
ARM: OMAP: Split plat/serial.h for omap1 and omap2+ (2012-10-24 13:34:31 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-headers-part3-signed
for you to fetch changes up to a0212796b58061a9716178d261f318925c246643:
Merge tag 'omap-cleanup-fixes-a-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/cleanup-headers (2012-10-26 13:18:19 -0700)
----------------------------------------------------------------
Here is the third set of plat header removal for omap2+.
This is based on the following minimal topic branches
coordinated with the related driver maintainers:
omap-for-v3.8/cleanup-headers-usb
omap-for-v3.8/cleanup-headers-menelaus
In addition to that, there are few fixes to the previously
merged patches that can show up with customized configs.
----------------------------------------------------------------
Felipe Balbi (1):
ARM: OMAP: move OMAP USB platform data to <linux/platform_data/omap-usb.h>
Paul Walmsley (3):
ARM: OMAP2+: fix build breakage introduced by commit b7754452b3e27716347a528b47b0a1083af32520
ARM: OMAP1: fix build breakage introduced by commit 25c7d49ed48b4843da7dea56a81ae7f620211ee0
ARM: OMAP1: fix sparse warning added by commit 4c98dc6b8ef2f73bdbfa78186db9a76507ba9ea3
Tony Lindgren (5):
ARM: OMAP2: Move plat/menelaus.h to linux/mfd/menelaus.h
ARM: OMAP2+: Introduce local usb.h
Merge branch 'omap-for-v3.8/cleanup-headers-usb' into omap-for-v3.8/cleanup-headers
Merge branch 'omap-for-v3.8/cleanup-headers-menelaus' into omap-for-v3.8/cleanup-headers
Merge tag 'omap-cleanup-fixes-a-for-3.8' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v3.8/cleanup-headers
arch/arm/mach-omap1/clock.c | 4 +-
arch/arm/mach-omap1/fpga.c | 1 +
arch/arm/mach-omap1/pm_bus.c | 2 +
arch/arm/mach-omap2/board-2430sdp.c | 1 -
arch/arm/mach-omap2/board-3430sdp.c | 1 -
arch/arm/mach-omap2/board-3630sdp.c | 1 -
arch/arm/mach-omap2/board-4430sdp.c | 2 +-
arch/arm/mach-omap2/board-am3517crane.c | 1 -
arch/arm/mach-omap2/board-am3517evm.c | 2 +-
arch/arm/mach-omap2/board-cm-t35.c | 5 +-
arch/arm/mach-omap2/board-cm-t3517.c | 1 -
arch/arm/mach-omap2/board-devkit8000.c | 1 -
arch/arm/mach-omap2/board-h4.c | 2 +-
arch/arm/mach-omap2/board-igep0020.c | 6 +-
arch/arm/mach-omap2/board-ldp.c | 3 +-
arch/arm/mach-omap2/board-n8x0.c | 2 +-
arch/arm/mach-omap2/board-omap3beagle.c | 7 +-
arch/arm/mach-omap2/board-omap3evm.c | 2 +-
arch/arm/mach-omap2/board-omap3logic.c | 2 -
arch/arm/mach-omap2/board-omap3pandora.c | 1 -
arch/arm/mach-omap2/board-omap3stalker.c | 1 -
arch/arm/mach-omap2/board-omap3touchbook.c | 1 -
arch/arm/mach-omap2/board-omap4panda.c | 4 +-
arch/arm/mach-omap2/board-overo.c | 4 +-
arch/arm/mach-omap2/board-rm680.c | 4 +-
arch/arm/mach-omap2/board-rx51.c | 2 +-
arch/arm/mach-omap2/board-ti8168evm.c | 3 +-
arch/arm/mach-omap2/board-zoom-peripherals.c | 1 -
arch/arm/mach-omap2/board-zoom.c | 1 -
arch/arm/mach-omap2/common.h | 2 +
arch/arm/mach-omap2/omap_phy_internal.c | 4 +-
arch/arm/mach-omap2/twl-common.c | 2 -
arch/arm/mach-omap2/usb-host.c | 3 +-
arch/arm/mach-omap2/usb-musb.c | 3 +-
arch/arm/mach-omap2/usb-tusb6010.c | 1 +
arch/arm/mach-omap2/usb.h | 82 +++++++++
arch/arm/plat-omap/include/plat/usb.h | 179 --------------------
drivers/mfd/menelaus.c | 2 +-
drivers/mfd/omap-usb-host.c | 5 +-
drivers/mfd/omap-usb-tll.c | 2 +-
drivers/mfd/omap-usb.h | 2 +
drivers/mtd/onenand/omap2.c | 36 ++--
drivers/usb/host/ehci-omap.c | 3 +-
drivers/usb/host/ohci-omap3.c | 1 -
drivers/usb/musb/am35x.c | 3 +-
drivers/usb/musb/musb_dsps.c | 3 +-
drivers/usb/musb/omap2430.h | 2 +-
.../include/plat => include/linux/mfd}/menelaus.h | 2 -
include/linux/platform_data/usb-omap.h | 80 +++++++++
49 files changed, 231 insertions(+), 254 deletions(-)
create mode 100644 arch/arm/mach-omap2/usb.h
delete mode 100644 arch/arm/plat-omap/include/plat/usb.h
create mode 100644 drivers/mfd/omap-usb.h
rename {arch/arm/plat-omap/include/plat => include/linux/mfd}/menelaus.h (96%)
create mode 100644 include/linux/platform_data/usb-omap.h
^ permalink raw reply [flat|nested] 11+ messages in thread
* [GIT PULL 3/3] omap prcm cleanup for v3.8 merge window, part1
2012-10-26 21:23 [GIT PULL 1/3] omap plat header removal for v3.8 merge window, part2 Tony Lindgren
@ 2012-10-26 21:23 ` Tony Lindgren
2012-10-26 21:23 ` [GIT PULL 2/3] omap plat header removal for v3.8 merge window, part3 Tony Lindgren
` (3 subsequent siblings)
4 siblings, 0 replies; 11+ messages in thread
From: Tony Lindgren @ 2012-10-26 21:23 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit a0212796b58061a9716178d261f318925c246643:
Merge tag 'omap-cleanup-fixes-a-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/cleanup-headers (2012-10-26 13:18:19 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-prcm-part1-take2-signed
for you to fetch changes up to 7fc54fd3084457c7f11b9e2e1e3fcd19a3badc33:
Merge branch 'omap-for-v3.8/cleanup-headers' into omap-for-v3.8/cleanup-prcm (2012-10-26 13:32:22 -0700)
----------------------------------------------------------------
>From Paul Walmsley <paul@pwsan.com>:
The first set of OMAP PRM/CM-related cleanup patches for 3.8.
Prepares for the future move of the PRM/CM code to drivers/. Also
includes some prcm.[ch] cleanup patches from the WDTIMER cleanup
series that don't need external acks.
----------------------------------------------------------------
Paul Walmsley (9):
ARM: OMAP2+: PRM: remove PRM weak functions
ARM: OMAP2+: PRM: split PRM functions into OMAP2, OMAP3-specific files
ARM: OMAP2+: powerdomain/PRM: move the low-level powerdomain functions into PRM
ARM: OMAP2+: CM/hwmod: split CM functions into OMAP2, OMAP3-specific files
ARM: OMAP2/3: clockdomain/PRM/CM: move the low-level clockdomain functions into PRM/CM
ARM: OMAP2+: PRM: prepare for use of prm_ll_data function pointers
ARM: OMAP2+: CM: prepare for use of cm_ll_data function pointers
ARM: OMAP1: create read_reset_sources() function (for initial use by watchdog)
ARM: OMAP2+: PRM: create PRM reset source API for the watchdog timer driver
Tony Lindgren (2):
Merge tag 'omap-cleanup-a-for-3.8' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v3.8/cleanup-prcm
Merge branch 'omap-for-v3.8/cleanup-headers' into omap-for-v3.8/cleanup-prcm
arch/arm/mach-omap1/common.h | 2 +
arch/arm/mach-omap1/reset.c | 38 +++
arch/arm/mach-omap2/Makefile | 110 ++++---
arch/arm/mach-omap2/clkt2xxx_apll.c | 2 +-
arch/arm/mach-omap2/clkt2xxx_dpll.c | 2 +-
arch/arm/mach-omap2/clock.c | 3 +-
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/clock34xx.c | 2 +-
arch/arm/mach-omap2/clock3517.c | 2 +-
arch/arm/mach-omap2/clock3xxx_data.c | 2 +-
arch/arm/mach-omap2/clockdomain2xxx_3xxx.c | 341 -------------------
arch/arm/mach-omap2/clockdomain33xx.c | 74 -----
arch/arm/mach-omap2/clockdomain44xx.c | 151 ---------
arch/arm/mach-omap2/cm.h | 12 +
arch/arm/mach-omap2/cm2xxx.c | 255 ++++++++++++++
arch/arm/mach-omap2/cm2xxx.h | 66 ++++
arch/arm/mach-omap2/cm2xxx_3xxx.h | 119 +++----
arch/arm/mach-omap2/cm33xx.c | 56 ++++
arch/arm/mach-omap2/{cm2xxx_3xxx.c => cm3xxx.c} | 307 +++++++++--------
arch/arm/mach-omap2/cm3xxx.h | 86 +++++
arch/arm/mach-omap2/cm_common.c | 71 ++++
arch/arm/mach-omap2/cminst44xx.c | 142 +++++++-
arch/arm/mach-omap2/control.c | 4 +-
arch/arm/mach-omap2/omap_hwmod.c | 51 ++-
arch/arm/mach-omap2/pm24xx.c | 4 +-
arch/arm/mach-omap2/pm34xx.c | 5 +-
arch/arm/mach-omap2/powerdomain2xxx_3xxx.c | 242 --------------
arch/arm/mach-omap2/powerdomain33xx.c | 229 -------------
arch/arm/mach-omap2/powerdomain44xx.c | 285 ----------------
arch/arm/mach-omap2/prm-regbits-24xx.h | 6 +-
arch/arm/mach-omap2/prm-regbits-34xx.h | 12 +-
arch/arm/mach-omap2/prm.h | 53 +++
arch/arm/mach-omap2/prm2xxx.c | 126 +++++++
arch/arm/mach-omap2/prm2xxx.h | 132 ++++++++
arch/arm/mach-omap2/prm2xxx_3xxx.c | 332 +++++++------------
arch/arm/mach-omap2/prm2xxx_3xxx.h | 277 ++++------------
arch/arm/mach-omap2/prm33xx.c | 202 ++++++++++++
arch/arm/mach-omap2/prm3xxx.c | 403 +++++++++++++++++++++++
arch/arm/mach-omap2/prm3xxx.h | 160 +++++++++
arch/arm/mach-omap2/prm44xx.c | 355 +++++++++++++++++++-
arch/arm/mach-omap2/prm44xx.h | 2 +
arch/arm/mach-omap2/prm_common.c | 104 +++---
arch/arm/mach-omap2/sdrc2xxx.c | 2 +-
arch/arm/mach-omap2/sleep34xx.S | 4 +-
arch/arm/mach-omap2/sram242x.S | 4 +-
arch/arm/mach-omap2/sram243x.S | 4 +-
arch/arm/mach-omap2/sram34xx.S | 2 +-
49 files changed, 2750 insertions(+), 2099 deletions(-)
delete mode 100644 arch/arm/mach-omap2/clockdomain2xxx_3xxx.c
delete mode 100644 arch/arm/mach-omap2/clockdomain33xx.c
delete mode 100644 arch/arm/mach-omap2/clockdomain44xx.c
create mode 100644 arch/arm/mach-omap2/cm2xxx.c
create mode 100644 arch/arm/mach-omap2/cm2xxx.h
rename arch/arm/mach-omap2/{cm2xxx_3xxx.c => cm3xxx.c} (72%)
create mode 100644 arch/arm/mach-omap2/cm3xxx.h
create mode 100644 arch/arm/mach-omap2/cm_common.c
delete mode 100644 arch/arm/mach-omap2/powerdomain2xxx_3xxx.c
delete mode 100644 arch/arm/mach-omap2/powerdomain33xx.c
delete mode 100644 arch/arm/mach-omap2/powerdomain44xx.c
create mode 100644 arch/arm/mach-omap2/prm2xxx.c
create mode 100644 arch/arm/mach-omap2/prm2xxx.h
create mode 100644 arch/arm/mach-omap2/prm3xxx.c
create mode 100644 arch/arm/mach-omap2/prm3xxx.h
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [GIT PULL 2/3] omap plat header removal for v3.8 merge window, part3
[not found] ` <508aff60.4688e50a.0457.ffff898bSMTPIN_ADDED@mx.google.com>
@ 2012-11-05 18:31 ` Olof Johansson
0 siblings, 0 replies; 11+ messages in thread
From: Olof Johansson @ 2012-11-05 18:31 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Arnd Bergmann, linux-arm-kernel, linux-omap
On Fri, Oct 26, 2012 at 02:23:40PM -0700, Tony Lindgren wrote:
> The following changes since commit 3d82cbbb3aadb4f8a30e3f614e51be96574a0855:
>
> ARM: OMAP: Split plat/serial.h for omap1 and omap2+ (2012-10-24 13:34:31 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-headers-part3-signed
>
> for you to fetch changes up to a0212796b58061a9716178d261f318925c246643:
>
> Merge tag 'omap-cleanup-fixes-a-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/cleanup-headers (2012-10-26 13:18:19 -0700)
>
> ----------------------------------------------------------------
>
> Here is the third set of plat header removal for omap2+.
>
> This is based on the following minimal topic branches
> coordinated with the related driver maintainers:
>
> omap-for-v3.8/cleanup-headers-usb
> omap-for-v3.8/cleanup-headers-menelaus
>
> In addition to that, there are few fixes to the previously
> merged patches that can show up with customized configs.
Thanks, I pulled in the two branches above as explicit dependencies, and
resolved the conflicts the same way you did.
New branches are:
depends/omap-cleanup-headers-menelaus
depends/omap-cleanup-headers-usb
omap/cleanup-headers-3
-Olof
^ permalink raw reply [flat|nested] 11+ messages in thread
* [GIT PULL 2/3] omap plat header removal for v3.8 merge window, part3
@ 2012-11-05 18:31 ` Olof Johansson
0 siblings, 0 replies; 11+ messages in thread
From: Olof Johansson @ 2012-11-05 18:31 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Oct 26, 2012 at 02:23:40PM -0700, Tony Lindgren wrote:
> The following changes since commit 3d82cbbb3aadb4f8a30e3f614e51be96574a0855:
>
> ARM: OMAP: Split plat/serial.h for omap1 and omap2+ (2012-10-24 13:34:31 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-headers-part3-signed
>
> for you to fetch changes up to a0212796b58061a9716178d261f318925c246643:
>
> Merge tag 'omap-cleanup-fixes-a-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/cleanup-headers (2012-10-26 13:18:19 -0700)
>
> ----------------------------------------------------------------
>
> Here is the third set of plat header removal for omap2+.
>
> This is based on the following minimal topic branches
> coordinated with the related driver maintainers:
>
> omap-for-v3.8/cleanup-headers-usb
> omap-for-v3.8/cleanup-headers-menelaus
>
> In addition to that, there are few fixes to the previously
> merged patches that can show up with customized configs.
Thanks, I pulled in the two branches above as explicit dependencies, and
resolved the conflicts the same way you did.
New branches are:
depends/omap-cleanup-headers-menelaus
depends/omap-cleanup-headers-usb
omap/cleanup-headers-3
-Olof
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [GIT PULL 3/3] omap prcm cleanup for v3.8 merge window, part1
2012-10-26 21:23 ` [GIT PULL 3/3] omap prcm cleanup for v3.8 merge window, part1 Tony Lindgren
@ 2012-11-05 18:51 ` Olof Johansson
0 siblings, 0 replies; 11+ messages in thread
From: Olof Johansson @ 2012-11-05 18:51 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Arnd Bergmann, linux-omap, linux-arm-kernel
On Fri, Oct 26, 2012 at 02:23:40PM -0700, Tony Lindgren wrote:
> The following changes since commit a0212796b58061a9716178d261f318925c246643:
>
> Merge tag 'omap-cleanup-fixes-a-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/cleanup-headers (2012-10-26 13:18:19 -0700)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-prcm-part1-take2-signed
>
> for you to fetch changes up to 7fc54fd3084457c7f11b9e2e1e3fcd19a3badc33:
>
> Merge branch 'omap-for-v3.8/cleanup-headers' into omap-for-v3.8/cleanup-prcm (2012-10-26 13:32:22 -0700)
>
> ----------------------------------------------------------------
>
> From Paul Walmsley <paul@pwsan.com>:
>
> The first set of OMAP PRM/CM-related cleanup patches for 3.8.
> Prepares for the future move of the PRM/CM code to drivers/. Also
> includes some prcm.[ch] cleanup patches from the WDTIMER cleanup
> series that don't need external acks.
>
> ----------------------------------------------------------------
> Paul Walmsley (9):
> ARM: OMAP2+: PRM: remove PRM weak functions
> ARM: OMAP2+: PRM: split PRM functions into OMAP2, OMAP3-specific files
> ARM: OMAP2+: powerdomain/PRM: move the low-level powerdomain functions into PRM
> ARM: OMAP2+: CM/hwmod: split CM functions into OMAP2, OMAP3-specific files
> ARM: OMAP2/3: clockdomain/PRM/CM: move the low-level clockdomain functions into PRM/CM
> ARM: OMAP2+: PRM: prepare for use of prm_ll_data function pointers
> ARM: OMAP2+: CM: prepare for use of cm_ll_data function pointers
> ARM: OMAP1: create read_reset_sources() function (for initial use by watchdog)
> ARM: OMAP2+: PRM: create PRM reset source API for the watchdog timer driver
>
> Tony Lindgren (2):
> Merge tag 'omap-cleanup-a-for-3.8' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v3.8/cleanup-prcm
> Merge branch 'omap-for-v3.8/cleanup-headers' into omap-for-v3.8/cleanup-prcm
Hi,
The history of this branch looks a little odd. Did you mean to merge in
cleanup-headers on top of Paul's branch in it? It seems to add no value -- all
that code is already in our branch and it resolves no conflicts, etc.
That being said, it causes no harm, and I've pulled it in as is.
-Olof
^ permalink raw reply [flat|nested] 11+ messages in thread
* [GIT PULL 3/3] omap prcm cleanup for v3.8 merge window, part1
@ 2012-11-05 18:51 ` Olof Johansson
0 siblings, 0 replies; 11+ messages in thread
From: Olof Johansson @ 2012-11-05 18:51 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Oct 26, 2012 at 02:23:40PM -0700, Tony Lindgren wrote:
> The following changes since commit a0212796b58061a9716178d261f318925c246643:
>
> Merge tag 'omap-cleanup-fixes-a-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/cleanup-headers (2012-10-26 13:18:19 -0700)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-prcm-part1-take2-signed
>
> for you to fetch changes up to 7fc54fd3084457c7f11b9e2e1e3fcd19a3badc33:
>
> Merge branch 'omap-for-v3.8/cleanup-headers' into omap-for-v3.8/cleanup-prcm (2012-10-26 13:32:22 -0700)
>
> ----------------------------------------------------------------
>
> From Paul Walmsley <paul@pwsan.com>:
>
> The first set of OMAP PRM/CM-related cleanup patches for 3.8.
> Prepares for the future move of the PRM/CM code to drivers/. Also
> includes some prcm.[ch] cleanup patches from the WDTIMER cleanup
> series that don't need external acks.
>
> ----------------------------------------------------------------
> Paul Walmsley (9):
> ARM: OMAP2+: PRM: remove PRM weak functions
> ARM: OMAP2+: PRM: split PRM functions into OMAP2, OMAP3-specific files
> ARM: OMAP2+: powerdomain/PRM: move the low-level powerdomain functions into PRM
> ARM: OMAP2+: CM/hwmod: split CM functions into OMAP2, OMAP3-specific files
> ARM: OMAP2/3: clockdomain/PRM/CM: move the low-level clockdomain functions into PRM/CM
> ARM: OMAP2+: PRM: prepare for use of prm_ll_data function pointers
> ARM: OMAP2+: CM: prepare for use of cm_ll_data function pointers
> ARM: OMAP1: create read_reset_sources() function (for initial use by watchdog)
> ARM: OMAP2+: PRM: create PRM reset source API for the watchdog timer driver
>
> Tony Lindgren (2):
> Merge tag 'omap-cleanup-a-for-3.8' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v3.8/cleanup-prcm
> Merge branch 'omap-for-v3.8/cleanup-headers' into omap-for-v3.8/cleanup-prcm
Hi,
The history of this branch looks a little odd. Did you mean to merge in
cleanup-headers on top of Paul's branch in it? It seems to add no value -- all
that code is already in our branch and it resolves no conflicts, etc.
That being said, it causes no harm, and I've pulled it in as is.
-Olof
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [GIT PULL 3/3] omap prcm cleanup for v3.8 merge window, part1
2012-11-05 18:51 ` Olof Johansson
@ 2012-11-06 17:59 ` Tony Lindgren
-1 siblings, 0 replies; 11+ messages in thread
From: Tony Lindgren @ 2012-11-06 17:59 UTC (permalink / raw)
To: Olof Johansson; +Cc: Arnd Bergmann, linux-omap, linux-arm-kernel
* Olof Johansson <olof@lixom.net> [121105 10:53]:
>
> The history of this branch looks a little odd. Did you mean to merge in
> cleanup-headers on top of Paul's branch in it? It seems to add no value -- all
> that code is already in our branch and it resolves no conflicts, etc.
Oh that was because I wanted to keep the header clean up separate
and Paul needed some base for further PRCM work that would not
conflict with the header changes. And I wanted to get the first
set of Paul's changes into linux next early to avoid a big pile
of pull requests later on.
> That being said, it causes no harm, and I've pulled it in as is.
OK thanks.
Regards,
Tony
^ permalink raw reply [flat|nested] 11+ messages in thread
* [GIT PULL 3/3] omap prcm cleanup for v3.8 merge window, part1
@ 2012-11-06 17:59 ` Tony Lindgren
0 siblings, 0 replies; 11+ messages in thread
From: Tony Lindgren @ 2012-11-06 17:59 UTC (permalink / raw)
To: linux-arm-kernel
* Olof Johansson <olof@lixom.net> [121105 10:53]:
>
> The history of this branch looks a little odd. Did you mean to merge in
> cleanup-headers on top of Paul's branch in it? It seems to add no value -- all
> that code is already in our branch and it resolves no conflicts, etc.
Oh that was because I wanted to keep the header clean up separate
and Paul needed some base for further PRCM work that would not
conflict with the header changes. And I wanted to get the first
set of Paul's changes into linux next early to avoid a big pile
of pull requests later on.
> That being said, it causes no harm, and I've pulled it in as is.
OK thanks.
Regards,
Tony
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2012-11-06 18:00 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-26 21:23 [GIT PULL 1/3] omap plat header removal for v3.8 merge window, part2 Tony Lindgren
2012-10-26 21:23 ` [GIT PULL 3/3] omap prcm cleanup for v3.8 merge window, part1 Tony Lindgren
2012-10-26 21:23 ` [GIT PULL 2/3] omap plat header removal for v3.8 merge window, part3 Tony Lindgren
2012-10-26 21:23 ` [GIT PULL 3/3] omap prcm cleanup for v3.8 merge window, part1 Tony Lindgren
2012-11-05 18:51 ` Olof Johansson
2012-11-05 18:51 ` Olof Johansson
2012-11-06 17:59 ` Tony Lindgren
2012-11-06 17:59 ` Tony Lindgren
2012-10-26 21:23 ` [GIT PULL 2/3] omap plat header removal for v3.8 merge window, part3 Tony Lindgren
[not found] ` <508aff60.4688e50a.0457.ffff898bSMTPIN_ADDED@mx.google.com>
2012-11-05 18:31 ` Olof Johansson
2012-11-05 18:31 ` Olof Johansson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.