omap clock late patches for v3.7 merge window
The following changes since commit 1e2ee2a60df5c3ab74dd1c9155fb01b5bc6f807d:
Merge tag 'omap-devel-am33xx-for-v3.7' into test_v3.6-rc6_ocb3.7_cff3.7_odaf3.7 (2012-09-23 17:16:04 -0600)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-late-for-v3.7
for you to fetch changes up to 9cd68fa707cf6372f33eb51a5719dd7626efe5f6:
Merge tag 'omap-devel-b-c-2-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into devel-late (2012-09-23 19:31:35 -0700)
----------------------------------------------------------------
These changes take us a step closer to merging the common clock framework for omap but unfortunately these patches were not ready for merging earlier. See also the notes below on the dependencies these patches have, they are based on a merge of sereral branches already merged.
Quoted 1 line
From Paul Walmsley <[email protected]>:
OMAP patches intended for the 3.7 merge window:
- Runtime PM conversions for the GPMC and RNG IP blocks
- Preparation patches for the OMAP common clock framework conversion
- clkdev alias additions required by other drivers
- Performance Monitoring Unit (PMU) support for OMAP2, 3, and non-4430 OMAP4
- OMAP hwmod code and data improvements
- Preparation patches for the IOMMU runtime PM conversion
- Preparation patches for OMAP4 full-chip retention support
Based on a merge of v3.6-rc6, the omap-cleanup-b-for-3.7 tag (7852ec0536ca39cefffc6301dc77f8ae55592926),the cleanup-fixes-for-v3.7 tag (de6ca33a96a6bf61fcb91d3d399703e19ead9d1e), and the omap-devel-am33xx-for-v3.7 tag (11964f53eb4d9ce59a058be9999d9cfcb1ced878), due to dependencies.
----------------------------------------------------------------
Afzal Mohammed (3):
ARM: OMAP2/3: hwmod data: add gpmc
ARM: OMAP2+: gpmc: Adapt to HWMOD
ARM: OMAP2+: gpmc: minimal driver support
AnilKumar Ch (1):
ARM: OMAP2+: AM33XX: clock data: Add clkdev alias for cpu0
Benoit Cousson (1):
ARM: OMAP4: hwmod data: Fix ocp2scp_usb_phy and usb_host_hs entries
Igor Grinberg (1):
ARM: OMAP: hwmod code: remove unused hwmod function prototypes
Jon Hunter (7):
ARM: OMAP2420: Cosmetic fix for timer clock aliases
ARM: OMAP4: Add timer clock aliases for device-tree
ARM: OMAP: Add a timer attribute for timers that can interrupt the DSP
ARM: OMAP3: hwmod data: Add debugss HWMOD data
ARM: OMAP2+: PMU: Convert OMAP2/3 devices to use HWMOD
ARM: OMAP2+: PMU: Add runtime PM support
ARM: OMAP4460/4470: PMU: Enable PMU for OMAP4460/70
Kishon Vijay Abraham I (1):
ARM: OMAP4: hwmod data: make *phy_48m* as the main_clk of ocp2scp
Michael Jones (1):
ARM: OMAP3: clock data: remove obsolete comment
Mike Turquette (1):
ARM: OMAP4: cm: add bitfield width values
Ming Lei (1):
ARM: OMAP4430: PMU: prepare to create PMU device via HWMOD
Omar Ramirez Luna (5):
ARM: OMAP2+: omap_device: expose hwmod assert/deassert to omap devices
ARM: OMAP: hwmod: partially un-reset hwmods might not be properly enabled
ARM: OMAP: hwmod: revise deassert sequence
ARM: OMAP: iommu: fix including iommu.h without IOMMU_API selected
ARM: OMAP4: hwmod data: add mmu hwmod for ipu and dsp
Paul Walmsley (16):
Merge tag 'cleanup-fixes-for-v3.7' into test_v3.6-rc6_cff3.7_odaf3.7 Merge tag 'omap-devel-am33xx-for-v3.7' into test_v3.6-rc6_cff3.7_odaf3.7
ARM: OMAP3: clock data: Add the USB TLL clocks device name
ARM: OMAP2+: clock data: add some aliases for use by CPUFreq only
SPI: OMAP: remove unnecessary includes of plat/clock.h
Merge branch 'clock_devel_3.7' into hwmod_prcm_clock_a_3.7
ARM: OMAP4+: hwmod code: remove clkdm requirement in _omap4_wait_target_*()
ARM: OMAP2+: hwmod code: convert missing clockdomain warnings to debug messages
ARM: OMAP4: hwmod data: add missing HWMOD_NO_IDLEST flags to some PRCM IP blocks
ARM: OMAP3: hwmod data: add mmu data for iva and isp
ARM: OMAP2xxx: hwmod/CM: add RNG integration data
hwrng: OMAP: store per-device data in per-device variables, not file statics
hwrng: OMAP: convert to use runtime PM
ARM: OMAP: split OMAP1, OMAP2+ RNG device registration
hwrng: OMAP: remove SoC restrictions from driver registration
ARM: OMAP2+: clockdomain/hwmod: add workaround for EMU clockdomain idle problems
Rajendra Nayak (3):
ARM: omap: clk: add clk_prepare and clk_unprepare
ARM: OMAP2+: hwmod: get rid of all omap_clk_get_by_name usage
ARM: OMAP2+: clock: Remove all direct dereferencing of struct clk
Tero Kristo (4):
ARM: OMAP4: powerdomain: add support for reading prev logic and mem states
ARM: OMAP4: hwmod data: add support for lostcontext_mask
ARM: OMAP4: hwmod: flag hwmods/modules not supporting module level context status
ARM: OMAP3: hwmod data: add sad2d hwmod
Tony Lindgren (1):
Merge tag 'omap-devel-b-c-2-for-3.7' of git://git.kernel.org/.../pjw/omap-pending into devel-late
Vaibhav Hiremath (1):
ARM: AM33XX: cm: Add bit-field width values
arch/arm/mach-omap1/devices.c | 28 ++ arch/arm/mach-omap1/timer.c | 2 +- arch/arm/mach-omap2/Makefile | 1 + arch/arm/mach-omap2/board-apollon.c | 4 +- arch/arm/mach-omap2/board-h4.c | 6 +- arch/arm/mach-omap2/board-omap4panda.c | 2 +- arch/arm/mach-omap2/clkt2xxx_apll.c | 2 +- arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 10 +- arch/arm/mach-omap2/clkt34xx_dpll3m2.c | 20 +- arch/arm/mach-omap2/clkt_clksel.c | 86 ++-- arch/arm/mach-omap2/clkt_dpll.c | 26 +- arch/arm/mach-omap2/clock.c | 9 +- arch/arm/mach-omap2/clock2420_data.c | 24 +- arch/arm/mach-omap2/clock2430_data.c | 23 ++ arch/arm/mach-omap2/clock33xx_data.c | 1 + arch/arm/mach-omap2/clock3xxx.c | 8 +- arch/arm/mach-omap2/clock3xxx_data.c | 37 +- arch/arm/mach-omap2/clock44xx_data.c | 21 + arch/arm/mach-omap2/clockdomain.c | 17 + arch/arm/mach-omap2/clockdomain.h | 20 +- arch/arm/mach-omap2/clockdomain2xxx_3xxx.c | 49 ++- arch/arm/mach-omap2/clockdomain44xx.c | 11 + arch/arm/mach-omap2/clockdomains3xxx_data.c | 7 +- arch/arm/mach-omap2/clockdomains44xx_data.c | 3 +- arch/arm/mach-omap2/cm-regbits-33xx.h | 158 +++++++- arch/arm/mach-omap2/cm-regbits-34xx.h | 2 + arch/arm/mach-omap2/cm-regbits-44xx.h | 411 ++++++++++++++++---- arch/arm/mach-omap2/cm2xxx_3xxx.c | 2 +- arch/arm/mach-omap2/cm2xxx_3xxx.h | 1 + arch/arm/mach-omap2/control.h | 1 + arch/arm/mach-omap2/devices.c | 39 +- arch/arm/mach-omap2/display.c | 4 +- arch/arm/mach-omap2/dpll3xxx.c | 48 ++- arch/arm/mach-omap2/gpmc.c | 194 ++++++--- arch/arm/mach-omap2/omap_hwmod.c | 138 +++++-- arch/arm/mach-omap2/omap_hwmod_2420_data.c | 19 + arch/arm/mach-omap2/omap_hwmod_2430_data.c | 19 + .../mach-omap2/omap_hwmod_2xxx_interconnect_data.c | 17 + arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 110 +++++- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 280 ++++++++++++- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 243 +++++++++++- arch/arm/mach-omap2/omap_hwmod_common_data.h | 6 +- arch/arm/mach-omap2/pm.c | 5 +- arch/arm/mach-omap2/pmu.c | 95 +++++ arch/arm/mach-omap2/powerdomain44xx.c | 61 ++- arch/arm/mach-omap2/prcm-common.h | 2 + arch/arm/plat-omap/clock.c | 27 -- arch/arm/plat-omap/include/plat/clock.h | 5 + arch/arm/plat-omap/include/plat/dmtimer.h | 1 + arch/arm/plat-omap/include/plat/iommu.h | 15 + arch/arm/plat-omap/include/plat/omap_device.h | 4 + arch/arm/plat-omap/include/plat/omap_hwmod.h | 26 +- arch/arm/plat-omap/omap_device.c | 59 ++- drivers/char/hw_random/omap-rng.c | 121 +++--- drivers/spi/spi-omap-100k.c | 2 - drivers/spi/spi-omap2-mcspi.c | 1 - 56 files changed, 2110 insertions(+), 423 deletions(-) create mode 100644 arch/arm/mach-omap2/pmu.c
[GIT PULL 2/3] omap platform and board related late patches for v3.7 merge window
The following changes since commit 0e70156de4c8465bfb8cb45cdc1bbc2fa474ce14:
ARM: OMAP2+: Make omap4-keypad.h local (2012-09-20 15:04:04 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-board-late-v2-for-v3.7
for you to fetch changes up to ead53717d9ab28c942b9adf66f8c02442dbfbc8a:
arm: make FORCE_MAX_ZONEORDER configurable for TI AM33XX (2012-09-24 10:32:39 -0700)
----------------------------------------------------------------
These board and platform related patches have been posted quite a while ago but have somehow fallen though the cracks as most of the focus has been making things to work with device tree. As the first patch depends on sparse IRQ related removal of irqs.h and related header moves, these are based on omap-cleanup-local-headers-for-v3.7 tag.
----------------------------------------------------------------
AnilKumar Ch (1):
ARM: OMAP2+: serial: Change MAX_HSUART_PORTS to 6
Peter Ujfalusi (1):
ARM: OMAP4: twl-common: Support for additional devices on i2c1 bus
Yegor Yefremov (1):
arm: make FORCE_MAX_ZONEORDER configurable for TI AM33XX
arch/arm/Kconfig | 5 ++-- arch/arm/mach-omap2/board-4430sdp.c | 12 ++++++-- arch/arm/mach-omap2/board-omap4panda.c | 12 ++++++-- arch/arm/mach-omap2/twl-common.c | 37 ++++++++----------------- arch/arm/mach-omap2/twl-common.h | 3 +- arch/arm/plat-omap/include/plat/omap-serial.h | 2 +- 6 files changed, 37 insertions(+), 34 deletions(-)
[GIT PULL 3/3] omap arch timer late changes for v3.7 merge window
In reply to Tony LindgrenThe following changes since commit 3fe05bd9980df7207a35b4841a94dc2875e86960:
Merge tag 'v3.6-rc6' into devel-dt (2012-09-24 11:42:13 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/devel-dt-arch-timer-for-v3.7
for you to fetch changes up to ef8fe6fee16f178cd80cf11b21565bca95b80182:
Merge branch 'devel-dt-arch-timer' into devel-dt (2012-09-24 11:42:24 -0700)
----------------------------------------------------------------
Few late patches to enable arch timer for omap5
using device tree.
----------------------------------------------------------------
Santosh Shilimkar (2):
ARM: OMAP: Add initialisation for the real-time counter.
ARM: OMAP5: Enable arch timer support
Tony Lindgren (2):
Merge branch 'for_3.7/omap5_arch_timer' of git://github.com/SantoshShilimkar/linux into devel-dt-arch-timer Merge branch 'devel-dt-arch-timer' into devel-dt
arch/arm/boot/dts/omap5.dtsi | 12 ++++++ arch/arm/mach-omap2/Kconfig | 5 +++ arch/arm/mach-omap2/timer.c | 97 +++++++++++++++++++++++++++++++++++++++++- 3 files changed, 113 insertions(+), 1 deletion(-)
[GIT PULL 2/3] omap platform and board related late patches for v3.7 merge window
In reply to Tony LindgrenThe following changes since commit 0e70156de4c8465bfb8cb45cdc1bbc2fa474ce14:
ARM: OMAP2+: Make omap4-keypad.h local (2012-09-20 15:04:04 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-board-late-v2-for-v3.7
for you to fetch changes up to ead53717d9ab28c942b9adf66f8c02442dbfbc8a:
arm: make FORCE_MAX_ZONEORDER configurable for TI AM33XX (2012-09-24 10:32:39 -0700)
----------------------------------------------------------------
These board and platform related patches have been posted quite a while ago but have somehow fallen though the cracks as most of the focus has been making things to work with device tree. As the first patch depends on sparse IRQ related removal of irqs.h and related header moves, these are based on omap-cleanup-local-headers-for-v3.7 tag.
----------------------------------------------------------------
AnilKumar Ch (1):
ARM: OMAP2+: serial: Change MAX_HSUART_PORTS to 6
Peter Ujfalusi (1):
ARM: OMAP4: twl-common: Support for additional devices on i2c1 bus
Yegor Yefremov (1):
arm: make FORCE_MAX_ZONEORDER configurable for TI AM33XX
arch/arm/Kconfig | 5 ++-- arch/arm/mach-omap2/board-4430sdp.c | 12 ++++++-- arch/arm/mach-omap2/board-omap4panda.c | 12 ++++++-- arch/arm/mach-omap2/twl-common.c | 37 ++++++++----------------- arch/arm/mach-omap2/twl-common.h | 3 +- arch/arm/plat-omap/include/plat/omap-serial.h | 2 +- 6 files changed, 37 insertions(+), 34 deletions(-)
[GIT PULL 3/3] omap arch timer late changes for v3.7 merge window
In reply to Tony LindgrenThe following changes since commit 3fe05bd9980df7207a35b4841a94dc2875e86960:
Merge tag 'v3.6-rc6' into devel-dt (2012-09-24 11:42:13 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/devel-dt-arch-timer-for-v3.7
for you to fetch changes up to ef8fe6fee16f178cd80cf11b21565bca95b80182:
Merge branch 'devel-dt-arch-timer' into devel-dt (2012-09-24 11:42:24 -0700)
----------------------------------------------------------------
Few late patches to enable arch timer for omap5
using device tree.
----------------------------------------------------------------
Santosh Shilimkar (2):
ARM: OMAP: Add initialisation for the real-time counter.
ARM: OMAP5: Enable arch timer support
Tony Lindgren (2):
Merge branch 'for_3.7/omap5_arch_timer' of git://github.com/SantoshShilimkar/linux into devel-dt-arch-timer Merge branch 'devel-dt-arch-timer' into devel-dt
arch/arm/boot/dts/omap5.dtsi | 12 ++++++ arch/arm/mach-omap2/Kconfig | 5 +++ arch/arm/mach-omap2/timer.c | 97 +++++++++++++++++++++++++++++++++++++++++- 3 files changed, 113 insertions(+), 1 deletion(-)
Quoted 6 lines · Tony Lindgren
These changes take us a step closer to merging the common clock framework for omap but unfortunately these patches were not ready for merging earlier. See also the notes below on the dependencies these patches have, they are based on a merge of sereral branches already merged.
I am aware these three pull requests all are very late. Just let me know if you don't want to take them at this point and I'll resend updated pull reqs after -rc1 or so.
Regards,
Tony
A message that is not in the archive (sent off-list or not yet received): [email protected]
[GIT PULL 2/3] omap platform and board related late patches for v3.7 merge window
Quoted 12 lines · Tony Lindgren
The following changes since commit
0e70156de4c8465bfb8cb45cdc1bbc2fa474ce14:ARM: OMAP2+: Make
omap4-keypad.hlocal (2012-09-20 15:04:04 -0700)are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omaptags/omap-devel-board-late-v2-for-v3.7for you to fetch changes up to
ead53717d9ab28c942b9adf66f8c02442dbfbc8a:arm: make
FORCE_MAX_ZONEORDERconfigurable for TI AM33XX (2012-09-24 10:32:39 -0700)
Quoted 7 lines
----------------------------------------------------------------
These board and platform related patches have been posted quite a while ago but have somehow fallen though the cracks as most of the focus has been making things to work with device tree. As the first patch depends on sparse IRQ related removal ofirqs.hand related header moves, these are based on omap-cleanup-local-headers-for-v3.7 tag.
Let's scrap this pull request, Russell noted that Yegor's patch breaks sa1111.
Regards,
Tony
Quoted 24 lines
----------------------------------------------------------------
AnilKumar Ch (1):
ARM: OMAP2+: serial: ChangeMAX_HSUART_PORTSto 6Peter Ujfalusi (1):
ARM: OMAP4: twl-common: Support for additional devices on i2c1 busYegor Yefremov (1):
arm: makeFORCE_MAX_ZONEORDERconfigurable for TI AM33XXarch/arm/Kconfig | 5 ++-- arch/arm/mach-omap2/board-4430sdp.c | 12 ++++++-- arch/arm/mach-omap2/board-omap4panda.c | 12 ++++++-- arch/arm/mach-omap2/twl-common.c | 37 ++++++++----------------- arch/arm/mach-omap2/twl-common.h | 3 +- arch/arm/plat-omap/include/plat/omap-serial.h | 2 +- 6 files changed, 37 insertions(+), 34 deletions(-)_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
[GIT PULL 2/3] omap platform and board related late patches for v3.7 merge window
Quoted 21 lines · Tony Lindgren
Quoted 12 lines · Tony Lindgren
The following changes since commit
0e70156de4c8465bfb8cb45cdc1bbc2fa474ce14:ARM: OMAP2+: Make
omap4-keypad.hlocal (2012-09-20 15:04:04 -0700)are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omaptags/omap-devel-board-late-v2-for-v3.7for you to fetch changes up to
ead53717d9ab28c942b9adf66f8c02442dbfbc8a:arm: make
FORCE_MAX_ZONEORDERconfigurable for TI AM33XX (2012-09-24 10:32:39 -0700)Quoted 7 lines
----------------------------------------------------------------
These board and platform related patches have been posted quite a while ago but have somehow fallen though the cracks as most of the focus has been making things to work with device tree. As the first patch depends on sparse IRQ related removal ofirqs.hand related header moves, these are based on omap-cleanup-local-headers-for-v3.7 tag.
Quoted 2 lines
Let's scrap this pull request, Russell noted that Yegor's patch breaks sa1111.
Here's the updated pull request with just the top patch dropped.
Tony
The following changes since commit 0e70156de4c8465bfb8cb45cdc1bbc2fa474ce14:
ARM: OMAP2+: Make omap4-keypad.h local (2012-09-20 15:04:04 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-board-late-v3-for-v3.7
for you to fetch changes up to cfc55bcc1f78395872d41c50f6a3129c4b42289e:
ARM: OMAP2+: serial: Change MAX_HSUART_PORTS to 6 (2012-09-24 10:32:39 -0700)
----------------------------------------------------------------
These board and platform related patches have been posted quite a while ago but have somehow fallen though the cracks as most of the focus has been making things to work with device tree. As the first patch depends on sparse IRQ related removal of irqs.h and related header moves, these are based on omap-cleanup-local-headers-for-v3.7 tag.
----------------------------------------------------------------
AnilKumar Ch (1):
ARM: OMAP2+: serial: Change MAX_HSUART_PORTS to 6
Peter Ujfalusi (1):
ARM: OMAP4: twl-common: Support for additional devices on i2c1 bus
arch/arm/mach-omap2/board-4430sdp.c | 12 ++++++-- arch/arm/mach-omap2/board-omap4panda.c | 12 ++++++-- arch/arm/mach-omap2/twl-common.c | 37 ++++++++----------------- arch/arm/mach-omap2/twl-common.h | 3 +- arch/arm/plat-omap/include/plat/omap-serial.h | 2 +- 5 files changed, 34 insertions(+), 32 deletions(-)
[GIT PULL 2/3] omap platform and board related late patches for v3.7 merge window
Quoted 30 lines · Tony Lindgren
Quoted 21 lines · Tony Lindgren
Quoted 12 lines · Tony Lindgren
The following changes since commit
0e70156de4c8465bfb8cb45cdc1bbc2fa474ce14:ARM: OMAP2+: Make
omap4-keypad.hlocal (2012-09-20 15:04:04 -0700)are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omaptags/omap-devel-board-late-v2-for-v3.7for you to fetch changes up to
ead53717d9ab28c942b9adf66f8c02442dbfbc8a:arm: make
FORCE_MAX_ZONEORDERconfigurable for TI AM33XX (2012-09-24 10:32:39 -0700)Quoted 7 lines
----------------------------------------------------------------
These board and platform related patches have been posted quite a while ago but have somehow fallen though the cracks as most of the focus has been making things to work with device tree. As the first patch depends on sparse IRQ related removal ofirqs.hand related header moves, these are based on omap-cleanup-local-headers-for-v3.7 tag.Quoted 2 lines
Let's scrap this pull request, Russell noted that Yegor's patch breaks sa1111.
Here's the updated pull request with just the top patch dropped.
Tony
Quoted 7 lines
The following changes since commit
0e70156de4c8465bfb8cb45cdc1bbc2fa474ce14:ARM: OMAP2+: Make
omap4-keypad.hlocal (2012-09-20 15:04:04 -0700)are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omaptags/omap-devel-board-late-v3-for-v3.7
Thanks, pulled this on top of the previous cleanup-headers.
In the future, feel free to remove the tag that you don't want me to pull from the repo so I don't accidentally pull it anyway.
-Olof
[GIT PULL 2/3] omap platform and board related late patches for v3.7 merge window
Quoted 5 lines · Olof Johansson
Thanks, pulled this on top of the previous cleanup-headers.
In the future, feel free to remove the tag that you don't want me to pull from the repo so I don't accidentally pull it anyway.
OK thanks will do.
Tony
A message that is not in the archive (sent off-list or not yet received): [email protected]
[GIT PULL 3/3] omap arch timer late changes for v3.7 merge window
Quoted 4 lines · Tony Lindgren
The following changes since commit
3fe05bd9980df7207a35b4841a94dc2875e86960:Merge tag 'v3.6-rc6' into devel-dt (2012-09-24 11:42:13 -0700)
Quoted 8 lines
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omaptags/devel-dt-arch-timer-for-v3.7for you to fetch changes up to
ef8fe6fee16f178cd80cf11b21565bca95b80182:Merge branch 'devel-dt-arch-timer' into devel-dt (2012-09-24 11:42:24 -0700)
Merged on top of previous omap/dt (next/dt).
-Olof