1 files changed, 89 insertions, 18 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 8cb16777661a..4b9fc57770db 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -5,24 +5,39 @@
 # Common support
 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-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 clockdomain.o
+clock-common                            = clock.o clock_common_data.o \
+                                          clockdomain.o clkt_dpll.o \
+                                          clkt_clksel.o
-obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(prcm-common) $(clock-common)
+obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(prcm-common) $(hwmod-common)
-obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(prcm-common) $(clock-common)
+obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(prcm-common) $(hwmod-common)
+obj-$(CONFIG_ARCH_OMAP4) += $(prcm-common)
 obj-$(CONFIG_OMAP_MCBSP) += mcbsp.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_ARCH_OMAP4)                += omap44xx-smc.o
+AFLAGS_omap44xx-smc.o                   :=-Wa,-march=armv7-a
 # Functions loaded to SRAM
 obj-$(CONFIG_ARCH_OMAP2420)             += sram242x.o
 obj-$(CONFIG_ARCH_OMAP2430)             += sram243x.o
 obj-$(CONFIG_ARCH_OMAP3)                += sram34xx.o
+AFLAGS_sram242x.o                       :=-Wa,-march=armv6
+AFLAGS_sram243x.o                       :=-Wa,-march=armv6
+AFLAGS_sram34xx.o                       :=-Wa,-march=armv7-a
+# Pin multiplexing
+obj-$(CONFIG_ARCH_OMAP3)                += mux34xx.o
 # SMS/SDRC
 obj-$(CONFIG_ARCH_OMAP2)                += sdrc2xxx.o
 # obj-$(CONFIG_ARCH_OMAP3)              += sdrc3xxx.o
@@ -30,9 +45,13 @@ obj-$(CONFIG_ARCH_OMAP2)		+= sdrc2xxx.o
 # Power Management
 ifeq ($(CONFIG_PM),y)
 obj-$(CONFIG_ARCH_OMAP2)                += pm24xx.o
-obj-$(CONFIG_ARCH_OMAP24XX)             += sleep24xx.o
+obj-$(CONFIG_ARCH_OMAP2)                += sleep24xx.o
-obj-$(CONFIG_ARCH_OMAP3)                += pm34xx.o sleep34xx.o
+obj-$(CONFIG_ARCH_OMAP3)                += pm34xx.o sleep34xx.o cpuidle34xx.o
 obj-$(CONFIG_PM_DEBUG)                  += pm-debug.o
+AFLAGS_sleep24xx.o                      :=-Wa,-march=armv6
+AFLAGS_sleep34xx.o                      :=-Wa,-march=armv7-a
 endif
 # PRCM
@@ -41,48 +60,100 @@ obj-$(CONFIG_ARCH_OMAP3)		+= cm.o
 obj-$(CONFIG_ARCH_OMAP4)                += cm4xxx.o
 # Clock framework
-obj-$(CONFIG_ARCH_OMAP2)                += clock24xx.o
+obj-$(CONFIG_ARCH_OMAP2)                += $(clock-common) clock2xxx.o \
-obj-$(CONFIG_ARCH_OMAP3)                += clock34xx.o
+                                           clkt2xxx_sys.o \
+                                           clkt2xxx_dpllcore.o \
+                                           clkt2xxx_virt_prcm_set.o \
+                                           clkt2xxx_apll.o clkt2xxx_osc.o
+obj-$(CONFIG_ARCH_OMAP2420)             += clock2420_data.o
+obj-$(CONFIG_ARCH_OMAP2430)             += clock2430.o clock2430_data.o
+obj-$(CONFIG_ARCH_OMAP3)                += $(clock-common) clock3xxx.o \
+                                           clock34xx.o clkt34xx_dpll3m2.o \
+                                           clock3517.o clock36xx.o \
+                                           dpll3xxx.o clock3xxx_data.o
+obj-$(CONFIG_ARCH_OMAP4)                += $(clock-common) clock44xx_data.o \
+                                           dpll3xxx.o
+# OMAP2 clock rate set data (old "OPP" data)
+obj-$(CONFIG_ARCH_OMAP2420)             += opp2420_data.o
+obj-$(CONFIG_ARCH_OMAP2430)             += opp2430_data.o
+# hwmod data
+obj-$(CONFIG_ARCH_OMAP2420)             += omap_hwmod_2420_data.o
+obj-$(CONFIG_ARCH_OMAP2430)             += omap_hwmod_2430_data.o
+obj-$(CONFIG_ARCH_OMAP3)                += omap_hwmod_3xxx_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
 obj-$(CONFIG_OMAP_IOMMU)                += $(iommu-y)
