omap3: Replace ARCH_OMAP34XX with ARCH_OMAP3

Replace ARCH_OMAP34XX with ARCH_OMAP3

Signed-off-by: Tony Lindgren <tony@atomide.com>

6 files changed, 23 insertions, 28 deletions

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 69a6b2baabfe..317b8cb375be 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -11,14 +11,9 @@ config ARCH_OMAP2430
         bool "OMAP2430 support"
         depends on ARCH_OMAP2
 
-config ARCH_OMAP34XX
-        bool "OMAP34xx Based System"
-        depends on ARCH_OMAP3
-        select USB_ARCH_HAS_EHCI
-
 config ARCH_OMAP3430
         bool "OMAP3430 support"
-        depends on ARCH_OMAP3 && ARCH_OMAP34XX
+        depends on ARCH_OMAP3
         select ARCH_OMAP_OTG
 
 config OMAP_PACKAGE_CBC
@@ -60,42 +55,42 @@ config MACH_OMAP_2430SDP
 
 config MACH_OMAP3_BEAGLE
         bool "OMAP3 BEAGLE board"
-        depends on ARCH_OMAP3 && ARCH_OMAP34XX
+        depends on ARCH_OMAP3
         select OMAP_PACKAGE_CBB
 
 config MACH_OMAP_LDP
         bool "OMAP3 LDP board"
-        depends on ARCH_OMAP3 && ARCH_OMAP34XX
+        depends on ARCH_OMAP3
         select OMAP_PACKAGE_CBB
 
 config MACH_OVERO
         bool "Gumstix Overo board"
-        depends on ARCH_OMAP3 && ARCH_OMAP34XX
+        depends on ARCH_OMAP3
         select OMAP_PACKAGE_CBB
 
 config MACH_OMAP3EVM
         bool "OMAP 3530 EVM board"
-        depends on ARCH_OMAP3 && ARCH_OMAP34XX
+        depends on ARCH_OMAP3
         select OMAP_PACKAGE_CBB
 
 config MACH_OMAP3517EVM
         bool "OMAP3517/ AM3517 EVM board"
-        depends on ARCH_OMAP3 && ARCH_OMAP34XX
+        depends on ARCH_OMAP3
         select OMAP_PACKAGE_CBB
 
 config MACH_OMAP3_PANDORA
         bool "OMAP3 Pandora"
-        depends on ARCH_OMAP3 && ARCH_OMAP34XX
+        depends on ARCH_OMAP3
         select OMAP_PACKAGE_CBB
 
 config MACH_OMAP3_TOUCHBOOK
         bool "OMAP3 Touch Book"
-        depends on ARCH_OMAP3 && ARCH_OMAP34XX
+        depends on ARCH_OMAP3
         select BACKLIGHT_CLASS_DEVICE
 
 config MACH_OMAP_3430SDP
         bool "OMAP 3430 SDP board"
-        depends on ARCH_OMAP3 && ARCH_OMAP34XX
+        depends on ARCH_OMAP3
         select OMAP_PACKAGE_CBB
 
 config MACH_NOKIA_N800
@@ -116,33 +111,33 @@ config MACH_NOKIA_N8X0
 
 config MACH_NOKIA_RX51
         bool "Nokia RX-51 board"
-        depends on ARCH_OMAP3 && ARCH_OMAP34XX
+        depends on ARCH_OMAP3
         select OMAP_PACKAGE_CBB
 
 config MACH_OMAP_ZOOM2
         bool "OMAP3 Zoom2 board"
-        depends on ARCH_OMAP3 && ARCH_OMAP34XX
+        depends on ARCH_OMAP3
         select OMAP_PACKAGE_CBB
 
 config MACH_OMAP_ZOOM3
         bool "OMAP3630 Zoom3 board"
-        depends on ARCH_OMAP3 && ARCH_OMAP34XX
+        depends on ARCH_OMAP3
         select OMAP_PACKAGE_CBP
 
 config MACH_CM_T35
         bool "CompuLab CM-T35 module"
-        depends on ARCH_OMAP3 && ARCH_OMAP34XX
+        depends on ARCH_OMAP3
         select OMAP_PACKAGE_CUS
         select OMAP_MUX
 
 config MACH_IGEP0020
         bool "IGEP0020"
-        depends on ARCH_OMAP3 && ARCH_OMAP34XX
+        depends on ARCH_OMAP3
         select OMAP_PACKAGE_CBB
 
 config MACH_OMAP_3630SDP
         bool "OMAP3630 SDP board"
