1 files changed, 63 insertions, 20 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 60e51bcf53bd..4ab82f6f15b1 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -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_dpll.o clkt_clksel.o
-                                          clkt_clksel.o
-obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(prcm-common) $(hwmod-common)
+obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common)
-obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(prcm-common) $(hwmod-common)
+obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common)
-obj-$(CONFIG_ARCH_OMAP4) += $(prcm-common) prm44xx.o $(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
+plus_sec := $(call as-instr,.arch_extension sec,+sec)
-AFLAGS_omap44xx-smc.o                   :=-Wa,-march=armv7-a
+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_OMAP2)                += sleep24xx.o pm_bus.o voltage.o
-obj-$(CONFIG_ARCH_OMAP3)                += pm34xx.o sleep34xx.o cpuidle34xx.o pm_bus.o
+obj-$(CONFIG_ARCH_OMAP3)                += pm34xx.o sleep34xx.o voltage.o \
-obj-$(CONFIG_ARCH_OMAP4)                += pm44xx.o pm_bus.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_OMAP2)                += prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o
-obj-$(CONFIG_ARCH_OMAP3)                += cm.o
+obj-$(CONFIG_ARCH_OMAP3)                += prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o
-obj-$(CONFIG_ARCH_OMAP4)                += cm4xxx.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,17 +177,20 @@ 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-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-flash.o \
                                           hsmmc.o \
@@ -174,6 +215,8 @@ obj-$(CONFIG_MACH_OMAP4_PANDA)		+= board-omap4panda.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

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 60e51bcf53bd..4ab82f6f15b1 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile
@@ -4,30 +4,31 @@
4		4
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 pm.o \	6	obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.o pm.o \
7	common.o	7	common.o gpio.o dma.o wd_timer.o
8		8
9	omap-2-3-common = irq.o sdrc.o prm2xxx_3xxx.o	9	omap-2-3-common = irq.o sdrc.o
10	hwmod-common = omap_hwmod.o \	10	hwmod-common = omap_hwmod.o \
11	omap_hwmod_common_data.o	11	omap_hwmod_common_data.o
12	prcm-common = prcm.o powerdomain.o
13	clock-common = clock.o clock_common_data.o \	12	clock-common = clock.o clock_common_data.o \
14	clockdomain.o clkt_dpll.o \	13	clkt_dpll.o clkt_clksel.o
15	clkt_clksel.o
16		14
17	obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(prcm-common) $(hwmod-common)	15	obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common)
18	obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(prcm-common) $(hwmod-common)	16	obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common)
19	obj-$(CONFIG_ARCH_OMAP4) += $(prcm-common) prm44xx.o $(hwmod-common)	17	obj-$(CONFIG_ARCH_OMAP4) += prm44xx.o $(hwmod-common)
20		18
21	obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o	19	obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o
22		20
		21	obj-$(CONFIG_TWL4030_CORE) += omap_twl.o
		22
23	# SMP support ONLY available for OMAP4	23	# SMP support ONLY available for OMAP4
24	obj-$(CONFIG_SMP) += omap-smp.o omap-headsmp.o	24	obj-$(CONFIG_SMP) += omap-smp.o omap-headsmp.o
25	obj-$(CONFIG_LOCAL_TIMERS) += timer-mpu.o	25	obj-$(CONFIG_LOCAL_TIMERS) += timer-mpu.o
26	obj-$(CONFIG_HOTPLUG_CPU) += omap-hotplug.o	26	obj-$(CONFIG_HOTPLUG_CPU) += omap-hotplug.o
27	obj-$(CONFIG_ARCH_OMAP4) += omap44xx-smc.o omap4-common.o	27	obj-$(CONFIG_ARCH_OMAP4) += omap44xx-smc.o omap4-common.o
28		28
29	AFLAGS_omap-headsmp.o :=-Wa,-march=armv7-a	29	plus_sec := $(call as-instr,.arch_extension sec,+sec)
30	AFLAGS_omap44xx-smc.o :=-Wa,-march=armv7-a	30	AFLAGS_omap-headsmp.o :=-Wa,-march=armv7-a$(plus_sec)
		31	AFLAGS_omap44xx-smc.o :=-Wa,-march=armv7-a$(plus_sec)