+i2c-omap-$(CONFIG_I2C_OMAP)             := i2c.o
+obj-y                                   += $(i2c-omap-m) $(i2c-omap-y)
 # Specific board support
 obj-$(CONFIG_MACH_OMAP_GENERIC)         += board-generic.o
 obj-$(CONFIG_MACH_OMAP_H4)              += board-h4.o
 obj-$(CONFIG_MACH_OMAP_2430SDP)         += board-2430sdp.o \
-                                           mmc-twl4030.o
+                                           hsmmc.o
 obj-$(CONFIG_MACH_OMAP_APOLLON)         += board-apollon.o
 obj-$(CONFIG_MACH_OMAP3_BEAGLE)         += board-omap3beagle.o \
-                                           mmc-twl4030.o
+                                           hsmmc.o
+obj-$(CONFIG_MACH_DEVKIT8000)           += board-devkit8000.o \
+                                           hsmmc.o
 obj-$(CONFIG_MACH_OMAP_LDP)             += board-ldp.o \
-                                           mmc-twl4030.o
+                                           hsmmc.o
 obj-$(CONFIG_MACH_OVERO)                += board-overo.o \
-                                           mmc-twl4030.o
+                                           hsmmc.o
 obj-$(CONFIG_MACH_OMAP3EVM)             += board-omap3evm.o \
-                                           mmc-twl4030.o
+                                           hsmmc.o
 obj-$(CONFIG_MACH_OMAP3_PANDORA)        += board-omap3pandora.o \
-                                           mmc-twl4030.o
+                                           hsmmc.o
 obj-$(CONFIG_MACH_OMAP_3430SDP)         += board-3430sdp.o \
-                                           mmc-twl4030.o
+                                           hsmmc.o \
+                                           board-sdp-flash.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
+                                           hsmmc.o
 obj-$(CONFIG_MACH_OMAP_ZOOM2)           += board-zoom2.o \
-                                           mmc-twl4030.o \
+                                           board-zoom-peripherals.o \
+                                           hsmmc.o \
                                           board-zoom-debugboard.o
+obj-$(CONFIG_MACH_OMAP_ZOOM3)           += board-zoom3.o \
+                                           board-zoom-peripherals.o \
+                                           hsmmc.o \
+                                           board-zoom-debugboard.o
+obj-$(CONFIG_MACH_OMAP_3630SDP)         += board-3630sdp.o \
+                                           board-zoom-peripherals.o \
+                                           hsmmc.o
+obj-$(CONFIG_MACH_CM_T35)               += board-cm-t35.o \
+                                           hsmmc.o
+obj-$(CONFIG_MACH_IGEP0020)             += board-igep0020.o \
+                                           hsmmc.o
+obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK)      += board-omap3touchbook.o \
+                                           hsmmc.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)
+nand-$(CONFIG_MTD_NAND_OMAP2)           := gpmc-nand.o
+obj-y                                   += $(nand-m) $(nand-y)
 smc91x-$(CONFIG_SMC91X)                 := gpmc-smc91x.o
 obj-y                                   += $(smc91x-m) $(smc91x-y)

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 8cb16777661a..4b9fc57770db 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile
@@ -5,24 +5,39 @@
5	# Common support	5	# Common support
6	obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.o	6	obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.o
7		7
8	omap-2-3-common = irq.o sdrc.o omap_hwmod.o	8	omap-2-3-common = irq.o sdrc.o
		9	hwmod-common = omap_hwmod.o \
		10	omap_hwmod_common_data.o
