* [GIT PULL 3/6] omap dmtimer changes for v3.6 merge window
[not found] <pull-1341133277-501333>
@ 2012-07-01 9:01 ` Tony Lindgren
2012-07-01 9:01 ` [GIT PULL 4/6] omap HDQ1W and smartreflex driver " Tony Lindgren
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Tony Lindgren @ 2012-07-01 9:01 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
The following changes since commit cfaf025112d3856637ff34a767ef785ef5cf2ca9:
Linux 3.5-rc2 (2012-06-08 18:40:09 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-dmtimer-for-v3.6
for you to fetch changes up to c59b537d87068be8c357a0150f6172a2dc8cdf82:
ARM: OMAP2+: Simplify dmtimer clock aliases (2012-06-14 02:39:47 -0700)
----------------------------------------------------------------
Here are some omap dmtimer changes to make it easier to add
device tree support for dmtimer by simplifying the platform
data structure used by dmtimr.
----------------------------------------------------------------
Jon Hunter (12):
ARM: OMAP: Remove unnecessary clk structure
ARM: OMAP2+: Remove unused max number of timers definition
ARM: OMAP2+: Add dmtimer platform function to reserve systimers
ARM: OMAP: Add DMTIMER capability variable to represent timer features
ARM: OMAP2+: HWMOD: Correct timer device attributes
ARM: OMAP2+: Fix external clock support for dmtimers
ARM: OMAP: Remove loses_context variable from timer platform data
ARM: OMAP: Remove timer function pointer for context loss counter
ARM: OMAP: Add flag to indicate if a timer needs a manual reset
ARM: OMAP1: Fix dmtimer support
ARM: OMAP2+: Move dmtimer clock set function to dmtimer driver
ARM: OMAP2+: Simplify dmtimer clock aliases
arch/arm/mach-omap1/timer.c | 3 +-
arch/arm/mach-omap2/clock2420_data.c | 39 +------
arch/arm/mach-omap2/clock2430_data.c | 39 +------
arch/arm/mach-omap2/clock3xxx_data.c | 26 +----
arch/arm/mach-omap2/clock44xx_data.c | 34 +++---
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 8 --
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 10 +-
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 6 --
arch/arm/mach-omap2/timer.c | 82 +--------------
arch/arm/plat-omap/dmtimer.c | 111 +++++++++++++++-----
arch/arm/plat-omap/include/plat/dmtimer.h | 22 +---
11 files changed, 118 insertions(+), 262 deletions(-)
^ permalink raw reply [flat|nested] 8+ messages in thread* [GIT PULL 4/6] omap HDQ1W and smartreflex driver changes for v3.6 merge window
[not found] <pull-1341133277-501333>
2012-07-01 9:01 ` [GIT PULL 3/6] omap dmtimer changes for v3.6 merge window Tony Lindgren
@ 2012-07-01 9:01 ` Tony Lindgren
2012-07-01 9:01 ` [GIT PULL 2/6] omap cleanup " Tony Lindgren
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Tony Lindgren @ 2012-07-01 9:01 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
The following changes since commit 6b16351acbd415e66ba16bf7d473ece1574cf0bc:
Linux 3.5-rc4 (2012-06-24 12:53:04 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-driver-for-v3.6
for you to fetch changes up to bb0adf6ca6c78758c12b054fe3f25023033072ab:
ARM: OMAP2+: do not allow SmartReflex to be built as a module (2012-06-29 05:54:31 -0700)
----------------------------------------------------------------
Here are omap driver changes for v3.6 that were agreed to be merged
via the omap tree. These changes convert omap HDQ1W driver to use
runtime PM, and finally move omap SmartReflex driver from arch/arm
to live under drivers.
----------------------------------------------------------------
J Keerthy (1):
ARM: OMAP2+: Voltage: Move the omap_volt_data structure to plat
Jean Pihet (10):
ARM: OMAP2+: SmartReflex: move the smartreflex header to include/linux/power
ARM: OMAP3+: SmartReflex: class drivers should use struct omap_sr *
ARM: OMAP2+: smartreflex: Use the names from hwmod data instead of voltage domains.
ARM: OMAP3: hwmod: rename the smartreflex entries
ARM: OMAP2+: SmartReflex: introduce a busy loop condition test macro
ARM: OMAP2+: SmartReflex: Use per-OPP data structure
ARM: OMAP2+: SmartReflex: Create per-opp debugfs node for errminlimit
ARM: OMAP2+: SmartReflex: add POWER_AVS Kconfig options
ARM: OMAP: SmartReflex: Move smartreflex driver to drivers/
ARM: OMAP2+: do not allow SmartReflex to be built as a module
Paul Walmsley (4):
W1: OMAP HDQ1W: allow driver to be built on all OMAP2+
W1: OMAP HDQ1W: use 32-bit register accesses
ARM: OMAP2+: HDQ1W: use omap_device
W1: OMAP HDQ1W: use runtime PM
Tony Lindgren (3):
Merge tag 'omap-devel-b-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into devel-driver
ARM: OMAP2: Use hwmod to initialize mmc for 2420
Merge branch 'for_3.6/pm/sr-move' of git://git.kernel.org/.../khilman/linux-omap-pm into devel-driver
arch/arm/mach-omap2/Makefile | 5 +-
arch/arm/mach-omap2/devices.c | 108 -------------
arch/arm/mach-omap2/hdq1w.c | 26 ++++
arch/arm/mach-omap2/msdi.c | 73 +++++++++
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 12 +-
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 3 +-
arch/arm/mach-omap2/pm.h | 2 +-
arch/arm/mach-omap2/smartreflex-class3.c | 29 ++--
arch/arm/mach-omap2/sr_device.c | 39 ++++-
arch/arm/mach-omap2/voltage.h | 21 +--
arch/arm/plat-omap/Kconfig | 31 ++--
arch/arm/plat-omap/include/plat/voltage.h | 21 ++-
drivers/power/Kconfig | 2 +
drivers/power/Makefile | 1 +
drivers/power/avs/Kconfig | 12 ++
drivers/power/avs/Makefile | 1 +
.../mach-omap2 => drivers/power/avs}/smartreflex.c | 161 ++++++++------------
drivers/w1/masters/Kconfig | 2 +-
drivers/w1/masters/omap_hdq.c | 86 +++--------
.../linux/power}/smartreflex.h | 74 +++++++--
20 files changed, 352 insertions(+), 357 deletions(-)
create mode 100644 drivers/power/avs/Kconfig
create mode 100644 drivers/power/avs/Makefile
rename {arch/arm/mach-omap2 => drivers/power/avs}/smartreflex.c (90%)
rename {arch/arm/mach-omap2 => include/linux/power}/smartreflex.h (79%)
^ permalink raw reply [flat|nested] 8+ messages in thread* [GIT PULL 2/6] omap cleanup for v3.6 merge window
[not found] <pull-1341133277-501333>
2012-07-01 9:01 ` [GIT PULL 3/6] omap dmtimer changes for v3.6 merge window Tony Lindgren
2012-07-01 9:01 ` [GIT PULL 4/6] omap HDQ1W and smartreflex driver " Tony Lindgren
@ 2012-07-01 9:01 ` Tony Lindgren
2012-07-01 9:01 ` [GIT PULL 5/6] omap PM changes for PRCM I/O chain wakeup and cpuidle " Tony Lindgren
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Tony Lindgren @ 2012-07-01 9:01 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
The following changes since commit 6b16351acbd415e66ba16bf7d473ece1574cf0bc:
Linux 3.5-rc4 (2012-06-24 12:53:04 -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.6
for you to fetch changes up to 472fd5401561f94698f4c8f9dbbbfbf76ab55626:
Merge branch 'cleanup-hwmod' into cleanup (2012-06-28 05:47:01 -0700)
----------------------------------------------------------------
Here is some more omap clean-up. The biggest changes are
hwmod, clock, and System Control Module cleanup, and the removal
of the last instance of omap_read/write usage for omap2+ with
the removal of unused USB OHCI Full Speed driver support. The
removed OHCI is only currently used for omap1 as the actively
used omap2+ boards have either MUSB or another instance of
OHCI+EHCI that's more usable.
----------------------------------------------------------------
Kevin Hilman (7):
ARM: OMAP4: hwmod: rename _enable_module to _omap4_enable_module()
ARM: OMAP2+: hwmod: use init-time function ptrs for enable/disable module
ARM: OMAP4: hwmod: drop extra cpu_is check from _wait_target_disable()
ARM: OMAP2+: hwmod: use init-time function pointer for wait_target_ready
ARM: OMAP2+: hwmod: use init-time function pointer for hardreset
ARM: OMAP2+: hwmod: use init-time function pointer for _init_clkdm
ARM: OMAP2+: CLEANUP: Remove ARCH_OMAPx ifdef from struct dpll_data
Oleg Matcovschi (1):
ARM: OMAP: dma: Clear status registers on enable/disable irq
Omar Ramirez Luna (2):
ARM: OMAP2+: control: new APIs to configure boot address and mode
ARM: OMAP: dsp: interface to control module functions
Paul Walmsley (2):
ARM: OMAP2+: hwmod: remove prm_clkdm, cm_clkdm; allow hwmods to have no clockdomain
Merge branches 'clock_cleanup_misc_3.6', 'control_clean_dspbridge_writes_cleanup_3.6', 'hwmod_soc_conditional_cleanup_3.6', 'mcbsp_clock_aliases_cleanup_3.6' and 'remove_clkdm_requirement_from_hwmod_3.6' into omap_cleanup_a_3.6
Peter Ujfalusi (3):
ARM: OMAP2: Move McBSP fck clock alias to hwmod data for OMAP2420
ARM: OMAP2: Move McBSP fck clock alias to hwmod data for OMAP2430
ARM: OMAP3: Move McBSP fck clock alias to hwmod data
Tony Lindgren (6):
ARM: OMAP3: There is no FS USB controller on omap3
ARM: OMAP2: Remove legacy USB FS support
ARM: OMAP: Make FS USB omap1 only
Merge tag 'omap-cleanup-a-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into cleanup-hwmod
Merge branches 'cleanup-udc' and 'cleanup-dma' into cleanup
Merge branch 'cleanup-hwmod' into cleanup
arch/arm/mach-omap1/board-ams-delta.c | 2 +-
arch/arm/mach-omap1/board-generic.c | 4 +-
arch/arm/mach-omap1/board-h2.c | 2 +-
arch/arm/mach-omap1/board-h3.c | 2 +-
arch/arm/mach-omap1/board-htcherald.c | 2 +-
arch/arm/mach-omap1/board-innovator.c | 2 +-
arch/arm/mach-omap1/board-nokia770.c | 2 +-
arch/arm/mach-omap1/board-osk.c | 2 +-
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-sx1.c | 2 +-
arch/arm/mach-omap1/board-voiceblue.c | 3 +-
arch/arm/mach-omap1/clock_data.c | 3 +-
arch/arm/mach-omap1/include/mach/usb.h | 165 ++++++++
arch/arm/mach-omap1/usb.c | 116 +++++-
arch/arm/mach-omap2/Kconfig | 3 -
arch/arm/mach-omap2/Makefile | 4 -
arch/arm/mach-omap2/board-2430sdp.c | 11 -
arch/arm/mach-omap2/board-apollon.c | 18 -
arch/arm/mach-omap2/board-h4.c | 13 -
arch/arm/mach-omap2/clock2420_data.c | 4 -
arch/arm/mach-omap2/clock2430_data.c | 10 -
arch/arm/mach-omap2/clock3xxx_data.c | 10 -
arch/arm/mach-omap2/clockdomain.h | 2 -
arch/arm/mach-omap2/clockdomains2420_data.c | 2 -
arch/arm/mach-omap2/clockdomains2430_data.c | 2 -
arch/arm/mach-omap2/clockdomains3xxx_data.c | 2 -
arch/arm/mach-omap2/clockdomains44xx_data.c | 2 -
arch/arm/mach-omap2/clockdomains_common_data.c | 24 --
arch/arm/mach-omap2/control.c | 43 ++
arch/arm/mach-omap2/control.h | 2 +
arch/arm/mach-omap2/dsp.c | 4 +
.../include/mach/ctrl_module_core_44xx.h | 1 +
arch/arm/mach-omap2/omap_hwmod.c | 427 ++++++++++++++------
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 10 +
arch/arm/mach-omap2/omap_hwmod_2430_data.c | 16 +
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 23 ++
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 4 +-
arch/arm/mach-omap2/usb-fs.c | 359 ----------------
arch/arm/plat-omap/Makefile | 2 +-
arch/arm/plat-omap/dma.c | 59 ++-
arch/arm/plat-omap/include/plat/board.h | 38 --
arch/arm/plat-omap/include/plat/clock.h | 2 -
arch/arm/plat-omap/include/plat/dsp.h | 3 +
arch/arm/plat-omap/include/plat/omap_hwmod.h | 2 +
arch/arm/plat-omap/include/plat/usb.h | 196 +--------
arch/arm/plat-omap/usb.c | 145 -------
drivers/usb/gadget/Kconfig | 2 +-
drivers/usb/gadget/omap_udc.c | 3 +-
drivers/usb/host/Kconfig | 2 +-
drivers/usb/host/ohci-omap.c | 7 +-
drivers/usb/otg/isp1301_omap.c | 2 +-
53 files changed, 747 insertions(+), 1025 deletions(-)
create mode 100644 arch/arm/mach-omap1/include/mach/usb.h
delete mode 100644 arch/arm/mach-omap2/clockdomains_common_data.c
delete mode 100644 arch/arm/mach-omap2/usb-fs.c
delete mode 100644 arch/arm/plat-omap/usb.c
^ permalink raw reply [flat|nested] 8+ messages in thread* [GIT PULL 5/6] omap PM changes for PRCM I/O chain wakeup and cpuidle for v3.6 merge window
[not found] <pull-1341133277-501333>
` (2 preceding siblings ...)
2012-07-01 9:01 ` [GIT PULL 2/6] omap cleanup " Tony Lindgren
@ 2012-07-01 9:01 ` Tony Lindgren
2012-07-01 9:01 ` [GIT PULL 6/6] am33xx changes " Tony Lindgren
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Tony Lindgren @ 2012-07-01 9:01 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
The following changes since commit 6b16351acbd415e66ba16bf7d473ece1574cf0bc:
Linux 3.5-rc4 (2012-06-24 12:53:04 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-pm-for-v3.6
for you to fetch changes up to d660e9b92b44f113c3fc345a8ce66ffa56a3506f:
ARM: OMAP2+: PM: fix IRQ_NOAUTOEN removal by mis-merge (2012-06-29 07:19:52 -0700)
----------------------------------------------------------------
Here are some omap PM changes that reimplement omap PRCM I/O chain
code for wake-ups, and improve idle latencies for cpuidle.
----------------------------------------------------------------
Jean Pihet (3):
ARM: OMAP3: PM: cpuidle: default to C1 in next_valid_state
ARM: OMAP3: PM: cpuidle: optimize the PER latency in C1 state
ARM: OMAP3: PM: cpuidle: optimize the clkdm idle latency in C1 state
Kevin Hilman (5):
ARM: OMAP2+: PRM: fix compile for OMAP4-only build
ARM: OMAP2+: powerdomain: allow pre/post transtion to be per pwrdm
ARM: OMAP3: PM: call pre/post transition per powerdomain
ARM: OMAP3: PM: cleanup cam_pwrdm leftovers
ARM: OMAP2+: PM: fix IRQ_NOAUTOEN removal by mis-merge
Mohan V (1):
ARM: OMAP3: PM: correct enable/disable of daisy io chain
Rajendra Nayak (1):
ARM: OMAP4: PRM: Add IO Daisychain support
Tero Kristo (1):
ARM: OMAP3+: PRM: Enable IO wake up
Tony Lindgren (2):
Merge tag 'omap-devel-c-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into devel-pm
Merge branch 'for_3.6/pm/performance' of git://git.kernel.org/.../khilman/linux-omap-pm into devel-pm
Vishwanath BS (3):
ARM: OMAP3: PM: Move IO Daisychain function to omap3 prm file
ARM: OMAP3PLUS: hwmod: reconfigure IO Daisychain during hwmod mux
ARM: OMAP3: PM: Remove IO Daisychain control from cpuidle
arch/arm/mach-omap2/cpuidle34xx.c | 71 +++++++++++------------------
arch/arm/mach-omap2/omap-mpuss-lowpower.c | 4 +-
arch/arm/mach-omap2/omap_hwmod.c | 38 ++++++++++++++-
arch/arm/mach-omap2/pm34xx.c | 63 ++++++-------------------
arch/arm/mach-omap2/powerdomain.c | 16 +++++--
arch/arm/mach-omap2/powerdomain.h | 4 +-
arch/arm/mach-omap2/prcm-common.h | 8 ++++
arch/arm/mach-omap2/prm2xxx_3xxx.c | 48 +++++++++++++++++++
arch/arm/mach-omap2/prm2xxx_3xxx.h | 6 ++-
arch/arm/mach-omap2/prm44xx.c | 63 ++++++++++++++++++++++++-
arch/arm/mach-omap2/prm44xx.h | 2 +
11 files changed, 216 insertions(+), 107 deletions(-)
^ permalink raw reply [flat|nested] 8+ messages in thread* [GIT PULL 6/6] am33xx changes for v3.6 merge window
[not found] <pull-1341133277-501333>
` (3 preceding siblings ...)
2012-07-01 9:01 ` [GIT PULL 5/6] omap PM changes for PRCM I/O chain wakeup and cpuidle " Tony Lindgren
@ 2012-07-01 9:01 ` Tony Lindgren
[not found] ` <E1SlGGy-0003tf-Lc@merlin.infradead.org>
2012-07-03 20:23 ` [GIT PULL 1/6] omap non-critical fixes " Arnd Bergmann
6 siblings, 0 replies; 8+ messages in thread
From: Tony Lindgren @ 2012-07-01 9:01 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
The following changes since commit f8f5701bdaf9134b1f90e5044a82c66324d2073f:
Linux 3.5-rc1 (2012-06-02 18:29:26 -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.6
for you to fetch changes up to 6fd8246b1c1167c983b089f9eaafa13ef9ca7adf:
Merge tag 'omap-devel-a-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-am33xx (2012-06-22 01:50:22 -0700)
----------------------------------------------------------------
Here are changes to add support for am33xx processors for the
clock, power, and voltagedomains.
----------------------------------------------------------------
Afzal Mohammed (2):
ARM: OMAP2+: am33xx: Add low level debugging support
ARM: OMAP2+: am33xx: Add AM335XEVM machine support
Tony Lindgren (1):
Merge tag 'omap-devel-a-for-3.6' of git://git.kernel.org/.../pjw/omap-pending into devel-am33xx
Vaibhav Hiremath (6):
ARM: OMAP2+: control: Add AM33XX control reg & sec clkctrl offset
ARM: OMAP AM33xx: voltagedomain: Add voltage domain data
ARM: OMAP AM33xx: PRM: add PRM support
ARM: OMAP AM33xx: CM: Introduce AM33xx CM APIs and register level details
ARM: OMAP AM33xx: powerdomains: add AM335x support
ARM: OMAP AM33xx: clockdomains: Add clockdomain data and respective operations
arch/arm/mach-omap2/Makefile | 6 +
arch/arm/mach-omap2/board-generic.c | 18 +
arch/arm/mach-omap2/clockdomain.h | 2 +
arch/arm/mach-omap2/clockdomain33xx.c | 74 +++
arch/arm/mach-omap2/clockdomains33xx_data.c | 196 +++++++
arch/arm/mach-omap2/cm-regbits-33xx.h | 687 ++++++++++++++++++++++++
arch/arm/mach-omap2/cm33xx.c | 313 +++++++++++
arch/arm/mach-omap2/cm33xx.h | 420 +++++++++++++++
arch/arm/mach-omap2/common.h | 3 +
arch/arm/mach-omap2/control.h | 39 +-
arch/arm/mach-omap2/include/mach/debug-macro.S | 17 +-
arch/arm/mach-omap2/io.c | 13 +
arch/arm/mach-omap2/irq.c | 2 +-
arch/arm/mach-omap2/powerdomain.h | 23 +-
arch/arm/mach-omap2/powerdomain33xx.c | 229 ++++++++
arch/arm/mach-omap2/powerdomains33xx_data.c | 185 +++++++
arch/arm/mach-omap2/prm-regbits-33xx.h | 357 ++++++++++++
arch/arm/mach-omap2/prm33xx.c | 135 +++++
arch/arm/mach-omap2/prm33xx.h | 129 +++++
arch/arm/mach-omap2/timer.c | 5 +
arch/arm/mach-omap2/voltage.h | 1 +
arch/arm/mach-omap2/voltagedomains33xx_data.c | 43 ++
arch/arm/plat-omap/include/plat/serial.h | 4 +
arch/arm/plat-omap/include/plat/uncompress.h | 6 +
24 files changed, 2887 insertions(+), 20 deletions(-)
create mode 100644 arch/arm/mach-omap2/clockdomain33xx.c
create mode 100644 arch/arm/mach-omap2/clockdomains33xx_data.c
create mode 100644 arch/arm/mach-omap2/cm-regbits-33xx.h
create mode 100644 arch/arm/mach-omap2/cm33xx.c
create mode 100644 arch/arm/mach-omap2/cm33xx.h
create mode 100644 arch/arm/mach-omap2/powerdomain33xx.c
create mode 100644 arch/arm/mach-omap2/powerdomains33xx_data.c
create mode 100644 arch/arm/mach-omap2/prm-regbits-33xx.h
create mode 100644 arch/arm/mach-omap2/prm33xx.c
create mode 100644 arch/arm/mach-omap2/prm33xx.h
create mode 100644 arch/arm/mach-omap2/voltagedomains33xx_data.c
^ permalink raw reply [flat|nested] 8+ messages in thread[parent not found: <E1SlGGy-0003tf-Lc@merlin.infradead.org>]
* Re: [GIT PULL 2/6] omap cleanup for v3.6 merge window
[not found] ` <E1SlGGy-0003tf-Lc@merlin.infradead.org>
@ 2012-07-01 9:39 ` Tony Lindgren
0 siblings, 0 replies; 8+ messages in thread
From: Tony Lindgren @ 2012-07-01 9:39 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
* Tony Lindgren <tony@atomide.com> [120701 02:28]:
> The following changes since commit 6b16351acbd415e66ba16bf7d473ece1574cf0bc:
>
> Linux 3.5-rc4 (2012-06-24 12:53:04 -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.6
>
> for you to fetch changes up to 472fd5401561f94698f4c8f9dbbbfbf76ab55626:
>
> Merge branch 'cleanup-hwmod' into cleanup (2012-06-28 05:47:01 -0700)
>
> ----------------------------------------------------------------
>
> Here is some more omap clean-up. The biggest changes are
> hwmod, clock, and System Control Module cleanup, and the removal
> of the last instance of omap_read/write usage for omap2+ with
> the removal of unused USB OHCI Full Speed driver support. The
> removed OHCI is only currently used for omap1 as the actively
> used omap2+ boards have either MUSB or another instance of
> OHCI+EHCI that's more usable.
>
> ----------------------------------------------------------------
This one has a merge conflict with the non-critical fixes in 1/6
of this series that can be resolved as below.
Tony
--- a/arch/arm/mach-omap2/clockdomains3xxx_data.c
+++ b/arch/arm/mach-omap2/clockdomains3xxx_data.c
@@@ -452,15 -345,20 +452,14 @@@ static struct clkdm_autodep clkdm_am35x
*
*/
-static struct clockdomain *clockdomains_omap3430_common[] __initdata = {
+static struct clockdomain *clockdomains_common[] __initdata = {
&wkup_common_clkdm,
- &cm_common_clkdm,
- &prm_common_clkdm,
+ &mpu_3xxx_clkdm,
&neon_clkdm,
- &iva2_clkdm,
- &d2d_clkdm,
&core_l3_3xxx_clkdm,
&core_l4_3xxx_clkdm,
- &dss_3xxx_clkdm,
- &cam_clkdm,
- &per_clkdm,
&emu_clkdm,
&dpll1_clkdm,
- &dpll2_clkdm,
&dpll3_clkdm,
&dpll4_clkdm,
NULL
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [GIT PULL 1/6] omap non-critical fixes for v3.6 merge window
[not found] <pull-1341133277-501333>
` (5 preceding siblings ...)
[not found] ` <E1SlGGy-0003tf-Lc@merlin.infradead.org>
@ 2012-07-03 20:23 ` Arnd Bergmann
2012-07-04 6:21 ` Tony Lindgren
6 siblings, 1 reply; 8+ messages in thread
From: Arnd Bergmann @ 2012-07-03 20:23 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Olof Johansson, linux-omap, linux-arm-kernel
On Sunday 01 July 2012, Tony Lindgren wrote:
> The following changes since commit 6b16351acbd415e66ba16bf7d473ece1574cf0bc:
>
> Linux 3.5-rc4 (2012-06-24 12:53:04 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-fixes-non-critical-for-v3.6
Merged all six pull request. Thanks a lot for all your thorough
work, it's always great to pull requests like these.
I ended up putting both tags/omap-devel-pm-for-v3.6 and and
tags/omap-devel-driver-for-v3.6 into the next/pm branch as they are
both mostly power management related in some way.
Everything else went into the obvious place.
Arnd
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [GIT PULL 1/6] omap non-critical fixes for v3.6 merge window
2012-07-03 20:23 ` [GIT PULL 1/6] omap non-critical fixes " Arnd Bergmann
@ 2012-07-04 6:21 ` Tony Lindgren
0 siblings, 0 replies; 8+ messages in thread
From: Tony Lindgren @ 2012-07-04 6:21 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: Olof Johansson, linux-omap, linux-arm-kernel
* Arnd Bergmann <arnd@arndb.de> [120703 13:28]:
> On Sunday 01 July 2012, Tony Lindgren wrote:
> > The following changes since commit 6b16351acbd415e66ba16bf7d473ece1574cf0bc:
> >
> > Linux 3.5-rc4 (2012-06-24 12:53:04 -0700)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-fixes-non-critical-for-v3.6
>
>
> Merged all six pull request. Thanks a lot for all your thorough
> work, it's always great to pull requests like these.
>
> I ended up putting both tags/omap-devel-pm-for-v3.6 and and
> tags/omap-devel-driver-for-v3.6 into the next/pm branch as they are
> both mostly power management related in some way.
>
> Everything else went into the obvious place.
OK thanks!
Tony
^ permalink raw reply [flat|nested] 8+ messages in thread