]> git.karo-electronics.de Git - mv-sheeva.git/blobdiff - arch/arm/mach-omap2/Makefile
Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[mv-sheeva.git] / arch / arm / mach-omap2 / Makefile
index 60e51bcf53bd2e053a384826d45ac760eb30588d..1c0c2b02d870b74a814c4d92a4d70e6de9f79748 100644 (file)
@@ -4,30 +4,31 @@
 
 # Common support
 obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.o pm.o \
-        common.o
+        common.o gpio.o dma.o wd_timer.o
 
-omap-2-3-common                                = irq.o sdrc.o prm2xxx_3xxx.o
+omap-2-3-common                                = irq.o sdrc.o
 hwmod-common                           = omap_hwmod.o \
                                          omap_hwmod_common_data.o
-prcm-common                            = prcm.o powerdomain.o
 clock-common                           = clock.o clock_common_data.o \
-                                         clockdomain.o clkt_dpll.o \
-                                         clkt_clksel.o
+                                         clkt_dpll.o clkt_clksel.o
 
-obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(prcm-common) $(hwmod-common)
-obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(prcm-common) $(hwmod-common)
-obj-$(CONFIG_ARCH_OMAP4) += $(prcm-common) prm44xx.o $(hwmod-common)
+obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common)
+obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common)
+obj-$(CONFIG_ARCH_OMAP4) += prm44xx.o $(hwmod-common)
 
 obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o
 
+obj-$(CONFIG_TWL4030_CORE) += omap_twl.o
+
 # SMP support ONLY available for OMAP4
 obj-$(CONFIG_SMP)                      += omap-smp.o omap-headsmp.o
 obj-$(CONFIG_LOCAL_TIMERS)             += timer-mpu.o
 obj-$(CONFIG_HOTPLUG_CPU)              += omap-hotplug.o
 obj-$(CONFIG_ARCH_OMAP4)               += omap44xx-smc.o omap4-common.o
 
-AFLAGS_omap-headsmp.o                  :=-Wa,-march=armv7-a
-AFLAGS_omap44xx-smc.o                  :=-Wa,-march=armv7-a
+plus_sec := $(call as-instr,.arch_extension sec,+sec)
+AFLAGS_omap-headsmp.o                  :=-Wa,-march=armv7-a$(plus_sec)
+AFLAGS_omap44xx-smc.o                  :=-Wa,-march=armv7-a$(plus_sec)
 
 # Functions loaded to SRAM
 obj-$(CONFIG_ARCH_OMAP2420)            += sram242x.o
@@ -42,18 +43,29 @@ AFLAGS_sram34xx.o                   :=-Wa,-march=armv7-a
 obj-$(CONFIG_ARCH_OMAP2420)            += mux2420.o
 obj-$(CONFIG_ARCH_OMAP2430)            += mux2430.o
 obj-$(CONFIG_ARCH_OMAP3)               += mux34xx.o
+obj-$(CONFIG_ARCH_OMAP4)               += mux44xx.o
 
 # SMS/SDRC
 obj-$(CONFIG_ARCH_OMAP2)               += sdrc2xxx.o
 # obj-$(CONFIG_ARCH_OMAP3)             += sdrc3xxx.o
 
+# OPP table initialization
+ifeq ($(CONFIG_PM_OPP),y)
+obj-y                                  += opp.o
+obj-$(CONFIG_ARCH_OMAP3)               += opp3xxx_data.o
+obj-$(CONFIG_ARCH_OMAP4)               += opp4xxx_data.o
+endif
+
 # Power Management
 ifeq ($(CONFIG_PM),y)
 obj-$(CONFIG_ARCH_OMAP2)               += pm24xx.o
-obj-$(CONFIG_ARCH_OMAP2)               += sleep24xx.o pm_bus.o
-obj-$(CONFIG_ARCH_OMAP3)               += pm34xx.o sleep34xx.o cpuidle34xx.o pm_bus.o
-obj-$(CONFIG_ARCH_OMAP4)               += pm44xx.o pm_bus.o
+obj-$(CONFIG_ARCH_OMAP2)               += sleep24xx.o pm_bus.o voltage.o
+obj-$(CONFIG_ARCH_OMAP3)               += pm34xx.o sleep34xx.o voltage.o \
+                                          cpuidle34xx.o pm_bus.o
+obj-$(CONFIG_ARCH_OMAP4)               += pm44xx.o voltage.o pm_bus.o
 obj-$(CONFIG_PM_DEBUG)                 += pm-debug.o
+obj-$(CONFIG_OMAP_SMARTREFLEX)          += sr_device.o smartreflex.o
+obj-$(CONFIG_OMAP_SMARTREFLEX_CLASS3)  += smartreflex-class3.o
 
 AFLAGS_sleep24xx.o                     :=-Wa,-march=armv6
 AFLAGS_sleep34xx.o                     :=-Wa,-march=armv7-a
@@ -65,10 +77,36 @@ endif
 endif
 
 # PRCM