9	prcm-common = prcm.o powerdomain.o	11	prcm-common = prcm.o powerdomain.o
10	clock-common = clock.o clockdomain.o	12	clock-common = clock.o clock_common_data.o \
		13	clockdomain.o clkt_dpll.o \
		14	clkt_clksel.o
11		15
12	obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(prcm-common) $(clock-common)	16	obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(prcm-common) $(hwmod-common)
13	obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(prcm-common) $(clock-common)	17	obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(prcm-common) $(hwmod-common)
		18	obj-$(CONFIG_ARCH_OMAP4) += $(prcm-common)
14		19
15	obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o	20	obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o
16		21
17	# SMP support ONLY available for OMAP4	22	# SMP support ONLY available for OMAP4
18	obj-$(CONFIG_SMP) += omap-smp.o omap-headsmp.o	23	obj-$(CONFIG_SMP) += omap-smp.o omap-headsmp.o
19	obj-$(CONFIG_LOCAL_TIMERS) += timer-mpu.o	24	obj-$(CONFIG_LOCAL_TIMERS) += timer-mpu.o
		25	obj-$(CONFIG_ARCH_OMAP4) += omap44xx-smc.o
		26
		27	AFLAGS_omap44xx-smc.o :=-Wa,-march=armv7-a
20		28
21	# Functions loaded to SRAM	29	# Functions loaded to SRAM
22	obj-$(CONFIG_ARCH_OMAP2420) += sram242x.o	30	obj-$(CONFIG_ARCH_OMAP2420) += sram242x.o
23	obj-$(CONFIG_ARCH_OMAP2430) += sram243x.o	31	obj-$(CONFIG_ARCH_OMAP2430) += sram243x.o
24	obj-$(CONFIG_ARCH_OMAP3) += sram34xx.o	32	obj-$(CONFIG_ARCH_OMAP3) += sram34xx.o
25		33
		34	AFLAGS_sram242x.o :=-Wa,-march=armv6
		35	AFLAGS_sram243x.o :=-Wa,-march=armv6
		36	AFLAGS_sram34xx.o :=-Wa,-march=armv7-a
		37
		38	# Pin multiplexing
		39	obj-$(CONFIG_ARCH_OMAP3) += mux34xx.o
		40
26	# SMS/SDRC	41	# SMS/SDRC
27	obj-$(CONFIG_ARCH_OMAP2) += sdrc2xxx.o	42	obj-$(CONFIG_ARCH_OMAP2) += sdrc2xxx.o
28	# obj-$(CONFIG_ARCH_OMAP3) += sdrc3xxx.o	43	# obj-$(CONFIG_ARCH_OMAP3) += sdrc3xxx.o
@@ -30,9 +45,13 @@ obj-$(CONFIG_ARCH_OMAP2) += sdrc2xxx.o
30	# Power Management	45	# Power Management
31	ifeq ($(CONFIG_PM),y)	46	ifeq ($(CONFIG_PM),y)
32	obj-$(CONFIG_ARCH_OMAP2) += pm24xx.o	47	obj-$(CONFIG_ARCH_OMAP2) += pm24xx.o
33	obj-$(CONFIG_ARCH_OMAP24XX) += sleep24xx.o	48	obj-$(CONFIG_ARCH_OMAP2) += sleep24xx.o
34	obj-$(CONFIG_ARCH_OMAP3) += pm34xx.o sleep34xx.o	49	obj-$(CONFIG_ARCH_OMAP3) += pm34xx.o sleep34xx.o cpuidle34xx.o
35	obj-$(CONFIG_PM_DEBUG) += pm-debug.o	50	obj-$(CONFIG_PM_DEBUG) += pm-debug.o
		51
		52	AFLAGS_sleep24xx.o :=-Wa,-march=armv6
		53	AFLAGS_sleep34xx.o :=-Wa,-march=armv7-a
		54
