Merge tag 'clk-for-linus-3.20' of git://git.linaro.org/people/mike.turquette/linux

[uclinux-h8/linux.git] / arch / arm / mach-omap2 / Makefile

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index d2a6b27..b83f18f 100644 (file)
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -58,6 +58,7 @@ AFLAGS_sram34xx.o                     :=-Wa,-march=armv7-a
 # Restart code (OMAP4/5 currently in omap4-common.c)
 obj-$(CONFIG_SOC_OMAP2420)             += omap2-restart.o
 obj-$(CONFIG_SOC_OMAP2430)             += omap2-restart.o
+obj-$(CONFIG_SOC_TI81XX)               += ti81xx-restart.o
 obj-$(CONFIG_SOC_AM33XX)               += am33xx-restart.o
 obj-$(CONFIG_SOC_AM43XX)               += omap4-restart.o
 obj-$(CONFIG_ARCH_OMAP3)               += omap3-restart.o
@@ -120,6 +121,7 @@ obj-$(CONFIG_ARCH_OMAP4)            += $(omap-prcm-4-5-common)
 obj-$(CONFIG_SOC_OMAP5)                        += $(omap-prcm-4-5-common)
 obj-$(CONFIG_SOC_DRA7XX)               += $(omap-prcm-4-5-common)
 am33xx-43xx-prcm-common                        += prm33xx.o cm33xx.o
+obj-$(CONFIG_SOC_TI81XX)               += $(am33xx-43xx-prcm-common)
 obj-$(CONFIG_SOC_AM33XX)               += $(am33xx-43xx-prcm-common)
 obj-$(CONFIG_SOC_AM43XX)               += $(omap-prcm-4-5-common) \
                                           $(am33xx-43xx-prcm-common)
@@ -170,6 +172,8 @@ obj-$(CONFIG_ARCH_OMAP4)            += $(clockdomain-common)
 obj-$(CONFIG_ARCH_OMAP4)               += clockdomains44xx_data.o
 obj-$(CONFIG_SOC_AM33XX)               += $(clockdomain-common)
 obj-$(CONFIG_SOC_AM33XX)               += clockdomains33xx_data.o
+obj-$(CONFIG_SOC_TI81XX)               += $(clockdomain-common)
+obj-$(CONFIG_SOC_TI81XX)               += clockdomains81xx_data.o
 obj-$(CONFIG_SOC_AM43XX)               += $(clockdomain-common)
 obj-$(CONFIG_SOC_AM43XX)               += clockdomains43xx_data.o
 obj-$(CONFIG_SOC_OMAP5)                        += $(clockdomain-common)
@@ -181,7 +185,6 @@ obj-$(CONFIG_SOC_DRA7XX)            += clockdomains7xx_data.o
 obj-$(CONFIG_ARCH_OMAP2)               += $(clock-common) clock2xxx.o
 obj-$(CONFIG_ARCH_OMAP2)               += clkt2xxx_dpllcore.o
 obj-$(CONFIG_ARCH_OMAP2)               += clkt2xxx_virt_prcm_set.o
-obj-$(CONFIG_ARCH_OMAP2)               += clkt2xxx_apll.o
 obj-$(CONFIG_ARCH_OMAP2)               += clkt2xxx_dpll.o clkt_iclk.o
 obj-$(CONFIG_SOC_OMAP2430)             += clock2430.o
 obj-$(CONFIG_ARCH_OMAP3)               += $(clock-common) clock3xxx.o
@@ -223,6 +226,7 @@ obj-$(CONFIG_SOC_AM33XX)            += omap_hwmod_33xx_43xx_ipblock_data.o
 obj-$(CONFIG_SOC_AM43XX)               += omap_hwmod_43xx_data.o
 obj-$(CONFIG_SOC_AM43XX)               += omap_hwmod_33xx_43xx_interconnect_data.o
 obj-$(CONFIG_SOC_AM43XX)               += omap_hwmod_33xx_43xx_ipblock_data.o
+obj-$(CONFIG_SOC_TI81XX)               += omap_hwmod_81xx_data.o
 obj-$(CONFIG_ARCH_OMAP4)               += omap_hwmod_44xx_data.o
 obj-$(CONFIG_SOC_OMAP5)                        += omap_hwmod_54xx_data.o
 obj-$(CONFIG_SOC_DRA7XX)               += omap_hwmod_7xx_data.o
@@ -250,13 +254,8 @@ obj-$(CONFIG_MACH_NOKIA_RX51)              += board-rx51.o sdram-nokia.o
 obj-$(CONFIG_MACH_NOKIA_RX51)          += board-rx51-peripherals.o
 obj-$(CONFIG_MACH_NOKIA_RX51)          += board-rx51-video.o
 obj-$(CONFIG_MACH_CM_T35)              += board-cm-t35.o
-obj-$(CONFIG_MACH_CM_T3517)            += board-cm-t3517.o
 obj-$(CONFIG_MACH_TOUCHBOOK)           += board-omap3touchbook.o
 
-obj-$(CONFIG_MACH_OMAP3517EVM)         += board-am3517evm.o
-
-obj-$(CONFIG_MACH_CRANEBOARD)          += board-am3517crane.o
-
 obj-$(CONFIG_MACH_SBC3530)             += board-omap3stalker.o
 
 # Platform specific device init code
@@ -286,7 +285,4 @@ ifneq ($(CONFIG_HWSPINLOCK_OMAP),)
 obj-y                                  += hwspinlock.o
 endif
 
-emac-$(CONFIG_TI_DAVINCI_EMAC)         := am35xx-emac.o
-obj-y                                  += $(emac-m) $(emac-y)
-
 obj-y                                  += common-board-devices.o twl-common.o dss-common.o