-obj-$(CONFIG_ARCH_OMAP2)               += cm.o
-obj-$(CONFIG_ARCH_OMAP3)               += cm.o
-obj-$(CONFIG_ARCH_OMAP4)               += cm4xxx.o
-
+obj-$(CONFIG_ARCH_OMAP2)               += prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o
+obj-$(CONFIG_ARCH_OMAP3)               += prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o
+# XXX The presence of cm2xxx_3xxx.o on the line below is temporary and
+# will be removed once the OMAP4 part of the codebase is converted to
+# use OMAP4-specific PRCM functions.
+obj-$(CONFIG_ARCH_OMAP4)               += prcm.o cm2xxx_3xxx.o cminst44xx.o \
+                                          cm44xx.o prcm_mpu44xx.o \
+                                          prminst44xx.o
+
+# OMAP powerdomain framework
+powerdomain-common                     += powerdomain.o powerdomain-common.o
+obj-$(CONFIG_ARCH_OMAP2)               += $(powerdomain-common) \
+                                          powerdomain2xxx_3xxx.o \
+                                          powerdomains2xxx_data.o \
+                                          powerdomains2xxx_3xxx_data.o
+obj-$(CONFIG_ARCH_OMAP3)               += $(powerdomain-common) \
+                                          powerdomain2xxx_3xxx.o \
+                                          powerdomains3xxx_data.o \
+                                          powerdomains2xxx_3xxx_data.o
+obj-$(CONFIG_ARCH_OMAP4)               += $(powerdomain-common) \
+                                          powerdomain44xx.o \
+                                          powerdomains44xx_data.o
+
+# PRCM clockdomain control
+obj-$(CONFIG_ARCH_OMAP2)               += clockdomain.o \
+                                          clockdomains2xxx_3xxx_data.o
+obj-$(CONFIG_ARCH_OMAP3)               += clockdomain.o \
+                                          clockdomains2xxx_3xxx_data.o
+obj-$(CONFIG_ARCH_OMAP4)               += clockdomain.o \
+                                          clockdomains44xx_data.o
 # Clock framework
 obj-$(CONFIG_ARCH_OMAP2)               += $(clock-common) clock2xxx.o \
                                           clkt2xxx_sys.o \
@@ -139,23 +177,29 @@ obj-$(CONFIG_MACH_OMAP_3430SDP)           += board-3430sdp.o \
                                           hsmmc.o \
                                           board-flash.o
 obj-$(CONFIG_MACH_NOKIA_N8X0)          += board-n8x0.o
+obj-$(CONFIG_MACH_NOKIA_RM680)         += board-rm680.o \
+                                          sdram-nokia.o \
+                                          hsmmc.o
 obj-$(CONFIG_MACH_NOKIA_RX51)          += board-rx51.o \
-                                          board-rx51-sdram.o \
+                                          sdram-nokia.o \
                                           board-rx51-peripherals.o \
                                           board-rx51-video.o \
                                           hsmmc.o
-obj-$(CONFIG_MACH_OMAP_ZOOM2)          += board-zoom2.o \
+obj-$(CONFIG_MACH_OMAP_ZOOM2)          += board-zoom.o \
                                           board-zoom-peripherals.o \
+                                          board-zoom-display.o \
                                           board-flash.o \
                                           hsmmc.o \
                                           board-zoom-debugboard.o
-obj-$(CONFIG_MACH_OMAP_ZOOM3)          += board-zoom3.o \
+obj-$(CONFIG_MACH_OMAP_ZOOM3)          += board-zoom.o \
                                           board-zoom-peripherals.o \
+                                          board-zoom-display.o \
                                           board-flash.o \
                                           hsmmc.o \
                                           board-zoom-debugboard.o
 obj-$(CONFIG_MACH_OMAP_3630SDP)                += board-3630sdp.o \
                                           board-zoom-peripherals.o \
+                                          board-zoom-display.o \
                                           board-flash.o \
                                           hsmmc.o
 obj-$(CONFIG_MACH_CM_T35)              += board-cm-t35.o \
@@ -168,12 +212,16 @@ obj-$(CONFIG_MACH_IGEP0030)               += board-igep0030.o \
 obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK)     += board-omap3touchbook.o \
                                           hsmmc.o
 obj-$(CONFIG_MACH_OMAP_4430SDP)                += board-4430sdp.o \
-                                          hsmmc.o
+                                          hsmmc.o \
+                                          omap_phy_internal.o
 obj-$(CONFIG_MACH_OMAP4_PANDA)         += board-omap4panda.o \
-                                          hsmmc.o
+                                          hsmmc.o \
+                                          omap_phy_internal.o
 
 obj-$(CONFIG_MACH_OMAP3517EVM)         += board-am3517evm.o
 
+obj-$(CONFIG_MACH_CRANEBOARD)          += board-am3517crane.o
+
 obj-$(CONFIG_MACH_SBC3530)             += board-omap3stalker.o \
                                           hsmmc.o
 # Platform specific device init code