aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorKevin Hilman <khilman@ti.com>2012-05-10 14:10:07 -0400
committerTony Lindgren <tony@atomide.com>2012-05-10 14:10:07 -0400
commitbb6abcf440c4c861a2131c0651b683dbd2edba84 (patch)
tree8742232836724ebcd913cb89b578085848f50674 /arch/arm
parent33959553b81e46640994cbcdb4888d60022dc6fd (diff)
ARM: OMAP2+: Kconfig: convert SOC_OMAPAM33XX to SOC_AM33XX
No need to have an OMAP prefix on these SoCs that are in the family but arent' really called OMAP. Simple rename: CONFIG_SOC_OMAPAM33XX --> CONFIG_SOC_AM33XX No functional change. Signed-off-by: Kevin Hilman <khilman@ti.com> Acked-by: Vaibhav Hiremath <hvaibhav@ti.com> [tony@atomide.com: updated for the driver config change also] Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/Kconfig2
-rw-r--r--arch/arm/mach-omap2/common.h2
-rw-r--r--arch/arm/mach-omap2/io.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 7f89697aa5c2..61bf3c3ce6fc 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -82,7 +82,7 @@ config SOC_TI81XX
82 depends on ARCH_OMAP3 82 depends on ARCH_OMAP3
83 default y 83 default y
84 84
85config SOC_OMAPAM33XX 85config SOC_AM33XX
86 bool "AM33XX support" 86 bool "AM33XX support"
87 depends on ARCH_OMAP3 87 depends on ARCH_OMAP3
88 default y 88 default y
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
index f6be402611b0..9c255a3cb392 100644
--- a/arch/arm/mach-omap2/common.h
+++ b/arch/arm/mach-omap2/common.h
@@ -63,7 +63,7 @@ static inline void omapti81xx_map_common_io(void)
63} 63}
64#endif 64#endif
65 65
66#ifdef CONFIG_SOC_OMAPAM33XX 66#ifdef CONFIG_SOC_AM33XX
67extern void omapam33xx_map_common_io(void); 67extern void omapam33xx_map_common_io(void);
68#else 68#else
69static inline void omapam33xx_map_common_io(void) 69static inline void omapam33xx_map_common_io(void)
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 646a1cd335d3..e451f60c3a85 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -183,7 +183,7 @@ static struct map_desc omapti81xx_io_desc[] __initdata = {
183}; 183};
184#endif 184#endif
185 185
186#ifdef CONFIG_SOC_OMAPAM33XX 186#ifdef CONFIG_SOC_AM33XX
187static struct map_desc omapam33xx_io_desc[] __initdata = { 187static struct map_desc omapam33xx_io_desc[] __initdata = {
188 { 188 {
189 .virtual = L4_34XX_VIRT, 189 .virtual = L4_34XX_VIRT,
@@ -292,7 +292,7 @@ void __init omapti81xx_map_common_io(void)
292} 292}
293#endif 293#endif
294 294
295#ifdef CONFIG_SOC_OMAPAM33XX 295#ifdef CONFIG_SOC_AM33XX
296void __init omapam33xx_map_common_io(void) 296void __init omapam33xx_map_common_io(void)
297{ 297{
298 iotable_init(omapam33xx_io_desc, ARRAY_SIZE(omapam33xx_io_desc)); 298 iotable_init(omapam33xx_io_desc, ARRAY_SIZE(omapam33xx_io_desc));