mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/
synced 2026-11-13 07:31:07 +00:00
Common clock framework for omap2+ via Paul Walmsley <paul@pwsan.com>:
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 commitc9d501e5cbare here: http://www.pwsan.com/omap/testlogs/common_clk_devel_3.8_rebase/20121112192516/ However, cleanup-prcm atc9d501e5does 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 Note that this is based on a merge of the omap-for-v3.8/cleanup-prcm and omap-for-v3.8/pm as otherwise merged in with the pm changes it would automatically resolve into a non-booting merge for omap3 as the smartreflex clock names were changed in the pm branch. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJQor3wAAoJEBvUPslcq6VzsSEP/1tim/h6DI3DgnWyQWMKTx8E Sye1iGIkgQvUk5XEXyZENWmx6ON9vbaxkGgxhqjAPusuTcRMzFGNc9HTc6tM8JyH C3IummR42VfyX1oFnSubHInIPvxuxaRvfjrpJkC14cT8ZzU/6IIhJFj7Yt3vkCQx prOhAA0yYqFdcBy9yaAgRvt27Zqa45ExC+79FuvHCfyVXpgQfef/SoVSUgwJ25T9 es2p0me4Ei+S79/PszoKGmvQklK4qn7d2iVZX5vkWCBPuwZKGJs+IbmYXAUAFfvX tEOgWZQwaV/Ptuxui536BzsvsQ5lew3eY/kIP0j2EgETwSkoPuYH2QbRS/ihK6c8 ImqMpcxRsI9+DxuDGD8ug24O8gnDBmviDzdiophBS5SbTdZ2SDDaMY3coI/qgMBf I1nS/2wBH9M6MOpaCV37ffMf5h1V2OXgOI9OxbhZgwkJtLj06iGnIMvA79l7ifi1 /TumV98bD2mmWznPWD7NQJ3RADdECZj+NBKaXq2U35/5pMOl2FQmQwnBeW4A7e0z Rmu0X2xXq2v/OozSCjFgCZGTDHA19G1Js6P7aXRHGth3uBOm34U3yJeLwl7phuOn Mco7SFKnet79cLJys3JPk65Dkq1SYHPFgCBcEStbKGs5kbBxDmA3lgpAaY75+g8f W2Bnp6t4dQ5ZwkS0Bexc =euuA -----END PGP SIGNATURE----- Merge tag 'omap-for-v3.8/clock-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/clk From Tony Lindgren <tony@atomide.com>: Common clock framework for omap2+ via Paul Walmsley <paul@pwsan.com>: 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 commitc9d501e5cbare here: http://www.pwsan.com/omap/testlogs/common_clk_devel_3.8_rebase/20121112192516/ However, cleanup-prcm atc9d501e5does 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 Note that this is based on a merge of the omap-for-v3.8/cleanup-prcm and omap-for-v3.8/pm as otherwise merged in with the pm changes it would automatically resolve into a non-booting merge for omap3 as the smartreflex clock names were changed in the pm branch. * tag 'omap-for-v3.8/clock-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (27 commits) ARM: OMAP2+: clock: Cleanup !CONFIG_COMMON_CLK parts ARM: OMAP2xxx: clock: drop obsolete clock data ARM: OMAP2: clock: Cleanup !CONFIG_COMMON_CLK parts ARM: OMAP3+: DPLL: drop !CONFIG_COMMON_CLK sections ARM: AM33xx: clock: drop obsolete clock data ARM: OMAP3xxx: clk: drop obsolete clock data ARM: OMAP3: clock: Cleanup !CONFIG_COMMON_CLK parts ARM: OMAP44xx: clock: drop obsolete clock data ARM: OMAP4: clock: Cleanup !CONFIG_COMMON_CLK parts ARM: OMAP: hwmod: Cleanup !CONFIG_COMMON_CLK parts ARM: OMAP: clock: Switch to COMMON clk ARM: OMAP2: clock: Add 24xx data using common struct clk ARM: OMAP3: clock: Add 3xxx data using common struct clk ARM: AM33XX: clock: add clock data in common clock format ARM: OMAP4: clock: Add 44xx data using common struct clk ARM: OMAP2+: clock: add OMAP CCF convenience macros to mach-omap2/clock.h ARM: OMAP: clock: Get rid of some clkdm assocations within clks ARM: OMAP2+: clockdomain: bypass clockdomain handling when disabling unused clks ARM: OMAP2+: hwmod: Invoke init_clkdm before other init functions ARM: OMAP: clock: Define a function to enable clocks at init ... Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
commit
fb6842a7bc