36	endif	55	endif
37		56
38	# PRCM	57	# PRCM
@@ -41,48 +60,100 @@ obj-$(CONFIG_ARCH_OMAP3) += cm.o
41	obj-$(CONFIG_ARCH_OMAP4) += cm4xxx.o	60	obj-$(CONFIG_ARCH_OMAP4) += cm4xxx.o
42		61
43	# Clock framework	62	# Clock framework
44	obj-$(CONFIG_ARCH_OMAP2) += clock24xx.o	63	obj-$(CONFIG_ARCH_OMAP2) += $(clock-common) clock2xxx.o \
45	obj-$(CONFIG_ARCH_OMAP3) += clock34xx.o	64	clkt2xxx_sys.o \
		65	clkt2xxx_dpllcore.o \
		66	clkt2xxx_virt_prcm_set.o \
		67	clkt2xxx_apll.o clkt2xxx_osc.o
		68	obj-$(CONFIG_ARCH_OMAP2420) += clock2420_data.o
		69	obj-$(CONFIG_ARCH_OMAP2430) += clock2430.o clock2430_data.o
		70	obj-$(CONFIG_ARCH_OMAP3) += $(clock-common) clock3xxx.o \
		71	clock34xx.o clkt34xx_dpll3m2.o \
		72	clock3517.o clock36xx.o \
		73	dpll3xxx.o clock3xxx_data.o
		74	obj-$(CONFIG_ARCH_OMAP4) += $(clock-common) clock44xx_data.o \
		75	dpll3xxx.o
		76
		77	# OMAP2 clock rate set data (old "OPP" data)
		78	obj-$(CONFIG_ARCH_OMAP2420) += opp2420_data.o
		79	obj-$(CONFIG_ARCH_OMAP2430) += opp2430_data.o
		80
		81	# hwmod data
		82	obj-$(CONFIG_ARCH_OMAP2420) += omap_hwmod_2420_data.o
		83	obj-$(CONFIG_ARCH_OMAP2430) += omap_hwmod_2430_data.o
		84	obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_3xxx_data.o
		85
		86	# EMU peripherals
		87	obj-$(CONFIG_OMAP3_EMU) += emu.o
		88
		89	obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox_mach.o
		90	mailbox_mach-objs := mailbox.o
46		91
47	iommu-y += iommu2.o	92	iommu-y += iommu2.o
48	iommu-$(CONFIG_ARCH_OMAP3) += omap3-iommu.o	93	iommu-$(CONFIG_ARCH_OMAP3) += omap3-iommu.o
49		94
50	obj-$(CONFIG_OMAP_IOMMU) += $(iommu-y)	95	obj-$(CONFIG_OMAP_IOMMU) += $(iommu-y)
51		96
		97	i2c-omap-$(CONFIG_I2C_OMAP) := i2c.o
		98	obj-y += $(i2c-omap-m) $(i2c-omap-y)
		99
52	# Specific board support	100	# Specific board support
53	obj-$(CONFIG_MACH_OMAP_GENERIC) += board-generic.o	101	obj-$(CONFIG_MACH_OMAP_GENERIC) += board-generic.o
54	obj-$(CONFIG_MACH_OMAP_H4) += board-h4.o	102	obj-$(CONFIG_MACH_OMAP_H4) += board-h4.o
55	obj-$(CONFIG_MACH_OMAP_2430SDP) += board-2430sdp.o \	103	obj-$(CONFIG_MACH_OMAP_2430SDP) += board-2430sdp.o \
56	mmc-twl4030.o	104	hsmmc.o
57	obj-$(CONFIG_MACH_OMAP_APOLLON) += board-apollon.o	105	obj-$(CONFIG_MACH_OMAP_APOLLON) += board-apollon.o
58	obj-$(CONFIG_MACH_OMAP3_BEAGLE) += board-omap3beagle.o \	106	obj-$(CONFIG_MACH_OMAP3_BEAGLE) += board-omap3beagle.o \
59	mmc-twl4030.o	107	hsmmc.o
		108	obj-$(CONFIG_MACH_DEVKIT8000) += board-devkit8000.o \
		109	hsmmc.o
