Merge tag 'omap-cleanup-c-for-3.8' of...
Merge tag 'omap-cleanup-c-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/clock Convert the OMAP2+ clock code and data to rely on the common clock framework for internal bookkeeping and the driver API. Basic test logs for this branch on top of Tony's cleanup-prcm branch at commit c9d501e5 are here: http://www.pwsan.com/omap/testlogs/common_clk_devel_3.8_rebase/20121112192516/ However, cleanup-prcm at c9d501e5 does not include some fixes that are needed for a successful test. With several reverts, fixes, and workarounds applied, the following test logs were obtained: http://www.pwsan.com/omap/testlogs/TEST_common_clk_devel_3.8_rebase/20121112192300/ which indicate that the series tests cleanly. N.B. The common clock data addition patches result in many checkpatch warnings of the form "WARNING: static const char * array should probably be static const char * const". However, it appears that resolving these would require changes to the CCF itself. So the resolution of these warnings is being postponed until that can be coordinated. These patches result in a ~55KiB increase in runtime kernel memory usage when booting omap2plus_defconfig kernels. Conflicts: arch/arm/mach-omap2/clock33xx_data.c arch/arm/mach-omap2/clock3xxx_data.c arch/arm/mach-omap2/clock44xx_data.c
No related branches found
No related tags found
Showing
- arch/arm/mach-omap2/Kconfig 5 additions, 0 deletionsarch/arm/mach-omap2/Kconfig
- arch/arm/mach-omap2/Makefile 5 additions, 5 deletionsarch/arm/mach-omap2/Makefile
- arch/arm/mach-omap2/cclock2420_data.c 1950 additions, 0 deletionsarch/arm/mach-omap2/cclock2420_data.c
- arch/arm/mach-omap2/cclock2430_data.c 2065 additions, 0 deletionsarch/arm/mach-omap2/cclock2430_data.c
- arch/arm/mach-omap2/cclock33xx_data.c 961 additions, 0 deletionsarch/arm/mach-omap2/cclock33xx_data.c
- arch/arm/mach-omap2/cclock3xxx_data.c 3595 additions, 0 deletionsarch/arm/mach-omap2/cclock3xxx_data.c
- arch/arm/mach-omap2/cclock44xx_data.c 1987 additions, 0 deletionsarch/arm/mach-omap2/cclock44xx_data.c
- arch/arm/mach-omap2/clkt2xxx_apll.c 44 additions, 18 deletionsarch/arm/mach-omap2/clkt2xxx_apll.c
- arch/arm/mach-omap2/clkt2xxx_dpll.c 3 additions, 5 deletionsarch/arm/mach-omap2/clkt2xxx_dpll.c
- arch/arm/mach-omap2/clkt2xxx_dpllcore.c 8 additions, 5 deletionsarch/arm/mach-omap2/clkt2xxx_dpllcore.c
- arch/arm/mach-omap2/clkt2xxx_osc.c 4 additions, 9 deletionsarch/arm/mach-omap2/clkt2xxx_osc.c
- arch/arm/mach-omap2/clkt2xxx_sys.c 3 additions, 4 deletionsarch/arm/mach-omap2/clkt2xxx_sys.c
- arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c 6 additions, 3 deletionsarch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c
- arch/arm/mach-omap2/clkt34xx_dpll3m2.c 4 additions, 4 deletionsarch/arm/mach-omap2/clkt34xx_dpll3m2.c
- arch/arm/mach-omap2/clkt_clksel.c 65 additions, 129 deletionsarch/arm/mach-omap2/clkt_clksel.c
- arch/arm/mach-omap2/clkt_dpll.c 15 additions, 13 deletionsarch/arm/mach-omap2/clkt_dpll.c
- arch/arm/mach-omap2/clkt_iclk.c 7 additions, 23 deletionsarch/arm/mach-omap2/clkt_iclk.c
- arch/arm/mach-omap2/clock.c 242 additions, 668 deletionsarch/arm/mach-omap2/clock.c
- arch/arm/mach-omap2/clock.h 166 additions, 163 deletionsarch/arm/mach-omap2/clock.h
- arch/arm/mach-omap2/clock2430.c 3 additions, 5 deletionsarch/arm/mach-omap2/clock2430.c
Loading
Please register or sign in to comment