diff options
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/Kconfig | 4 | ||||
-rw-r--r-- | arch/arm/mach-omap2/Makefile | 5 | ||||
-rw-r--r-- | arch/arm/mach-omap2/common.c | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 042f157a8f94..3649a34db00d 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig | |||
@@ -82,8 +82,10 @@ config SOC_TI81XX | |||
82 | 82 | ||
83 | config SOC_AM33XX | 83 | config SOC_AM33XX |
84 | bool "AM33XX support" | 84 | bool "AM33XX support" |
85 | depends on ARCH_OMAP3 | ||
86 | default y | 85 | default y |
86 | select CPU_V7 | ||
87 | select ARM_CPU_SUSPEND if PM | ||
88 | select MULTI_IRQ_HANDLER | ||
87 | 89 | ||
88 | config OMAP_PACKAGE_ZAF | 90 | config OMAP_PACKAGE_ZAF |
89 | bool | 91 | bool |
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 54ad3a4b612c..846d44547fd3 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile | |||
@@ -16,6 +16,7 @@ secure-common = omap-smc.o omap-secure.o | |||
16 | obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common) | 16 | obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common) |
17 | obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common) $(secure-common) | 17 | obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common) $(secure-common) |
18 | obj-$(CONFIG_ARCH_OMAP4) += prm44xx.o $(hwmod-common) $(secure-common) | 18 | obj-$(CONFIG_ARCH_OMAP4) += prm44xx.o $(hwmod-common) $(secure-common) |
19 | obj-$(CONFIG_SOC_AM33XX) += irq.o $(hwmod-common) | ||
19 | 20 | ||
20 | ifneq ($(CONFIG_SND_OMAP_SOC_MCBSP),) | 21 | ifneq ($(CONFIG_SND_OMAP_SOC_MCBSP),) |
21 | obj-y += mcbsp.o | 22 | obj-y += mcbsp.o |
@@ -100,6 +101,7 @@ obj-$(CONFIG_ARCH_OMAP3) += $(voltagedomain-common) | |||
100 | obj-$(CONFIG_ARCH_OMAP3) += voltagedomains3xxx_data.o | 101 | obj-$(CONFIG_ARCH_OMAP3) += voltagedomains3xxx_data.o |
101 | obj-$(CONFIG_ARCH_OMAP4) += $(voltagedomain-common) | 102 | obj-$(CONFIG_ARCH_OMAP4) += $(voltagedomain-common) |
102 | obj-$(CONFIG_ARCH_OMAP4) += voltagedomains44xx_data.o | 103 | obj-$(CONFIG_ARCH_OMAP4) += voltagedomains44xx_data.o |
104 | obj-$(CONFIG_SOC_AM33XX) += $(voltagedomain-common) | ||
103 | obj-$(CONFIG_SOC_AM33XX) += voltagedomains33xx_data.o | 105 | obj-$(CONFIG_SOC_AM33XX) += voltagedomains33xx_data.o |
104 | 106 | ||
105 | # OMAP powerdomain framework | 107 | # OMAP powerdomain framework |
@@ -115,6 +117,7 @@ obj-$(CONFIG_ARCH_OMAP3) += powerdomains2xxx_3xxx_data.o | |||
115 | obj-$(CONFIG_ARCH_OMAP4) += $(powerdomain-common) | 117 | obj-$(CONFIG_ARCH_OMAP4) += $(powerdomain-common) |
116 | obj-$(CONFIG_ARCH_OMAP4) += powerdomain44xx.o | 118 | obj-$(CONFIG_ARCH_OMAP4) += powerdomain44xx.o |
117 | obj-$(CONFIG_ARCH_OMAP4) += powerdomains44xx_data.o | 119 | obj-$(CONFIG_ARCH_OMAP4) += powerdomains44xx_data.o |
120 | obj-$(CONFIG_SOC_AM33XX) += $(powerdomain-common) | ||
118 | obj-$(CONFIG_SOC_AM33XX) += powerdomain33xx.o | 121 | obj-$(CONFIG_SOC_AM33XX) += powerdomain33xx.o |
119 | obj-$(CONFIG_SOC_AM33XX) += powerdomains33xx_data.o | 122 | obj-$(CONFIG_SOC_AM33XX) += powerdomains33xx_data.o |
120 | 123 | ||
@@ -132,6 +135,7 @@ obj-$(CONFIG_ARCH_OMAP3) += clockdomains3xxx_data.o | |||
132 | obj-$(CONFIG_ARCH_OMAP4) += $(clockdomain-common) | 135 | obj-$(CONFIG_ARCH_OMAP4) += $(clockdomain-common) |
133 | obj-$(CONFIG_ARCH_OMAP4) += clockdomain44xx.o | 136 | obj-$(CONFIG_ARCH_OMAP4) += clockdomain44xx.o |
134 | obj-$(CONFIG_ARCH_OMAP4) += clockdomains44xx_data.o | 137 | obj-$(CONFIG_ARCH_OMAP4) += clockdomains44xx_data.o |
138 | obj-$(CONFIG_SOC_AM33XX) += $(clockdomain-common) | ||
135 | obj-$(CONFIG_SOC_AM33XX) += clockdomain33xx.o | 139 | obj-$(CONFIG_SOC_AM33XX) += clockdomain33xx.o |
136 | obj-$(CONFIG_SOC_AM33XX) += clockdomains33xx_data.o | 140 | obj-$(CONFIG_SOC_AM33XX) += clockdomains33xx_data.o |
137 | 141 | ||
@@ -151,6 +155,7 @@ obj-$(CONFIG_ARCH_OMAP3) += dpll3xxx.o clock3xxx_data.o | |||
151 | obj-$(CONFIG_ARCH_OMAP3) += clkt_iclk.o | 155 | obj-$(CONFIG_ARCH_OMAP3) += clkt_iclk.o |
152 | obj-$(CONFIG_ARCH_OMAP4) += $(clock-common) clock44xx_data.o | 156 | obj-$(CONFIG_ARCH_OMAP4) += $(clock-common) clock44xx_data.o |
153 | obj-$(CONFIG_ARCH_OMAP4) += dpll3xxx.o dpll44xx.o | 157 | obj-$(CONFIG_ARCH_OMAP4) += dpll3xxx.o dpll44xx.o |
158 | obj-$(CONFIG_SOC_AM33XX) += $(clock-common) dpll3xxx.o | ||
154 | 159 | ||
155 | # OMAP2 clock rate set data (old "OPP" data) | 160 | # OMAP2 clock rate set data (old "OPP" data) |
156 | obj-$(CONFIG_SOC_OMAP2420) += opp2420_data.o | 161 | obj-$(CONFIG_SOC_OMAP2420) += opp2420_data.o |
diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c index 8a6953a34fe2..a7aa538e681d 100644 --- a/arch/arm/mach-omap2/common.c +++ b/arch/arm/mach-omap2/common.c | |||
@@ -134,7 +134,9 @@ void __init ti81xx_map_io(void) | |||
134 | { | 134 | { |
135 | omapti81xx_map_common_io(); | 135 | omapti81xx_map_common_io(); |
136 | } | 136 | } |
137 | #endif | ||
137 | 138 | ||
139 | #if defined(CONFIG_SOC_AM33XX) | ||
138 | #define AM33XX_TAP_BASE (AM33XX_CTRL_BASE + \ | 140 | #define AM33XX_TAP_BASE (AM33XX_CTRL_BASE + \ |
139 | TI81XX_CONTROL_DEVICE_ID - 0x204) | 141 | TI81XX_CONTROL_DEVICE_ID - 0x204) |
140 | 142 | ||