31		32
32	# Functions loaded to SRAM	33	# Functions loaded to SRAM
33	obj-$(CONFIG_ARCH_OMAP2420) += sram242x.o	34	obj-$(CONFIG_ARCH_OMAP2420) += sram242x.o
@@ -42,18 +43,29 @@ AFLAGS_sram34xx.o :=-Wa,-march=armv7-a
42	obj-$(CONFIG_ARCH_OMAP2420) += mux2420.o	43	obj-$(CONFIG_ARCH_OMAP2420) += mux2420.o
43	obj-$(CONFIG_ARCH_OMAP2430) += mux2430.o	44	obj-$(CONFIG_ARCH_OMAP2430) += mux2430.o
44	obj-$(CONFIG_ARCH_OMAP3) += mux34xx.o	45	obj-$(CONFIG_ARCH_OMAP3) += mux34xx.o
		46	obj-$(CONFIG_ARCH_OMAP4) += mux44xx.o
45		47
46	# SMS/SDRC	48	# SMS/SDRC
47	obj-$(CONFIG_ARCH_OMAP2) += sdrc2xxx.o	49	obj-$(CONFIG_ARCH_OMAP2) += sdrc2xxx.o
48	# obj-$(CONFIG_ARCH_OMAP3) += sdrc3xxx.o	50	# obj-$(CONFIG_ARCH_OMAP3) += sdrc3xxx.o
49		51
		52	# OPP table initialization
		53	ifeq ($(CONFIG_PM_OPP),y)
		54	obj-y += opp.o
		55	obj-$(CONFIG_ARCH_OMAP3) += opp3xxx_data.o
		56	obj-$(CONFIG_ARCH_OMAP4) += opp4xxx_data.o
		57	endif
		58
50	# Power Management	59	# Power Management
51	ifeq ($(CONFIG_PM),y)	60	ifeq ($(CONFIG_PM),y)
52	obj-$(CONFIG_ARCH_OMAP2) += pm24xx.o	61	obj-$(CONFIG_ARCH_OMAP2) += pm24xx.o
53	obj-$(CONFIG_ARCH_OMAP2) += sleep24xx.o pm_bus.o	62	obj-$(CONFIG_ARCH_OMAP2) += sleep24xx.o pm_bus.o voltage.o
54	obj-$(CONFIG_ARCH_OMAP3) += pm34xx.o sleep34xx.o cpuidle34xx.o pm_bus.o	63	obj-$(CONFIG_ARCH_OMAP3) += pm34xx.o sleep34xx.o voltage.o \
55	obj-$(CONFIG_ARCH_OMAP4) += pm44xx.o pm_bus.o	64	cpuidle34xx.o pm_bus.o
		65	obj-$(CONFIG_ARCH_OMAP4) += pm44xx.o voltage.o pm_bus.o
56	obj-$(CONFIG_PM_DEBUG) += pm-debug.o	66	obj-$(CONFIG_PM_DEBUG) += pm-debug.o
		67	obj-$(CONFIG_OMAP_SMARTREFLEX) += sr_device.o smartreflex.o
		68	obj-$(CONFIG_OMAP_SMARTREFLEX_CLASS3) += smartreflex-class3.o