60	obj-$(CONFIG_MACH_OMAP_LDP) += board-ldp.o \	110	obj-$(CONFIG_MACH_OMAP_LDP) += board-ldp.o \
61	mmc-twl4030.o	111	hsmmc.o
62	obj-$(CONFIG_MACH_OVERO) += board-overo.o \	112	obj-$(CONFIG_MACH_OVERO) += board-overo.o \
63	mmc-twl4030.o	113	hsmmc.o
64	obj-$(CONFIG_MACH_OMAP3EVM) += board-omap3evm.o \	114	obj-$(CONFIG_MACH_OMAP3EVM) += board-omap3evm.o \
65	mmc-twl4030.o	115	hsmmc.o
66	obj-$(CONFIG_MACH_OMAP3_PANDORA) += board-omap3pandora.o \	116	obj-$(CONFIG_MACH_OMAP3_PANDORA) += board-omap3pandora.o \
67	mmc-twl4030.o	117	hsmmc.o
68	obj-$(CONFIG_MACH_OMAP_3430SDP) += board-3430sdp.o \	118	obj-$(CONFIG_MACH_OMAP_3430SDP) += board-3430sdp.o \
69	mmc-twl4030.o	119	hsmmc.o \
		120	board-sdp-flash.o
70	obj-$(CONFIG_MACH_NOKIA_N8X0) += board-n8x0.o	121	obj-$(CONFIG_MACH_NOKIA_N8X0) += board-n8x0.o
71	obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \	122	obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \
		123	board-rx51-sdram.o \
72	board-rx51-peripherals.o \	124	board-rx51-peripherals.o \
73	mmc-twl4030.o	125	hsmmc.o
74	obj-$(CONFIG_MACH_OMAP_ZOOM2) += board-zoom2.o \	126	obj-$(CONFIG_MACH_OMAP_ZOOM2) += board-zoom2.o \
75	mmc-twl4030.o \	127	board-zoom-peripherals.o \
		128	hsmmc.o \
76	board-zoom-debugboard.o	129	board-zoom-debugboard.o
77		130	obj-$(CONFIG_MACH_OMAP_ZOOM3) += board-zoom3.o \
		131	board-zoom-peripherals.o \
		132	hsmmc.o \
		133	board-zoom-debugboard.o
		134	obj-$(CONFIG_MACH_OMAP_3630SDP) += board-3630sdp.o \
		135	board-zoom-peripherals.o \
		136	hsmmc.o
		137	obj-$(CONFIG_MACH_CM_T35) += board-cm-t35.o \
		138	hsmmc.o
		139	obj-$(CONFIG_MACH_IGEP0020) += board-igep0020.o \
		140	hsmmc.o
		141	obj-$(CONFIG_MACH_OMAP3_TOUCHBOOK) += board-omap3touchbook.o \
		142	hsmmc.o
78	obj-$(CONFIG_MACH_OMAP_4430SDP) += board-4430sdp.o	143	obj-$(CONFIG_MACH_OMAP_4430SDP) += board-4430sdp.o
79		144
		145	obj-$(CONFIG_MACH_OMAP3517EVM) += board-am3517evm.o
		146
80	# Platform specific device init code	147	# Platform specific device init code
81	obj-y += usb-musb.o	148	obj-y += usb-musb.o
82	obj-$(CONFIG_MACH_OMAP2_TUSB6010) += usb-tusb6010.o	149	obj-$(CONFIG_MACH_OMAP2_TUSB6010) += usb-tusb6010.o
		150	obj-y += usb-ehci.o
83		151
84	onenand-$(CONFIG_MTD_ONENAND_OMAP2) := gpmc-onenand.o	152	onenand-$(CONFIG_MTD_ONENAND_OMAP2) := gpmc-onenand.o
85	obj-y += $(onenand-m) $(onenand-y)	153	obj-y += $(onenand-m) $(onenand-y)
86		154
		155	nand-$(CONFIG_MTD_NAND_OMAP2) := gpmc-nand.o
		156	obj-y += $(nand-m) $(nand-y)
		157
87	smc91x-$(CONFIG_SMC91X) := gpmc-smc91x.o	158	smc91x-$(CONFIG_SMC91X) := gpmc-smc91x.o
88	obj-y += $(smc91x-m) $(smc91x-y)	159	obj-y += $(smc91x-m) $(smc91x-y)