diff options
author | Paul Walmsley <paul@pwsan.com> | 2012-04-19 15:33:49 -0400 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2012-04-19 15:33:49 -0400 |
commit | 6ba5a69ee92c29c2ffc814dad6ac61c4cd49090c (patch) | |
tree | fac668ac66b82277034aefa5b6f756b4029d68ad /arch/arm/mach-omap2/Makefile | |
parent | 3af35fbcd088e0b675fa423a879c596384894180 (diff) |
ARM: OMAP2+: clockdomains: make {prm,cm}_clkdm common
The PRM and CM implicit clockdomains will soon be used by OMAP44xx.
So, make them common to OMAP2+ and modify the OMAP4 clockdomains code
so use of these clockdomains doesn't crash the system.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Rajendra Nayak <rnayak@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
-rw-r--r-- | arch/arm/mach-omap2/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 49f92bc1c311..d8604a3e490e 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile | |||
@@ -118,16 +118,18 @@ obj-$(CONFIG_ARCH_OMAP4) += $(powerdomain-common) \ | |||
118 | powerdomains44xx_data.o | 118 | powerdomains44xx_data.o |
119 | 119 | ||
120 | # PRCM clockdomain control | 120 | # PRCM clockdomain control |
121 | obj-$(CONFIG_ARCH_OMAP2) += clockdomain.o \ | 121 | clockdomain-common += clockdomain.o \ |
122 | clockdomains_common_data.o | ||
123 | obj-$(CONFIG_ARCH_OMAP2) += $(clockdomain-common) \ | ||
122 | clockdomain2xxx_3xxx.o \ | 124 | clockdomain2xxx_3xxx.o \ |
123 | clockdomains2xxx_3xxx_data.o | 125 | clockdomains2xxx_3xxx_data.o |
124 | obj-$(CONFIG_SOC_OMAP2420) += clockdomains2420_data.o | 126 | obj-$(CONFIG_SOC_OMAP2420) += clockdomains2420_data.o |
125 | obj-$(CONFIG_SOC_OMAP2430) += clockdomains2430_data.o | 127 | obj-$(CONFIG_SOC_OMAP2430) += clockdomains2430_data.o |
126 | obj-$(CONFIG_ARCH_OMAP3) += clockdomain.o \ | 128 | obj-$(CONFIG_ARCH_OMAP3) += $(clockdomain-common) \ |
127 | clockdomain2xxx_3xxx.o \ | 129 | clockdomain2xxx_3xxx.o \ |
128 | clockdomains2xxx_3xxx_data.o \ | 130 | clockdomains2xxx_3xxx_data.o \ |
129 | clockdomains3xxx_data.o | 131 | clockdomains3xxx_data.o |
130 | obj-$(CONFIG_ARCH_OMAP4) += clockdomain.o \ | 132 | obj-$(CONFIG_ARCH_OMAP4) += $(clockdomain-common) \ |
131 | clockdomain44xx.o \ | 133 | clockdomain44xx.o \ |
132 | clockdomains44xx_data.o | 134 | clockdomains44xx_data.o |
133 | 135 | ||