57		69
58	AFLAGS_sleep24xx.o :=-Wa,-march=armv6	70	AFLAGS_sleep24xx.o :=-Wa,-march=armv6
59	AFLAGS_sleep34xx.o :=-Wa,-march=armv7-a	71	AFLAGS_sleep34xx.o :=-Wa,-march=armv7-a
@@ -65,10 +77,36 @@ endif
65	endif	77	endif
66		78
67	# PRCM	79	# PRCM
68	obj-$(CONFIG_ARCH_OMAP2) += cm.o	80	obj-$(CONFIG_ARCH_OMAP2) += prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o
69	obj-$(CONFIG_ARCH_OMAP3) += cm.o	81	obj-$(CONFIG_ARCH_OMAP3) += prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o
70	obj-$(CONFIG_ARCH_OMAP4) += cm4xxx.o	82	# XXX The presence of cm2xxx_3xxx.o on the line below is temporary and
71		83	# will be removed once the OMAP4 part of the codebase is converted to
		84	# use OMAP4-specific PRCM functions.
		85	obj-$(CONFIG_ARCH_OMAP4) += prcm.o cm2xxx_3xxx.o cminst44xx.o \
		86	cm44xx.o prcm_mpu44xx.o \
		87	prminst44xx.o
		88
		89	# OMAP powerdomain framework
		90	powerdomain-common += powerdomain.o powerdomain-common.o
		91	obj-$(CONFIG_ARCH_OMAP2) += $(powerdomain-common) \
		92	powerdomain2xxx_3xxx.o \
		93	powerdomains2xxx_data.o \
		94	powerdomains2xxx_3xxx_data.o
		95	obj-$(CONFIG_ARCH_OMAP3) += $(powerdomain-common) \
		96	powerdomain2xxx_3xxx.o \
		97	powerdomains3xxx_data.o \
		98	powerdomains2xxx_3xxx_data.o
		99	obj-$(CONFIG_ARCH_OMAP4) += $(powerdomain-common) \
		100	powerdomain44xx.o \
		101	powerdomains44xx_data.o
		102
		103	# PRCM clockdomain control
		104	obj-$(CONFIG_ARCH_OMAP2) += clockdomain.o \
		105	clockdomains2xxx_3xxx_data.o
		106	obj-$(CONFIG_ARCH_OMAP3) += clockdomain.o \
		107	clockdomains2xxx_3xxx_data.o
		108	obj-$(CONFIG_ARCH_OMAP4) += clockdomain.o \
		109	clockdomains44xx_data.o
72	# Clock framework	110	# Clock framework
73	obj-$(CONFIG_ARCH_OMAP2) += $(clock-common) clock2xxx.o \	111	obj-$(CONFIG_ARCH_OMAP2) += $(clock-common) clock2xxx.o \
74	clkt2xxx_sys.o \	112	clkt2xxx_sys.o \
@@ -139,17 +177,20 @@ obj-$(CONFIG_MACH_OMAP_3430SDP) += board-3430sdp.o \
139	hsmmc.o \	177	hsmmc.o \
140	board-flash.o	178	board-flash.o
141	obj-$(CONFIG_MACH_NOKIA_N8X0) += board-n8x0.o	179	obj-$(CONFIG_MACH_NOKIA_N8X0) += board-n8x0.o
		180	obj-$(CONFIG_MACH_NOKIA_RM680) += board-rm680.o \
		181	sdram-nokia.o \
		182	hsmmc.o
142	obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \	183	obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \
143	board-rx51-sdram.o \	184	sdram-nokia.o \
144	board-rx51-peripherals.o \	185	board-rx51-peripherals.o \
145	board-rx51-video.o \	186	board-rx51-video.o \
146	hsmmc.o	187	hsmmc.o
147	obj-$(CONFIG_MACH_OMAP_ZOOM2) += board-zoom2.o \	188	obj-$(CONFIG_MACH_OMAP_ZOOM2) += board-zoom.o \
148	board-zoom-peripherals.o \	189	board-zoom-peripherals.o \
149	board-flash.o \	190	board-flash.o \
150	hsmmc.o \	191	hsmmc.o \
151	board-zoom-debugboard.o	192	board-zoom-debugboard.o
152	obj-$(CONFIG_MACH_OMAP_ZOOM3) += board-zoom3.o \	193	obj-$(CONFIG_MACH_OMAP_ZOOM3) += board-zoom.o \
153	board-zoom-peripherals.o \	194	board-zoom-peripherals.o \
154	board-flash.o \	195	board-flash.o \
155	hsmmc.o \	196	hsmmc.o \
@@ -174,6 +215,8 @@ obj-$(CONFIG_MACH_OMAP4_PANDA) += board-omap4panda.o \
174		215
175	obj-$(CONFIG_MACH_OMAP3517EVM) += board-am3517evm.o	216	obj-$(CONFIG_MACH_OMAP3517EVM) += board-am3517evm.o
176		217
		218	obj-$(CONFIG_MACH_CRANEBOARD) += board-am3517crane.o
		219
177	obj-$(CONFIG_MACH_SBC3530) += board-omap3stalker.o \	220	obj-$(CONFIG_MACH_SBC3530) += board-omap3stalker.o \
178	hsmmc.o	221	hsmmc.o
179	# Platform specific device init code	222	# Platform specific device init code