Merge tag 'for-v3.11-rc/omap-fixes-b' of...
Merge tag 'for-v3.11-rc/omap-fixes-b' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into fixes From Paul Walmsley via Tony Lindgren: Some OMAP hwmod fixes for v3.11-rc. Mostly intended to fix an earlyprintk regression and an AM33xx cpgmac power management regression. Basic build, boot, and PM tests are available here: http://www.pwsan.com/omap/testlogs/hwmod_fixes_a_v3.11-rc/20130730042132/ The tests include temporary fixes for the unrelated 2430SDP and OMAP3 boot regressions, which are not part of this signed tag. * tag 'for-v3.11-rc/omap-fixes-b' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending : ARM: OMAP2+: hwmod: AM335x: fix cpgmac address space ARM: OMAP2+: hwmod: rt address space index for DT ARM: OMAP2+: Sync hwmod state with the pm_runtime and omap_device state ARM: OMAP2+: Avoid idling memory controllers with no drivers ARM: OMAP2+: hwmod: Fix a crash in _setup_reset() with DEBUG_LL Signed-off-by:Olof Johansson <olof@lixom.net>
Showing
- arch/arm/mach-omap2/omap_device.c 18 additions, 0 deletionsarch/arm/mach-omap2/omap_device.c
- arch/arm/mach-omap2/omap_hwmod.c 1 addition, 1 deletionarch/arm/mach-omap2/omap_hwmod.c
- arch/arm/mach-omap2/omap_hwmod.h 50 additions, 0 deletionsarch/arm/mach-omap2/omap_hwmod.h
- arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c 3 additions, 3 deletionsarch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
- arch/arm/mach-omap2/omap_hwmod_33xx_data.c 2 additions, 1 deletionarch/arm/mach-omap2/omap_hwmod_33xx_data.c
- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c 5 additions, 4 deletionsarch/arm/mach-omap2/omap_hwmod_3xxx_data.c
- arch/arm/mach-omap2/omap_hwmod_44xx_data.c 2 additions, 3 deletionsarch/arm/mach-omap2/omap_hwmod_44xx_data.c
- arch/arm/mach-omap2/omap_hwmod_54xx_data.c 2 additions, 1 deletionarch/arm/mach-omap2/omap_hwmod_54xx_data.c
- arch/arm/mach-omap2/serial.c 0 additions, 11 deletionsarch/arm/mach-omap2/serial.c
Loading
Please register or sign in to comment