-        depends on ARCH_OMAP3 && ARCH_OMAP34XX
+        depends on ARCH_OMAP3
         select OMAP_PACKAGE_CBP
 
 config MACH_OMAP_4430SDP
@@ -158,7 +153,7 @@ config OMAP3_EMU
 
 config OMAP3_SDRC_AC_TIMING
         bool "Enable SDRC AC timing register changes"
-        depends on ARCH_OMAP3 && ARCH_OMAP34XX
+        depends on ARCH_OMAP3
         default n
         help
           If you know that none of your system initiators will attempt to
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 103fc0915fb9..5a3d6f9107e4 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -125,7 +125,7 @@ static struct map_desc omap243x_io_desc[] __initdata = {
 #endif
 #endif
 
-#ifdef  CONFIG_ARCH_OMAP34XX
+#ifdef  CONFIG_ARCH_OMAP3
 static struct map_desc omap34xx_io_desc[] __initdata = {
         {
                 .virtual        = L3_34XX_VIRT,
@@ -269,7 +269,7 @@ void __init omap243x_map_common_io()
 }
 #endif
 
-#ifdef CONFIG_ARCH_OMAP34XX
+#ifdef CONFIG_ARCH_OMAP3
 void __init omap34xx_map_common_io()
 {
         iotable_init(omap34xx_io_desc, ARRAY_SIZE(omap34xx_io_desc));
diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c
index baa451733850..4b6e5157520f 100644
--- a/arch/arm/mach-omap2/mcbsp.c
+++ b/arch/arm/mach-omap2/mcbsp.c
@@ -119,7 +119,7 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = {
 #define OMAP2430_MCBSP_PDATA_SZ         0
 #endif
 
-#ifdef CONFIG_ARCH_OMAP34XX
+#ifdef CONFIG_ARCH_OMAP3
 static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {
         {
                 .phys_base      = OMAP34XX_MCBSP1_BASE,
diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
index fa7c8dad35ef..5ee2372f3b42 100644
--- a/arch/arm/mach-omap2/mux.c
+++ b/arch/arm/mach-omap2/mux.c
@@ -369,7 +369,7 @@ int __init omap2_mux_init(void)
 
 /*----------------------------------------------------------------------------*/
 
-#ifdef CONFIG_ARCH_OMAP34XX
+#ifdef CONFIG_ARCH_OMAP3
 static LIST_HEAD(muxmodes);
 static DEFINE_MUTEX(muxmode_mutex);
 
@@ -1018,5 +1018,5 @@ int __init omap_mux_init(u32 mux_pbase, u32 mux_size,
         return 0;
 }
 
-#endif  /* CONFIG_ARCH_OMAP34XX */
+#endif  /* CONFIG_ARCH_OMAP3 */
 
diff --git a/arch/arm/mach-omap2/mux.h b/arch/arm/mach-omap2/mux.h
index f8c2e7a8f063..480abc56e605 100644
--- a/arch/arm/mach-omap2/mux.h
+++ b/arch/arm/mach-omap2/mux.h
@@ -102,7 +102,7 @@ struct omap_board_mux {
         u16     value;
 };
 
-#if defined(CONFIG_OMAP_MUX) && defined(CONFIG_ARCH_OMAP34XX)
+#if defined(CONFIG_OMAP_MUX) && defined(CONFIG_ARCH_OMAP3)
 
 /**
  * omap_mux_init_gpio - initialize a signal based on the GPIO number
diff --git a/arch/arm/mach-omap2/omap_hwmod_34xx.h b/arch/arm/mach-omap2/omap_hwmod_34xx.h
index b6076b9c364e..2e629dcb2fb1 100644
--- a/arch/arm/mach-omap2/omap_hwmod_34xx.h
+++ b/arch/arm/mach-omap2/omap_hwmod_34xx.h
@@ -12,7 +12,7 @@
 #ifndef __ARCH_ARM_PLAT_OMAP_INCLUDE_MACH_OMAP_HWMOD34XX_H
 #define __ARCH_ARM_PLAT_OMAP_INCLUDE_MACH_OMAP_HWMOD34XX_H
 
-#ifdef CONFIG_ARCH_OMAP34XX
+#ifdef CONFIG_ARCH_OMAP3
 
 #include <plat/omap_hwmod.h>
 #include <mach/irqs.h>