@@ -38,7 +38,7 @@ obj-$(CONFIG_PLAT_SAMSUNG) += samsung/
obj-$(CONFIG_COMMON_CLK_XGENE) += clk-xgene.o
obj-$(CONFIG_COMMON_CLK_KEYSTONE) += keystone/
obj-$(CONFIG_ARCH_SHMOBILE_MULTI) += shmobile/
-obj-$(CONFIG_ARCH_OMAP) += ti/
+obj-$(CONFIG_ARCH_OMAP2PLUS) += ti/
obj-$(CONFIG_X86) += x86/
@@ -1,10 +1,11 @@
ifneq ($(CONFIG_OF),)
-obj-y += clk.o dpll.o autoidle.o divider.o \
- fixed-factor.o gate.o clockdomain.o \
- composite.o mux.o apll.o clk-43xx.o
-obj-$(CONFIG_SOC_AM33XX) += clk-33xx.o
-obj-$(CONFIG_ARCH_OMAP3) += interface.o clk-3xxx.o
-obj-$(CONFIG_ARCH_OMAP4) += clk-44xx.o
-obj-$(CONFIG_SOC_OMAP5) += clk-54xx.o
-obj-$(CONFIG_SOC_DRA7XX) += clk-7xx.o
+obj-y += clk.o autoidle.o clockdomain.o
+clk-common = dpll.o composite.o divider.o gate.o \
+ fixed-factor.o mux.o apll.o
+obj-$(CONFIG_SOC_AM33XX) += $(clk-common) clk-33xx.o
+obj-$(CONFIG_ARCH_OMAP3) += $(clk-common) interface.o clk-3xxx.o
+obj-$(CONFIG_ARCH_OMAP4) += $(clk-common) clk-44xx.o
+obj-$(CONFIG_SOC_OMAP5) += $(clk-common) clk-54xx.o
+obj-$(CONFIG_SOC_DRA7XX) += $(clk-common) clk-7xx.o
+obj-$(CONFIG_SOC_AM43XX) += $(clk-common) clk-43xx.o
endif
Improper merge of TI clock driver resulted in build breakage for OMAP1 build, and various other TI single SoC builds. This patch fixes those by adding the missed Makefile tweaks. Signed-off-by: Tero Kristo <t-kristo@ti.com> --- drivers/clk/Makefile | 2 +- drivers/clk/ti/Makefile | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-)