Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 558a0780 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

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
parents 89ab216b f9ae32a7

arch/arm/mach-omap2/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ config ARCH_OMAP2 
	select CPU_V6

	select MULTI_IRQ_HANDLER

	select SOC_HAS_OMAP2_SDRC

	select COMMON_CLK



config ARCH_OMAP3

	bool "TI OMAP3"
@@ -47,6 +48,7 @@ config ARCH_OMAP3 
	select PM_OPP if PM

	select PM_RUNTIME if CPU_IDLE

	select SOC_HAS_OMAP2_SDRC

	select COMMON_CLK

	select USB_ARCH_HAS_EHCI if USB_SUPPORT



config ARCH_OMAP4
@@ -68,6 +70,7 @@ config ARCH_OMAP4 
	select PM_OPP if PM

	select PM_RUNTIME if CPU_IDLE

	select USB_ARCH_HAS_EHCI if USB_SUPPORT

	select COMMON_CLK



config SOC_OMAP5

	bool "TI OMAP5"
@@ -77,6 +80,7 @@ config SOC_OMAP5 
	select CPU_V7

	select HAVE_SMP

	select SOC_HAS_REALTIME_COUNTER

	select COMMON_CLK



comment "OMAP Core Type"

	depends on ARCH_OMAP2
@@ -111,6 +115,7 @@ config SOC_AM33XX 
	select ARM_CPU_SUSPEND if PM

	select CPU_V7

	select MULTI_IRQ_HANDLER

	select COMMON_CLK



config OMAP_PACKAGE_ZAF

       bool

arch/arm/mach-omap2/Makefile

+5 −5
Original line number Diff line number Diff line
@@ -158,17 +158,17 @@ obj-$(CONFIG_ARCH_OMAP2) += clkt2xxx_dpllcore.o 
obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_virt_prcm_set.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_apll.o clkt2xxx_osc.o

obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_dpll.o clkt_iclk.o

obj-$(CONFIG_SOC_OMAP2420)		+= clock2420_data.o

obj-$(CONFIG_SOC_OMAP2430)		+= clock2430.o clock2430_data.o

obj-$(CONFIG_SOC_OMAP2420)		+= cclock2420_data.o

obj-$(CONFIG_SOC_OMAP2430)		+= clock2430.o cclock2430_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= $(clock-common) clock3xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= clock34xx.o clkt34xx_dpll3m2.o

obj-$(CONFIG_ARCH_OMAP3)		+= clock3517.o clock36xx.o

obj-$(CONFIG_ARCH_OMAP3)		+= dpll3xxx.o clock3xxx_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= dpll3xxx.o cclock3xxx_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= clkt_iclk.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(clock-common) clock44xx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(clock-common) cclock44xx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= dpll3xxx.o dpll44xx.o

obj-$(CONFIG_SOC_AM33XX)		+= $(clock-common) dpll3xxx.o

obj-$(CONFIG_SOC_AM33XX)		+= clock33xx_data.o

obj-$(CONFIG_SOC_AM33XX)		+= cclock33xx_data.o

obj-$(CONFIG_SOC_OMAP5)			+= $(clock-common)

obj-$(CONFIG_SOC_OMAP5)			+= dpll3xxx.o dpll44xx.o

arch/arm/mach-omap2/clock2420_data.c→arch/arm/mach-omap2/cclock2420_data.c

+1950 −0

File changed and moved.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-omap2/clock2430_data.c→arch/arm/mach-omap2/cclock2430_data.c

+2065 −0

File changed and moved.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-omap2/clock33xx_data.c→arch/arm/mach-omap2/cclock33xx_data.c

+961 −0

File changed and moved.

Preview size limit exceeded, changes collapsed.