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

Commit f7f73aab authored by Rajendra Nayak's avatar Rajendra Nayak Committed by Paul Walmsley
Browse files

ARM: OMAP: clock: Switch to COMMON clk 



Select COMMON_CLK for all OMAP2+ SoCs and switch over to using new
data files for OMAP2/3/4.

The older data files will get removed in subsequent patches.

Signed-off-by: default avatarRajendra Nayak <rnayak@ti.com>
[paul@pwsan.com: move 'select COMMON_CLK' from ARCH_OMAP2PLUS_TYPICAL to
 the per-SoC and per-"arch" Kconfig sections]
[mturquette@ti.com: fixed up #ifdef mismatch in clock.h in previous
  patch which drops that change from this patch]
Signed-off-by: default avatarMike Turquette <mturquette@ti.com>
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 6ab9f69e

arch/arm/mach-omap2/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -35,6 +35,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"
@@ -48,6 +49,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
@@ -69,6 +71,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"
@@ -78,6 +81,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
@@ -112,6 +116,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