omap: mux: Add new style pin multiplexing data for 34xx

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

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 1d54ad349bfd8372a6235e5bba42aa7dfa45a4de..6e348e528f8d5d6b6989bb242140facae117bb37 100644 (file)
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -6,11 +6,14 @@
 obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.o
 
 omap-2-3-common                                = irq.o sdrc.o omap_hwmod.o
+omap-3-4-common                                = dpll.o
 prcm-common                            = prcm.o powerdomain.o
-clock-common                           = clock.o clockdomain.o
+clock-common                           = clock.o clock_common_data.o clockdomain.o
 
 obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(prcm-common) $(clock-common)
-obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(prcm-common) $(clock-common)
+obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(prcm-common) $(clock-common) \
+                           $(omap-3-4-common)
+obj-$(CONFIG_ARCH_OMAP4) += $(omap-3-4-common) prcm.o clock.o
 
 obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o
 
@@ -23,6 +26,9 @@ obj-$(CONFIG_ARCH_OMAP2420)           += sram242x.o
 obj-$(CONFIG_ARCH_OMAP2430)            += sram243x.o
 obj-$(CONFIG_ARCH_OMAP3)               += sram34xx.o
 
+# Pin multiplexing
+obj-$(CONFIG_ARCH_OMAP3)               += mux34xx.o
+
 # SMS/SDRC
 obj-$(CONFIG_ARCH_OMAP2)               += sdrc2xxx.o
 # obj-$(CONFIG_ARCH_OMAP3)             += sdrc3xxx.o
@@ -41,8 +47,17 @@ obj-$(CONFIG_ARCH_OMAP3)             += cm.o
 obj-$(CONFIG_ARCH_OMAP4)               += cm4xxx.o
 
 # Clock framework
-obj-$(CONFIG_ARCH_OMAP2)               += clock24xx.o
-obj-$(CONFIG_ARCH_OMAP3)               += clock34xx.o
+obj-$(CONFIG_ARCH_OMAP2)               += clock2xxx.o clock2xxx_data.o
+obj-$(CONFIG_ARCH_OMAP2420)            += opp2420_data.o
+obj-$(CONFIG_ARCH_OMAP3)               += clock34xx.o clock34xx_data.o
+obj-$(CONFIG_ARCH_OMAP2430)            += opp2430_data.o
+obj-$(CONFIG_ARCH_OMAP4)               += clock44xx.o clock44xx_data.o
+
+# EMU peripherals
+obj-$(CONFIG_OMAP3_EMU)                += emu.o
+
+obj-$(CONFIG_OMAP_MBOX_FWK)            += mailbox_mach.o
+mailbox_mach-objs                      := mailbox.o
 
 iommu-y                                        += iommu2.o
 iommu-$(CONFIG_ARCH_OMAP3)             += omap3-iommu.o
@@ -69,17 +84,33 @@ obj-$(CONFIG_MACH_OMAP_3430SDP)             += board-3430sdp.o \
                                           mmc-twl4030.o
 obj-$(CONFIG_MACH_NOKIA_N8X0)          += board-n8x0.o
 obj-$(CONFIG_MACH_NOKIA_RX51)          += board-rx51.o \
+                                          board-rx51-sdram.o \
                                           board-rx51-peripherals.o \
                                           mmc-twl4030.o
 obj-$(CONFIG_MACH_OMAP_ZOOM2)          += board-zoom2.o \
+                                          board-zoom-peripherals.o \
+                                          mmc-twl4030.o \
+                                          board-zoom-debugboard.o
+obj-$(CONFIG_MACH_OMAP_ZOOM3)          += board-zoom3.o \
+                                          board-zoom-peripherals.o \
                                           mmc-twl4030.o \
                                           board-zoom-debugboard.o
+obj-$(CONFIG_MACH_OMAP_3630SDP)                += board-3630sdp.o \
+                                          board-zoom-peripherals.o \
+                                          mmc-twl4030.o
+obj-$(CONFIG_MACH_CM_T35)              += board-cm-t35.o \
+                                          mmc-twl4030.o
+obj-$(CONFIG_MACH_IGEP0020)            += board-igep0020.o \
+                                          mmc-twl4030.o
 
 obj-$(CONFIG_MACH_OMAP_4430SDP)                += board-4430sdp.o
 
+obj-$(CONFIG_MACH_OMAP3517EVM)     += board-am3517evm.o
+
 # Platform specific device init code
 obj-y                                  += usb-musb.o
 obj-$(CONFIG_MACH_OMAP2_TUSB6010)      += usb-tusb6010.o
+obj-y                                  += usb-ehci.o
 
 onenand-$(CONFIG_MTD_ONENAND_OMAP2)    := gpmc-onenand.o
 obj-y                                  += $(onenand-m) $(onenand-y)