aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-02-12 15:26:48 -0500
committerTony Lindgren <tony@atomide.com>2010-02-15 12:27:02 -0500
commita8eb7ca0cbb41c9cd379b8d2a2a5efb503aa65e9 (patch)
tree86901095aeb9e59815a6f95547cf68a9ec0b32e0
parent088ef950dc0dd58d2f339e1616c9092fea923f06 (diff)
omap3: Replace ARCH_OMAP34XX with ARCH_OMAP3
Replace ARCH_OMAP34XX with ARCH_OMAP3 Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat
-rw-r--r--arch/arm/mach-omap2/Kconfig37
-rw-r--r--arch/arm/mach-omap2/io.c4
-rw-r--r--arch/arm/mach-omap2/mcbsp.c2
-rw-r--r--arch/arm/mach-omap2/mux.c4
-rw-r--r--arch/arm/mach-omap2/mux.h2
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_34xx.h2
-rw-r--r--arch/arm/plat-omap/Kconfig5
-rw-r--r--arch/arm/plat-omap/common.c2
-rw-r--r--arch/arm/plat-omap/gpio.c58
-rw-r--r--arch/arm/plat-omap/i2c.c8
-rw-r--r--arch/arm/plat-omap/include/plat/cpu.h8
-rw-r--r--arch/arm/plat-omap/include/plat/io.h2
-rw-r--r--arch/arm/plat-omap/include/plat/mcbsp.h8
-rw-r--r--arch/arm/plat-omap/include/plat/omap34xx.h6
-rw-r--r--arch/arm/plat-omap/mcbsp.c6
-rw-r--r--arch/arm/plat-omap/sram.c2
-rw-r--r--drivers/net/smc911x.h2
-rw-r--r--drivers/spi/Kconfig2
-rw-r--r--drivers/spi/omap2_mcspi.c2
-rw-r--r--drivers/usb/Kconfig2
-rw-r--r--drivers/usb/host/ehci-hcd.c2
-rw-r--r--drivers/usb/musb/Kconfig6
-rw-r--r--drivers/usb/musb/musb_core.c2
-rw-r--r--drivers/usb/musb/musb_core.h2
-rw-r--r--drivers/w1/masters/Kconfig2
-rw-r--r--drivers/watchdog/Kconfig2
-rw-r--r--sound/soc/omap/omap-mcbsp.c6
-rw-r--r--sound/soc/omap/omap-mcbsp.h2
28 files changed, 92 insertions, 96 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
11 bool "OMAP2430 support" 11 bool "OMAP2430 support"
12 depends on ARCH_OMAP2 12 depends on ARCH_OMAP2
13 13
14config ARCH_OMAP34XX
15 bool "OMAP34xx Based System"
16 depends on ARCH_OMAP3
17 select USB_ARCH_HAS_EHCI
18
19config ARCH_OMAP3430 14config ARCH_OMAP3430
20 bool "OMAP3430 support" 15 bool "OMAP3430 support"
21 depends on ARCH_OMAP3 && ARCH_OMAP34XX 16 depends on ARCH_OMAP3
22 select ARCH_OMAP_OTG 17 select ARCH_OMAP_OTG
23 18
24config OMAP_PACKAGE_CBC 19config OMAP_PACKAGE_CBC
@@ -60,42 +55,42 @@ config MACH_OMAP_2430SDP
60 55
61config MACH_OMAP3_BEAGLE 56config MACH_OMAP3_BEAGLE
62 bool "OMAP3 BEAGLE board" 57 bool "OMAP3 BEAGLE board"
63 depends on ARCH_OMAP3 && ARCH_OMAP34XX 58 depends on ARCH_OMAP3
64 select OMAP_PACKAGE_CBB 59 select OMAP_PACKAGE_CBB
65 60
66config MACH_OMAP_LDP 61config MACH_OMAP_LDP
67 bool "OMAP3 LDP board" 62 bool "OMAP3 LDP board"
68 depends on ARCH_OMAP3 && ARCH_OMAP34XX 63 depends on ARCH_OMAP3
69 select OMAP_PACKAGE_CBB 64 select OMAP_PACKAGE_CBB
70 65
71config MACH_OVERO 66config MACH_OVERO
72 bool "Gumstix Overo board" 67 bool "Gumstix Overo board"
73 depends on ARCH_OMAP3 && ARCH_OMAP34XX 68 depends on ARCH_OMAP3
74 select OMAP_PACKAGE_CBB 69 select OMAP_PACKAGE_CBB
75 70
76config MACH_OMAP3EVM 71config MACH_OMAP3EVM
77 bool "OMAP 3530 EVM board" 72 bool "OMAP 3530 EVM board"
78 depends on ARCH_OMAP3 && ARCH_OMAP34XX 73 depends on ARCH_OMAP3
79 select OMAP_PACKAGE_CBB 74 select OMAP_PACKAGE_CBB
80 75
81config MACH_OMAP3517EVM 76config MACH_OMAP3517EVM
82 bool "OMAP3517/ AM3517 EVM board" 77 bool "OMAP3517/ AM3517 EVM board"
83 depends on ARCH_OMAP3 && ARCH_OMAP34XX 78 depends on ARCH_OMAP3
84 select OMAP_PACKAGE_CBB 79 select OMAP_PACKAGE_CBB
85 80
86config MACH_OMAP3_PANDORA 81config MACH_OMAP3_PANDORA
87 bool "OMAP3 Pandora" 82 bool "OMAP3 Pandora"
88 depends on ARCH_OMAP3 && ARCH_OMAP34XX 83 depends on ARCH_OMAP3
89 select OMAP_PACKAGE_CBB 84 select OMAP_PACKAGE_CBB
90 85
91config MACH_OMAP3_TOUCHBOOK 86config MACH_OMAP3_TOUCHBOOK
92 bool "OMAP3 Touch Book" 87 bool "OMAP3 Touch Book"
93 depends on ARCH_OMAP3 && ARCH_OMAP34XX 88 depends on ARCH_OMAP3
94 select BACKLIGHT_CLASS_DEVICE 89 select BACKLIGHT_CLASS_DEVICE
95 90
96config MACH_OMAP_3430SDP 91config MACH_OMAP_3430SDP
97 bool "OMAP 3430 SDP board" 92 bool "OMAP 3430 SDP board"
98 depends on ARCH_OMAP3 && ARCH_OMAP34XX 93 depends on ARCH_OMAP3
99 select OMAP_PACKAGE_CBB 94 select OMAP_PACKAGE_CBB
100 95
101config MACH_NOKIA_N800 96config MACH_NOKIA_N800
@@ -116,33 +111,33 @@ config MACH_NOKIA_N8X0
116 111
117config MACH_NOKIA_RX51 112config MACH_NOKIA_RX51
118 bool "Nokia RX-51 board" 113 bool "Nokia RX-51 board"
119 depends on ARCH_OMAP3 && ARCH_OMAP34XX 114 depends on ARCH_OMAP3
120 select OMAP_PACKAGE_CBB 115 select OMAP_PACKAGE_CBB
121 116
122config MACH_OMAP_ZOOM2 117config MACH_OMAP_ZOOM2
123 bool "OMAP3 Zoom2 board" 118 bool "OMAP3 Zoom2 board"
124 depends on ARCH_OMAP3 && ARCH_OMAP34XX 119 depends on ARCH_OMAP3
125 select OMAP_PACKAGE_CBB 120 select OMAP_PACKAGE_CBB
126 121
127config MACH_OMAP_ZOOM3 122config MACH_OMAP_ZOOM3
128 bool "OMAP3630 Zoom3 board" 123 bool "OMAP3630 Zoom3 board"
129 depends on ARCH_OMAP3 && ARCH_OMAP34XX 124 depends on ARCH_OMAP3
130 select OMAP_PACKAGE_CBP 125 select OMAP_PACKAGE_CBP
131 126
132config MACH_CM_T35 127config MACH_CM_T35
133 bool "CompuLab CM-T35 module" 128 bool "CompuLab CM-T35 module"
134 depends on ARCH_OMAP3 && ARCH_OMAP34XX 129 depends on ARCH_OMAP3
135 select OMAP_PACKAGE_CUS 130 select OMAP_PACKAGE_CUS
136 select OMAP_MUX 131 select OMAP_MUX
137 132
138config MACH_IGEP0020 133config MACH_IGEP0020
139 bool "IGEP0020" 134 bool "IGEP0020"
140 depends on ARCH_OMAP3 && ARCH_OMAP34XX 135 depends on ARCH_OMAP3
141 select OMAP_PACKAGE_CBB 136 select OMAP_PACKAGE_CBB
142 137
143config MACH_OMAP_3630SDP 138config MACH_OMAP_3630SDP
144 bool "OMAP3630 SDP board" 139 bool "OMAP3630 SDP board"
145 depends on ARCH_OMAP3 && ARCH_OMAP34XX 140 depends on ARCH_OMAP3
146 select OMAP_PACKAGE_CBP 141 select OMAP_PACKAGE_CBP
147 142
148config MACH_OMAP_4430SDP 143config MACH_OMAP_4430SDP
@@ -158,7 +153,7 @@ config OMAP3_EMU
158 153
159config OMAP3_SDRC_AC_TIMING 154config OMAP3_SDRC_AC_TIMING
160 bool "Enable SDRC AC timing register changes" 155 bool "Enable SDRC AC timing register changes"
161 depends on ARCH_OMAP3 && ARCH_OMAP34XX 156 depends on ARCH_OMAP3
162 default n 157 default n
163 help 158 help
164 If you know that none of your system initiators will attempt to 159 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 = {
125#endif 125#endif
126#endif 126#endif
127 127
128#ifdef CONFIG_ARCH_OMAP34XX 128#ifdef CONFIG_ARCH_OMAP3
129static struct map_desc omap34xx_io_desc[] __initdata = { 129static struct map_desc omap34xx_io_desc[] __initdata = {
130 { 130 {
131 .virtual = L3_34XX_VIRT, 131 .virtual = L3_34XX_VIRT,
@@ -269,7 +269,7 @@ void __init omap243x_map_common_io()
269} 269}
270#endif 270#endif
271 271
272#ifdef CONFIG_ARCH_OMAP34XX 272#ifdef CONFIG_ARCH_OMAP3
273void __init omap34xx_map_common_io() 273void __init omap34xx_map_common_io()
274{ 274{
275 iotable_init(omap34xx_io_desc, ARRAY_SIZE(omap34xx_io_desc)); 275 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[] = {
119#define OMAP2430_MCBSP_PDATA_SZ 0 119#define OMAP2430_MCBSP_PDATA_SZ 0
120#endif 120#endif
121 121
122#ifdef CONFIG_ARCH_OMAP34XX 122#ifdef CONFIG_ARCH_OMAP3
123static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = { 123static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {
124 { 124 {
125 .phys_base = OMAP34XX_MCBSP1_BASE, 125 .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)
369 369
370/*----------------------------------------------------------------------------*/ 370/*----------------------------------------------------------------------------*/
371 371
372#ifdef CONFIG_ARCH_OMAP34XX 372#ifdef CONFIG_ARCH_OMAP3
373static LIST_HEAD(muxmodes); 373static LIST_HEAD(muxmodes);
374static DEFINE_MUTEX(muxmode_mutex); 374static DEFINE_MUTEX(muxmode_mutex);
375 375
@@ -1018,5 +1018,5 @@ int __init omap_mux_init(u32 mux_pbase, u32 mux_size,
1018 return 0; 1018 return 0;
1019} 1019}
1020 1020
1021#endif /* CONFIG_ARCH_OMAP34XX */ 1021#endif /* CONFIG_ARCH_OMAP3 */
1022 1022
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 {
102 u16 value; 102 u16 value;
103}; 103};
104 104
105#if defined(CONFIG_OMAP_MUX) && defined(CONFIG_ARCH_OMAP34XX) 105#if defined(CONFIG_OMAP_MUX) && defined(CONFIG_ARCH_OMAP3)
106 106
107/** 107/**
108 * omap_mux_init_gpio - initialize a signal based on the GPIO number 108 * 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 @@
12#ifndef __ARCH_ARM_PLAT_OMAP_INCLUDE_MACH_OMAP_HWMOD34XX_H 12#ifndef __ARCH_ARM_PLAT_OMAP_INCLUDE_MACH_OMAP_HWMOD34XX_H
13#define __ARCH_ARM_PLAT_OMAP_INCLUDE_MACH_OMAP_HWMOD34XX_H 13#define __ARCH_ARM_PLAT_OMAP_INCLUDE_MACH_OMAP_HWMOD34XX_H
14 14
15#ifdef CONFIG_ARCH_OMAP34XX 15#ifdef CONFIG_ARCH_OMAP3
16 16
17#include <plat/omap_hwmod.h> 17#include <plat/omap_hwmod.h>
18#include <mach/irqs.h> 18#include <mach/irqs.h>
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index df497fc33f2b..1e223924da8a 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -30,6 +30,7 @@ config ARCH_OMAP3
30 bool "TI OMAP3" 30 bool "TI OMAP3"
31 depends on ARCH_OMAP2PLUS 31 depends on ARCH_OMAP2PLUS
32 select CPU_V7 32 select CPU_V7
33 select USB_ARCH_HAS_EHCI
33 34
34config ARCH_OMAP4 35config ARCH_OMAP4
35 bool "TI OMAP4" 36 bool "TI OMAP4"
@@ -124,7 +125,7 @@ config OMAP_MPU_TIMER
124 125
125config OMAP_32K_TIMER 126config OMAP_32K_TIMER
126 bool "Use 32KHz timer" 127 bool "Use 32KHz timer"
127 depends on ARCH_OMAP16XX || ARCH_OMAP2 || ARCH_OMAP34XX || ARCH_OMAP4 128 depends on ARCH_OMAP16XX || ARCH_OMAP2 || ARCH_OMAP3 || ARCH_OMAP4
128 help 129 help
129 Select this option if you want to enable the OMAP 32KHz timer. 130 Select this option if you want to enable the OMAP 32KHz timer.
130 This timer saves power compared to the OMAP_MPU_TIMER, and has 131 This timer saves power compared to the OMAP_MPU_TIMER, and has
@@ -145,7 +146,7 @@ config OMAP_32K_TIMER_HZ
145 146
146config OMAP_DM_TIMER 147config OMAP_DM_TIMER
147 bool "Use dual-mode timer" 148 bool "Use dual-mode timer"
148 depends on ARCH_OMAP16XX || ARCH_OMAP2 || ARCH_OMAP34XX || ARCH_OMAP4 149 depends on ARCH_OMAP16XX || ARCH_OMAP2 || ARCH_OMAP3 || ARCH_OMAP4
149 help 150 help
150 Select this option if you want to use OMAP Dual-Mode timers. 151 Select this option if you want to use OMAP Dual-Mode timers.
151 152
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c
index 7cbc0a214aab..4f29e8c0f539 100644
--- a/arch/arm/plat-omap/common.c
+++ b/arch/arm/plat-omap/common.c
@@ -127,7 +127,7 @@ static cycle_t omap2430_32k_read(struct clocksource *cs)
127#define omap2430_32k_read NULL 127#define omap2430_32k_read NULL
128#endif 128#endif
129 129
130#ifdef CONFIG_ARCH_OMAP34XX 130#ifdef CONFIG_ARCH_OMAP3
131static cycle_t omap34xx_32k_read(struct clocksource *cs) 131static cycle_t omap34xx_32k_read(struct clocksource *cs)
132{ 132{
133 return omap_readl(OMAP3430_32KSYNCT_BASE + 0x10); 133 return omap_readl(OMAP3430_32KSYNCT_BASE + 0x10);
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index 0fb0e58fec93..9608019fd6e4 100644
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -178,11 +178,11 @@ struct gpio_bank {
178 u16 virtual_irq_start; 178 u16 virtual_irq_start;
179 int method; 179 int method;
180#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2) || \ 180#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2) || \
181 defined(CONFIG_ARCH_OMAP34XX) || defined(CONFIG_ARCH_OMAP4) 181 defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
182 u32 suspend_wakeup; 182 u32 suspend_wakeup;
183 u32 saved_wakeup; 183 u32 saved_wakeup;
184#endif 184#endif
185#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) || \ 185#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \
186 defined(CONFIG_ARCH_OMAP4) 186 defined(CONFIG_ARCH_OMAP4)
187 u32 non_wakeup_gpios; 187 u32 non_wakeup_gpios;
188 u32 enabled_non_wakeup_gpios; 188 u32 enabled_non_wakeup_gpios;
@@ -276,7 +276,7 @@ static struct gpio_bank gpio_bank_243x[5] = {
276 276
277#endif 277#endif
278 278
279#ifdef CONFIG_ARCH_OMAP34XX 279#ifdef CONFIG_ARCH_OMAP3
280static struct gpio_bank gpio_bank_34xx[6] = { 280static struct gpio_bank gpio_bank_34xx[6] = {
281 { OMAP34XX_GPIO1_BASE, NULL, INT_34XX_GPIO_BANK1, IH_GPIO_BASE, 281 { OMAP34XX_GPIO1_BASE, NULL, INT_34XX_GPIO_BANK1, IH_GPIO_BASE,
282 METHOD_GPIO_24XX }, 282 METHOD_GPIO_24XX },
@@ -426,7 +426,7 @@ static void _set_gpio_direction(struct gpio_bank *bank, int gpio, int is_input)
426 reg += OMAP7XX_GPIO_DIR_CONTROL; 426 reg += OMAP7XX_GPIO_DIR_CONTROL;
427 break; 427 break;
428#endif 428#endif
429#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) 429#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
430 case METHOD_GPIO_24XX: 430 case METHOD_GPIO_24XX:
431 reg += OMAP24XX_GPIO_OE; 431 reg += OMAP24XX_GPIO_OE;
432 break; 432 break;
@@ -493,7 +493,7 @@ static void _set_gpio_dataout(struct gpio_bank *bank, int gpio, int enable)
493 l &= ~(1 << gpio); 493 l &= ~(1 << gpio);
494 break; 494 break;
495#endif 495#endif
496#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) 496#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
497 case METHOD_GPIO_24XX: 497 case METHOD_GPIO_24XX:
498 if (enable) 498 if (enable)
499 reg += OMAP24XX_GPIO_SETDATAOUT; 499 reg += OMAP24XX_GPIO_SETDATAOUT;
@@ -546,7 +546,7 @@ static int _get_gpio_datain(struct gpio_bank *bank, int gpio)
546 reg += OMAP7XX_GPIO_DATA_INPUT; 546 reg += OMAP7XX_GPIO_DATA_INPUT;
547 break; 547 break;
548#endif 548#endif
549#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) 549#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
550 case METHOD_GPIO_24XX: 550 case METHOD_GPIO_24XX:
551 reg += OMAP24XX_GPIO_DATAIN; 551 reg += OMAP24XX_GPIO_DATAIN;
552 break; 552 break;
@@ -592,7 +592,7 @@ static int _get_gpio_dataout(struct gpio_bank *bank, int gpio)
592 reg += OMAP7XX_GPIO_DATA_OUTPUT; 592 reg += OMAP7XX_GPIO_DATA_OUTPUT;
593 break; 593 break;
594#endif 594#endif
595#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) || \ 595#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \
596 defined(CONFIG_ARCH_OMAP4) 596 defined(CONFIG_ARCH_OMAP4)
597 case METHOD_GPIO_24XX: 597 case METHOD_GPIO_24XX:
598 reg += OMAP24XX_GPIO_DATAOUT; 598 reg += OMAP24XX_GPIO_DATAOUT;
@@ -684,7 +684,7 @@ void omap_set_gpio_debounce_time(int gpio, int enc_time)
684} 684}
685EXPORT_SYMBOL(omap_set_gpio_debounce_time); 685EXPORT_SYMBOL(omap_set_gpio_debounce_time);
686 686
687#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) || \ 687#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \
688 defined(CONFIG_ARCH_OMAP4) 688 defined(CONFIG_ARCH_OMAP4)
689static inline void set_24xx_gpio_triggering(struct gpio_bank *bank, int gpio, 689static inline void set_24xx_gpio_triggering(struct gpio_bank *bank, int gpio,
690 int trigger) 690 int trigger)
@@ -856,7 +856,7 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger)
856 goto bad; 856 goto bad;
857 break; 857 break;
858#endif 858#endif
859#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) || \ 859#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \
860 defined(CONFIG_ARCH_OMAP4) 860 defined(CONFIG_ARCH_OMAP4)
861 case METHOD_GPIO_24XX: 861 case METHOD_GPIO_24XX:
862 set_24xx_gpio_triggering(bank, gpio, trigger); 862 set_24xx_gpio_triggering(bank, gpio, trigger);
@@ -937,7 +937,7 @@ static void _clear_gpio_irqbank(struct gpio_bank *bank, int gpio_mask)
937 reg += OMAP7XX_GPIO_INT_STATUS; 937 reg += OMAP7XX_GPIO_INT_STATUS;
938 break; 938 break;
939#endif 939#endif
940#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) 940#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
941 case METHOD_GPIO_24XX: 941 case METHOD_GPIO_24XX:
942 reg += OMAP24XX_GPIO_IRQSTATUS1; 942 reg += OMAP24XX_GPIO_IRQSTATUS1;
943 break; 943 break;
@@ -954,7 +954,7 @@ static void _clear_gpio_irqbank(struct gpio_bank *bank, int gpio_mask)
954 __raw_writel(gpio_mask, reg); 954 __raw_writel(gpio_mask, reg);
955 955
956 /* Workaround for clearing DSP GPIO interrupts to allow retention */ 956 /* Workaround for clearing DSP GPIO interrupts to allow retention */
957#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) 957#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
958 reg = bank->base + OMAP24XX_GPIO_IRQSTATUS2; 958 reg = bank->base + OMAP24XX_GPIO_IRQSTATUS2;
959#endif 959#endif
960#if defined(CONFIG_ARCH_OMAP4) 960#if defined(CONFIG_ARCH_OMAP4)
@@ -1008,7 +1008,7 @@ static u32 _get_gpio_irqbank_mask(struct gpio_bank *bank)
1008 inv = 1; 1008 inv = 1;
1009 break; 1009 break;
1010#endif 1010#endif
1011#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) 1011#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
1012 case METHOD_GPIO_24XX: 1012 case METHOD_GPIO_24XX:
1013 reg += OMAP24XX_GPIO_IRQENABLE1; 1013 reg += OMAP24XX_GPIO_IRQENABLE1;
1014 mask = 0xffffffff; 1014 mask = 0xffffffff;
@@ -1077,7 +1077,7 @@ static void _enable_gpio_irqbank(struct gpio_bank *bank, int gpio_mask, int enab
1077 l |= gpio_mask; 1077 l |= gpio_mask;
1078 break; 1078 break;
1079#endif 1079#endif
1080#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) 1080#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
1081 case METHOD_GPIO_24XX: 1081 case METHOD_GPIO_24XX:
1082 if (enable) 1082 if (enable)
1083 reg += OMAP24XX_GPIO_SETIRQENABLE1; 1083 reg += OMAP24XX_GPIO_SETIRQENABLE1;
@@ -1131,7 +1131,7 @@ static int _set_gpio_wakeup(struct gpio_bank *bank, int gpio, int enable)
1131 spin_unlock_irqrestore(&bank->lock, flags); 1131 spin_unlock_irqrestore(&bank->lock, flags);
1132 return 0; 1132 return 0;
1133#endif 1133#endif
1134#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) || \ 1134#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \
1135 defined(CONFIG_ARCH_OMAP4) 1135 defined(CONFIG_ARCH_OMAP4)
1136 case METHOD_GPIO_24XX: 1136 case METHOD_GPIO_24XX:
1137 if (bank->non_wakeup_gpios & (1 << gpio)) { 1137 if (bank->non_wakeup_gpios & (1 << gpio)) {
@@ -1227,7 +1227,7 @@ static void omap_gpio_free(struct gpio_chip *chip, unsigned offset)
1227 __raw_writel(1 << offset, reg); 1227 __raw_writel(1 << offset, reg);
1228 } 1228 }
1229#endif 1229#endif
1230#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) || \ 1230#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \
1231 defined(CONFIG_ARCH_OMAP4) 1231 defined(CONFIG_ARCH_OMAP4)
1232 if (bank->method == METHOD_GPIO_24XX) { 1232 if (bank->method == METHOD_GPIO_24XX) {
1233 /* Disable wake-up during idle for dynamic tick */ 1233 /* Disable wake-up during idle for dynamic tick */
@@ -1286,7 +1286,7 @@ static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
1286 if (bank->method == METHOD_GPIO_7XX) 1286 if (bank->method == METHOD_GPIO_7XX)
1287 isr_reg = bank->base + OMAP7XX_GPIO_INT_STATUS; 1287 isr_reg = bank->base + OMAP7XX_GPIO_INT_STATUS;
1288#endif 1288#endif
1289#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) 1289#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
1290 if (bank->method == METHOD_GPIO_24XX) 1290 if (bank->method == METHOD_GPIO_24XX)
1291 isr_reg = bank->base + OMAP24XX_GPIO_IRQSTATUS1; 1291 isr_reg = bank->base + OMAP24XX_GPIO_IRQSTATUS1;
1292#endif 1292#endif
@@ -1766,7 +1766,7 @@ static int __init _omap_gpio_init(void)
1766 gpio_bank = gpio_bank_243x; 1766 gpio_bank = gpio_bank_243x;
1767 } 1767 }
1768#endif 1768#endif
1769#ifdef CONFIG_ARCH_OMAP34XX 1769#ifdef CONFIG_ARCH_OMAP3
1770 if (cpu_is_omap34xx()) { 1770 if (cpu_is_omap34xx()) {
1771 gpio_bank_count = OMAP34XX_NR_GPIOS; 1771 gpio_bank_count = OMAP34XX_NR_GPIOS;
1772 gpio_bank = gpio_bank_34xx; 1772 gpio_bank = gpio_bank_34xx;
@@ -1809,7 +1809,7 @@ static int __init _omap_gpio_init(void)
1809 gpio_count = 32; /* 7xx has 32-bit GPIOs */ 1809 gpio_count = 32; /* 7xx has 32-bit GPIOs */
1810 } 1810 }
1811 1811
1812#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) || \ 1812#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \
1813 defined(CONFIG_ARCH_OMAP4) 1813 defined(CONFIG_ARCH_OMAP4)
1814 if (bank->method == METHOD_GPIO_24XX) { 1814 if (bank->method == METHOD_GPIO_24XX) {
1815 static const u32 non_wakeup_gpios[] = { 1815 static const u32 non_wakeup_gpios[] = {
@@ -1904,7 +1904,7 @@ static int __init _omap_gpio_init(void)
1904} 1904}
1905 1905
1906#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2) || \ 1906#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2) || \
1907 defined(CONFIG_ARCH_OMAP34XX) || defined(CONFIG_ARCH_OMAP4) 1907 defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
1908static int omap_gpio_suspend(struct sys_device *dev, pm_message_t mesg) 1908static int omap_gpio_suspend(struct sys_device *dev, pm_message_t mesg)
1909{ 1909{
1910 int i; 1910 int i;
@@ -1927,7 +1927,7 @@ static int omap_gpio_suspend(struct sys_device *dev, pm_message_t mesg)
1927 wake_set = bank->base + OMAP1610_GPIO_SET_WAKEUPENA; 1927 wake_set = bank->base + OMAP1610_GPIO_SET_WAKEUPENA;
1928 break; 1928 break;
1929#endif 1929#endif
1930#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) 1930#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
1931 case METHOD_GPIO_24XX: 1931 case METHOD_GPIO_24XX:
1932 wake_status = bank->base + OMAP24XX_GPIO_WAKE_EN; 1932 wake_status = bank->base + OMAP24XX_GPIO_WAKE_EN;
1933 wake_clear = bank->base + OMAP24XX_GPIO_CLEARWKUENA; 1933 wake_clear = bank->base + OMAP24XX_GPIO_CLEARWKUENA;
@@ -1975,7 +1975,7 @@ static int omap_gpio_resume(struct sys_device *dev)
1975 wake_set = bank->base + OMAP1610_GPIO_SET_WAKEUPENA; 1975 wake_set = bank->base + OMAP1610_GPIO_SET_WAKEUPENA;
1976 break; 1976 break;
1977#endif 1977#endif
1978#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) 1978#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
1979 case METHOD_GPIO_24XX: 1979 case METHOD_GPIO_24XX:
1980 wake_clear = bank->base + OMAP24XX_GPIO_CLEARWKUENA; 1980 wake_clear = bank->base + OMAP24XX_GPIO_CLEARWKUENA;
1981 wake_set = bank->base + OMAP24XX_GPIO_SETWKUENA; 1981 wake_set = bank->base + OMAP24XX_GPIO_SETWKUENA;
@@ -2013,7 +2013,7 @@ static struct sys_device omap_gpio_device = {
2013 2013
2014#endif 2014#endif
2015 2015
2016#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) || \ 2016#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \
2017 defined(CONFIG_ARCH_OMAP4) 2017 defined(CONFIG_ARCH_OMAP4)
2018 2018
2019static int workaround_enabled; 2019static int workaround_enabled;
@@ -2030,7 +2030,7 @@ void omap2_gpio_prepare_for_retention(void)
2030 2030
2031 if (!(bank->enabled_non_wakeup_gpios)) 2031 if (!(bank->enabled_non_wakeup_gpios))
2032 continue; 2032 continue;
2033#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) 2033#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
2034 bank->saved_datain = __raw_readl(bank->base + OMAP24XX_GPIO_DATAIN); 2034 bank->saved_datain = __raw_readl(bank->base + OMAP24XX_GPIO_DATAIN);
2035 l1 = __raw_readl(bank->base + OMAP24XX_GPIO_FALLINGDETECT); 2035 l1 = __raw_readl(bank->base + OMAP24XX_GPIO_FALLINGDETECT);
2036 l2 = __raw_readl(bank->base + OMAP24XX_GPIO_RISINGDETECT); 2036 l2 = __raw_readl(bank->base + OMAP24XX_GPIO_RISINGDETECT);
@@ -2045,7 +2045,7 @@ void omap2_gpio_prepare_for_retention(void)
2045 bank->saved_risingdetect = l2; 2045 bank->saved_risingdetect = l2;
2046 l1 &= ~bank->enabled_non_wakeup_gpios; 2046 l1 &= ~bank->enabled_non_wakeup_gpios;
2047 l2 &= ~bank->enabled_non_wakeup_gpios; 2047 l2 &= ~bank->enabled_non_wakeup_gpios;
2048#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) 2048#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
2049 __raw_writel(l1, bank->base + OMAP24XX_GPIO_FALLINGDETECT); 2049 __raw_writel(l1, bank->base + OMAP24XX_GPIO_FALLINGDETECT);
2050 __raw_writel(l2, bank->base + OMAP24XX_GPIO_RISINGDETECT); 2050 __raw_writel(l2, bank->base + OMAP24XX_GPIO_RISINGDETECT);
2051#endif 2051#endif
@@ -2074,7 +2074,7 @@ void omap2_gpio_resume_after_retention(void)
2074 2074
2075 if (!(bank->enabled_non_wakeup_gpios)) 2075 if (!(bank->enabled_non_wakeup_gpios))
2076 continue; 2076 continue;
2077#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) 2077#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
2078 __raw_writel(bank->saved_fallingdetect, 2078 __raw_writel(bank->saved_fallingdetect,
2079 bank->base + OMAP24XX_GPIO_FALLINGDETECT); 2079 bank->base + OMAP24XX_GPIO_FALLINGDETECT);
2080 __raw_writel(bank->saved_risingdetect, 2080 __raw_writel(bank->saved_risingdetect,
@@ -2113,7 +2113,7 @@ void omap2_gpio_resume_after_retention(void)
2113 2113
2114 if (gen) { 2114 if (gen) {
2115 u32 old0, old1; 2115 u32 old0, old1;
2116#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) 2116#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
2117 old0 = __raw_readl(bank->base + OMAP24XX_GPIO_LEVELDETECT0); 2117 old0 = __raw_readl(bank->base + OMAP24XX_GPIO_LEVELDETECT0);
2118 old1 = __raw_readl(bank->base + OMAP24XX_GPIO_LEVELDETECT1); 2118 old1 = __raw_readl(bank->base + OMAP24XX_GPIO_LEVELDETECT1);
2119 __raw_writel(old0 | gen, bank->base + 2119 __raw_writel(old0 | gen, bank->base +
@@ -2144,7 +2144,7 @@ void omap2_gpio_resume_after_retention(void)
2144 2144
2145#endif 2145#endif
2146 2146
2147#ifdef CONFIG_ARCH_OMAP34XX 2147#ifdef CONFIG_ARCH_OMAP3
2148/* save the registers of bank 2-6 */ 2148/* save the registers of bank 2-6 */
2149void omap_gpio_save_context(void) 2149void omap_gpio_save_context(void)
2150{ 2150{
@@ -2241,7 +2241,7 @@ static int __init omap_gpio_sysinit(void)
2241 mpuio_init(); 2241 mpuio_init();
2242 2242
2243#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2) || \ 2243#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2) || \
2244 defined(CONFIG_ARCH_OMAP34XX) || defined(CONFIG_ARCH_OMAP4) 2244 defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
2245 if (cpu_is_omap16xx() || cpu_class_is_omap2()) { 2245 if (cpu_is_omap16xx() || cpu_class_is_omap2()) {
2246 if (ret == 0) { 2246 if (ret == 0) {
2247 ret = sysdev_class_register(&omap_gpio_sysclass); 2247 ret = sysdev_class_register(&omap_gpio_sysclass);
@@ -2301,7 +2301,7 @@ static int dbg_gpio_show(struct seq_file *s, void *unused)
2301 2301
2302 irqstat = irq_desc[irq].status; 2302 irqstat = irq_desc[irq].status;
2303#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2) || \ 2303#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2) || \
2304 defined(CONFIG_ARCH_OMAP34XX) || defined(CONFIG_ARCH_OMAP4) 2304 defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
2305 if (is_in && ((bank->suspend_wakeup & mask) 2305 if (is_in && ((bank->suspend_wakeup & mask)
2306 || irqstat & IRQ_TYPE_SENSE_MASK)) { 2306 || irqstat & IRQ_TYPE_SENSE_MASK)) {
2307 char *trigger = NULL; 2307 char *trigger = NULL;
diff --git a/arch/arm/plat-omap/i2c.c b/arch/arm/plat-omap/i2c.c
index 7773bceca442..96d2781ac4f5 100644
--- a/arch/arm/plat-omap/i2c.c
+++ b/arch/arm/plat-omap/i2c.c
@@ -50,10 +50,10 @@ static const char name[] = "i2c_omap";
50 50
51static struct resource i2c_resources[][2] = { 51static struct resource i2c_resources[][2] = {
52 { I2C_RESOURCE_BUILDER(0, 0) }, 52 { I2C_RESOURCE_BUILDER(0, 0) },
53#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) 53#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
54 { I2C_RESOURCE_BUILDER(OMAP2_I2C_BASE2, INT_24XX_I2C2_IRQ) }, 54 { I2C_RESOURCE_BUILDER(OMAP2_I2C_BASE2, INT_24XX_I2C2_IRQ) },
55#endif 55#endif
56#if defined(CONFIG_ARCH_OMAP34XX) 56#if defined(CONFIG_ARCH_OMAP3)
57 { I2C_RESOURCE_BUILDER(OMAP2_I2C_BASE3, INT_34XX_I2C3_IRQ) }, 57 { I2C_RESOURCE_BUILDER(OMAP2_I2C_BASE3, INT_34XX_I2C3_IRQ) },
58#endif 58#endif
59}; 59};
@@ -72,10 +72,10 @@ static struct resource i2c_resources[][2] = {
72static u32 i2c_rate[ARRAY_SIZE(i2c_resources)]; 72static u32 i2c_rate[ARRAY_SIZE(i2c_resources)];
73static struct platform_device omap_i2c_devices[] = { 73static struct platform_device omap_i2c_devices[] = {
74 I2C_DEV_BUILDER(1, i2c_resources[0], &i2c_rate[0]), 74 I2C_DEV_BUILDER(1, i2c_resources[0], &i2c_rate[0]),
75#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) 75#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
76 I2C_DEV_BUILDER(2, i2c_resources[1], &i2c_rate[1]), 76 I2C_DEV_BUILDER(2, i2c_resources[1], &i2c_rate[1]),
77#endif 77#endif
78#if defined(CONFIG_ARCH_OMAP34XX) 78#if defined(CONFIG_ARCH_OMAP3)
79 I2C_DEV_BUILDER(3, i2c_resources[2], &i2c_rate[2]), 79 I2C_DEV_BUILDER(3, i2c_resources[2], &i2c_rate[2]),
80#endif 80#endif
81}; 81};
diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
index 527aaae61720..995466d0432a 100644
--- a/arch/arm/plat-omap/include/plat/cpu.h
+++ b/arch/arm/plat-omap/include/plat/cpu.h
@@ -114,7 +114,7 @@ unsigned int omap_rev(void);
114# define OMAP_NAME omap16xx 114# define OMAP_NAME omap16xx
115# endif 115# endif
116#endif 116#endif
117#if (defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX)) 117#if (defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3))
118# if (defined(OMAP_NAME) || defined(MULTI_OMAP1)) 118# if (defined(OMAP_NAME) || defined(MULTI_OMAP1))
119# error "OMAP1 and OMAP2 can't be selected at the same time" 119# error "OMAP1 and OMAP2 can't be selected at the same time"
120# endif 120# endif
@@ -241,7 +241,7 @@ IS_OMAP_SUBCLASS(443x, 0x443)
241# define cpu_is_omap242x() is_omap242x() 241# define cpu_is_omap242x() is_omap242x()
242# define cpu_is_omap243x() is_omap243x() 242# define cpu_is_omap243x() is_omap243x()
243# endif 243# endif
244# if defined(CONFIG_ARCH_OMAP34XX) 244# if defined(CONFIG_ARCH_OMAP3)
245# undef cpu_is_omap34xx 245# undef cpu_is_omap34xx
246# undef cpu_is_omap343x 246# undef cpu_is_omap343x
247# define cpu_is_omap34xx() is_omap34xx() 247# define cpu_is_omap34xx() is_omap34xx()
@@ -260,7 +260,7 @@ IS_OMAP_SUBCLASS(443x, 0x443)
260# undef cpu_is_omap243x 260# undef cpu_is_omap243x
261# define cpu_is_omap243x() 1 261# define cpu_is_omap243x() 1
262# endif 262# endif
263# if defined(CONFIG_ARCH_OMAP34XX) 263# if defined(CONFIG_ARCH_OMAP3)
264# undef cpu_is_omap34xx 264# undef cpu_is_omap34xx
265# define cpu_is_omap34xx() 1 265# define cpu_is_omap34xx() 1
266# endif 266# endif
@@ -385,7 +385,7 @@ IS_OMAP_TYPE(3517, 0x3517)
385# define cpu_is_omap2430() is_omap2430() 385# define cpu_is_omap2430() is_omap2430()
386#endif 386#endif
387 387
388#if defined(CONFIG_ARCH_OMAP34XX) 388#if defined(CONFIG_ARCH_OMAP3)
389# undef cpu_is_omap3430 389# undef cpu_is_omap3430
390# undef cpu_is_omap3503 390# undef cpu_is_omap3503
391# undef cpu_is_omap3515 391# undef cpu_is_omap3515
diff --git a/arch/arm/plat-omap/include/plat/io.h b/arch/arm/plat-omap/include/plat/io.h
index 19257bbbc9f3..eef914d53971 100644
--- a/arch/arm/plat-omap/include/plat/io.h
+++ b/arch/arm/plat-omap/include/plat/io.h
@@ -284,7 +284,7 @@ static inline void omap243x_map_common_io(void)
284} 284}
285#endif 285#endif
286 286
287#ifdef CONFIG_ARCH_OMAP34XX 287#ifdef CONFIG_ARCH_OMAP3
288extern void omap34xx_map_common_io(void); 288extern void omap34xx_map_common_io(void);
289#else 289#else
290static inline void omap34xx_map_common_io(void) 290static inline void omap34xx_map_common_io(void)
diff --git a/arch/arm/plat-omap/include/plat/mcbsp.h b/arch/arm/plat-omap/include/plat/mcbsp.h
index 951506277ec8..0d7e536a3c95 100644
--- a/arch/arm/plat-omap/include/plat/mcbsp.h
+++ b/arch/arm/plat-omap/include/plat/mcbsp.h
@@ -103,7 +103,7 @@
103#define AUDIO_DMA_TX OMAP_DMA_MCBSP1_TX 103#define AUDIO_DMA_TX OMAP_DMA_MCBSP1_TX
104#define AUDIO_DMA_RX OMAP_DMA_MCBSP1_RX 104#define AUDIO_DMA_RX OMAP_DMA_MCBSP1_RX
105 105
106#elif defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) || \ 106#elif defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) || \
107 defined(CONFIG_ARCH_OMAP4) 107 defined(CONFIG_ARCH_OMAP4)
108 108
109#define OMAP_MCBSP_REG_DRR2 0x00 109#define OMAP_MCBSP_REG_DRR2 0x00
@@ -374,7 +374,7 @@ struct omap_mcbsp_platform_data {
374 u8 dma_rx_sync, dma_tx_sync; 374 u8 dma_rx_sync, dma_tx_sync;
375 u16 rx_irq, tx_irq; 375 u16 rx_irq, tx_irq;
376 struct omap_mcbsp_ops *ops; 376 struct omap_mcbsp_ops *ops;
377#ifdef CONFIG_ARCH_OMAP34XX 377#ifdef CONFIG_ARCH_OMAP3
378 u16 buffer_size; 378 u16 buffer_size;
379#endif 379#endif
380}; 380};
@@ -410,7 +410,7 @@ struct omap_mcbsp {
410 struct omap_mcbsp_platform_data *pdata; 410 struct omap_mcbsp_platform_data *pdata;
411 struct clk *iclk; 411 struct clk *iclk;
412 struct clk *fclk; 412 struct clk *fclk;
413#ifdef CONFIG_ARCH_OMAP34XX 413#ifdef CONFIG_ARCH_OMAP3
414 int dma_op_mode; 414 int dma_op_mode;
415 u16 max_tx_thres; 415 u16 max_tx_thres;
416 u16 max_rx_thres; 416 u16 max_rx_thres;
@@ -423,7 +423,7 @@ int omap_mcbsp_init(void);
423void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config, 423void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config,
424 int size); 424 int size);
425void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg * config); 425void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg * config);
426#ifdef CONFIG_ARCH_OMAP34XX 426#ifdef CONFIG_ARCH_OMAP3
427void omap_mcbsp_set_tx_threshold(unsigned int id, u16 threshold); 427void omap_mcbsp_set_tx_threshold(unsigned int id, u16 threshold);
428void omap_mcbsp_set_rx_threshold(unsigned int id, u16 threshold); 428void omap_mcbsp_set_rx_threshold(unsigned int id, u16 threshold);
429u16 omap_mcbsp_get_max_tx_threshold(unsigned int id); 429u16 omap_mcbsp_get_max_tx_threshold(unsigned int id);
diff --git a/arch/arm/plat-omap/include/plat/omap34xx.h b/arch/arm/plat-omap/include/plat/omap34xx.h
index 077f05979f86..2845fdc658b0 100644
--- a/arch/arm/plat-omap/include/plat/omap34xx.h
+++ b/arch/arm/plat-omap/include/plat/omap34xx.h
@@ -21,8 +21,8 @@
21 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 21 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
22 */ 22 */
23 23
24#ifndef __ASM_ARCH_OMAP34XX_H 24#ifndef __ASM_ARCH_OMAP3_H
25#define __ASM_ARCH_OMAP34XX_H 25#define __ASM_ARCH_OMAP3_H
26 26
27/* 27/*
28 * Please place only base defines here and put the rest in device 28 * Please place only base defines here and put the rest in device
@@ -82,5 +82,5 @@
82 82
83#define OMAP34XX_MAILBOX_BASE (L4_34XX_BASE + 0x94000) 83#define OMAP34XX_MAILBOX_BASE (L4_34XX_BASE + 0x94000)
84 84
85#endif /* __ASM_ARCH_OMAP34XX_H */ 85#endif /* __ASM_ARCH_OMAP3_H */
86 86
diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c
index f75767278fc3..c1eb61529394 100644
--- a/arch/arm/plat-omap/mcbsp.c
+++ b/arch/arm/plat-omap/mcbsp.c
@@ -198,7 +198,7 @@ void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg *config)
198} 198}
199EXPORT_SYMBOL(omap_mcbsp_config); 199EXPORT_SYMBOL(omap_mcbsp_config);
200 200
201#ifdef CONFIG_ARCH_OMAP34XX 201#ifdef CONFIG_ARCH_OMAP3
202/* 202/*
203 * omap_mcbsp_set_tx_threshold configures how to deal 203 * omap_mcbsp_set_tx_threshold configures how to deal
204 * with transmit threshold. the threshold value and handler can be 204 * with transmit threshold. the threshold value and handler can be
@@ -1107,7 +1107,7 @@ void omap_mcbsp_set_spi_mode(unsigned int id,
1107} 1107}
1108EXPORT_SYMBOL(omap_mcbsp_set_spi_mode); 1108EXPORT_SYMBOL(omap_mcbsp_set_spi_mode);
1109 1109
1110#ifdef CONFIG_ARCH_OMAP34XX 1110#ifdef CONFIG_ARCH_OMAP3
1111#define max_thres(m) (mcbsp->pdata->buffer_size) 1111#define max_thres(m) (mcbsp->pdata->buffer_size)
1112#define valid_threshold(m, val) ((val) <= max_thres(m)) 1112#define valid_threshold(m, val) ((val) <= max_thres(m))
1113#define THRESHOLD_PROP_BUILDER(prop) \ 1113#define THRESHOLD_PROP_BUILDER(prop) \
@@ -1246,7 +1246,7 @@ static inline void __devexit omap34xx_device_exit(struct omap_mcbsp *mcbsp)
1246#else 1246#else
1247static inline void __devinit omap34xx_device_init(struct omap_mcbsp *mcbsp) {} 1247static inline void __devinit omap34xx_device_init(struct omap_mcbsp *mcbsp) {}
1248static inline void __devexit omap34xx_device_exit(struct omap_mcbsp *mcbsp) {} 1248static inline void __devexit omap34xx_device_exit(struct omap_mcbsp *mcbsp) {}
1249#endif /* CONFIG_ARCH_OMAP34XX */ 1249#endif /* CONFIG_ARCH_OMAP3 */
1250 1250
1251/* 1251/*
1252 * McBSP1 and McBSP3 are directly mapped on 1610 and 1510. 1252 * McBSP1 and McBSP3 are directly mapped on 1610 and 1510.
diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
index e0cbb9349bc1..51f4dfb82e2b 100644
--- a/arch/arm/plat-omap/sram.c
+++ b/arch/arm/plat-omap/sram.c
@@ -53,7 +53,7 @@
53#define OMAP4_SRAM_PUB_PA (OMAP4_SRAM_PA + 0x4000) 53#define OMAP4_SRAM_PUB_PA (OMAP4_SRAM_PA + 0x4000)
54#define OMAP4_SRAM_PUB_VA (OMAP4_SRAM_VA + 0x4000) 54#define OMAP4_SRAM_PUB_VA (OMAP4_SRAM_VA + 0x4000)
55 55
56#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) 56#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
57#define SRAM_BOOTLOADER_SZ 0x00 57#define SRAM_BOOTLOADER_SZ 0x00
58#else 58#else
59#define SRAM_BOOTLOADER_SZ 0x80 59#define SRAM_BOOTLOADER_SZ 0x80
diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h
index 1477ff8f85f6..3269292efecc 100644
--- a/drivers/net/smc911x.h
+++ b/drivers/net/smc911x.h
@@ -42,7 +42,7 @@
42 #define SMC_USE_16BIT 0 42 #define SMC_USE_16BIT 0
43 #define SMC_USE_32BIT 1 43 #define SMC_USE_32BIT 1
44 #define SMC_IRQ_SENSE IRQF_TRIGGER_LOW 44 #define SMC_IRQ_SENSE IRQF_TRIGGER_LOW
45#elif defined(CONFIG_ARCH_OMAP34XX) 45#elif defined(CONFIG_ARCH_OMAP3)
46 #define SMC_USE_16BIT 0 46 #define SMC_USE_16BIT 0
47 #define SMC_USE_32BIT 1 47 #define SMC_USE_32BIT 1
48 #define SMC_IRQ_SENSE IRQF_TRIGGER_LOW 48 #define SMC_IRQ_SENSE IRQF_TRIGGER_LOW
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 23bd252f3a44..66c35d74a76b 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -164,7 +164,7 @@ config SPI_OMAP_UWIRE
164 164
165config SPI_OMAP24XX 165config SPI_OMAP24XX
166 tristate "McSPI driver for OMAP24xx/OMAP34xx" 166 tristate "McSPI driver for OMAP24xx/OMAP34xx"
167 depends on ARCH_OMAP2 || ARCH_OMAP34XX 167 depends on ARCH_OMAP2 || ARCH_OMAP3
168 help 168 help
169 SPI master controller for OMAP24xx/OMAP34xx Multichannel SPI 169 SPI master controller for OMAP24xx/OMAP34xx Multichannel SPI
170 (McSPI) modules. 170 (McSPI) modules.
diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c
index bf5f95a19413..715c518b1b68 100644
--- a/drivers/spi/omap2_mcspi.c
+++ b/drivers/spi/omap2_mcspi.c
@@ -1014,7 +1014,7 @@ static u8 __initdata spi2_txdma_id[] = {
1014 OMAP24XX_DMA_SPI2_TX1, 1014 OMAP24XX_DMA_SPI2_TX1,
1015}; 1015};
1016 1016
1017#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP34XX) \ 1017#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) \
1018 || defined(CONFIG_ARCH_OMAP4) 1018 || defined(CONFIG_ARCH_OMAP4)
1019static u8 __initdata spi3_rxdma_id[] = { 1019static u8 __initdata spi3_rxdma_id[] = {
1020 OMAP24XX_DMA_SPI3_RX0, 1020 OMAP24XX_DMA_SPI3_RX0,
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 81aac7f4ca59..4f5bb5698f5d 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -61,7 +61,7 @@ config USB_ARCH_HAS_EHCI
61 default y if ARCH_W90X900 61 default y if ARCH_W90X900
62 default y if ARCH_AT91SAM9G45 62 default y if ARCH_AT91SAM9G45
63 default y if ARCH_MXC 63 default y if ARCH_MXC
64 default y if ARCH_OMAP34XX 64 default y if ARCH_OMAP3
65 default PCI 65 default PCI
66 66
67# ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface. 67# ARM SA1111 chips have a non-PCI based "OHCI-compatible" USB host interface.
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 1ec3857f22e6..d8d6d3461d32 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -1118,7 +1118,7 @@ MODULE_LICENSE ("GPL");
1118#define PLATFORM_DRIVER ehci_hcd_au1xxx_driver 1118#define PLATFORM_DRIVER ehci_hcd_au1xxx_driver
1119#endif 1119#endif
1120 1120
1121#ifdef CONFIG_ARCH_OMAP34XX 1121#ifdef CONFIG_ARCH_OMAP3
1122#include "ehci-omap.c" 1122#include "ehci-omap.c"
1123#define PLATFORM_DRIVER ehci_hcd_omap_driver 1123#define PLATFORM_DRIVER ehci_hcd_omap_driver
1124#endif 1124#endif
diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
index d9db86498022..b4c783c284ba 100644
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -37,7 +37,7 @@ config USB_MUSB_SOC
37 depends on USB_MUSB_HDRC 37 depends on USB_MUSB_HDRC
38 default y if ARCH_DAVINCI 38 default y if ARCH_DAVINCI
39 default y if ARCH_OMAP2430 39 default y if ARCH_OMAP2430
40 default y if ARCH_OMAP34XX 40 default y if ARCH_OMAP3
41 default y if (BF54x && !BF544) 41 default y if (BF54x && !BF544)
42 default y if (BF52x && !BF522 && !BF523) 42 default y if (BF52x && !BF522 && !BF523)
43 43
@@ -48,7 +48,7 @@ comment "OMAP 243x high speed USB support"
48 depends on USB_MUSB_HDRC && ARCH_OMAP2430 48 depends on USB_MUSB_HDRC && ARCH_OMAP2430
49 49
50comment "OMAP 343x high speed USB support" 50comment "OMAP 343x high speed USB support"
51 depends on USB_MUSB_HDRC && ARCH_OMAP34XX 51 depends on USB_MUSB_HDRC && ARCH_OMAP3
52 52
53comment "Blackfin high speed USB Support" 53comment "Blackfin high speed USB Support"
54 depends on USB_MUSB_HDRC && ((BF54x && !BF544) || (BF52x && !BF522 && !BF523)) 54 depends on USB_MUSB_HDRC && ((BF54x && !BF544) || (BF52x && !BF522 && !BF523))
@@ -153,7 +153,7 @@ config MUSB_PIO_ONLY
153config USB_INVENTRA_DMA 153config USB_INVENTRA_DMA
154 bool 154 bool
155 depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY 155 depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY
156 default ARCH_OMAP2430 || ARCH_OMAP34XX || BLACKFIN 156 default ARCH_OMAP2430 || ARCH_OMAP3 || BLACKFIN
157 help 157 help
158 Enable DMA transfers using Mentor's engine. 158 Enable DMA transfers using Mentor's engine.
159 159
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 5eb9318cff77..738efd8063b5 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -1000,7 +1000,7 @@ static void musb_shutdown(struct platform_device *pdev)
1000 * more than selecting one of a bunch of predefined configurations. 1000 * more than selecting one of a bunch of predefined configurations.
1001 */ 1001 */
1002#if defined(CONFIG_USB_TUSB6010) || \ 1002#if defined(CONFIG_USB_TUSB6010) || \
1003 defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP34XX) 1003 defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3)
1004static ushort __initdata fifo_mode = 4; 1004static ushort __initdata fifo_mode = 4;
1005#else 1005#else
1006static ushort __initdata fifo_mode = 2; 1006static ushort __initdata fifo_mode = 2;
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index 03d50909b078..5514c7ee85bd 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -562,7 +562,7 @@ extern void musb_hnp_stop(struct musb *musb);
562extern int musb_platform_set_mode(struct musb *musb, u8 musb_mode); 562extern int musb_platform_set_mode(struct musb *musb, u8 musb_mode);
563 563
564#if defined(CONFIG_USB_TUSB6010) || defined(CONFIG_BLACKFIN) || \ 564#if defined(CONFIG_USB_TUSB6010) || defined(CONFIG_BLACKFIN) || \
565 defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP34XX) 565 defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3)
566extern void musb_platform_try_idle(struct musb *musb, unsigned long timeout); 566extern void musb_platform_try_idle(struct musb *musb, unsigned long timeout);
567#else 567#else
568#define musb_platform_try_idle(x, y) do {} while (0) 568#define musb_platform_try_idle(x, y) do {} while (0)
diff --git a/drivers/w1/masters/Kconfig b/drivers/w1/masters/Kconfig
index 3195fb8b7d9a..80b3b123dd7f 100644
--- a/drivers/w1/masters/Kconfig
+++ b/drivers/w1/masters/Kconfig
@@ -60,7 +60,7 @@ config W1_MASTER_GPIO
60 60
61config HDQ_MASTER_OMAP 61config HDQ_MASTER_OMAP
62 tristate "OMAP HDQ driver" 62 tristate "OMAP HDQ driver"
63 depends on ARCH_OMAP2430 || ARCH_OMAP34XX 63 depends on ARCH_OMAP2430 || ARCH_OMAP3
64 help 64 help
65 Say Y here if you want support for the 1-wire or HDQ Interface 65 Say Y here if you want support for the 1-wire or HDQ Interface
66 on an OMAP processor. 66 on an OMAP processor.
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index b45e2896ac87..3da3f48720a7 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -194,7 +194,7 @@ config EP93XX_WATCHDOG
194 194
195config OMAP_WATCHDOG 195config OMAP_WATCHDOG
196 tristate "OMAP Watchdog" 196 tristate "OMAP Watchdog"
197 depends on ARCH_OMAP16XX || ARCH_OMAP2 || ARCH_OMAP34XX 197 depends on ARCH_OMAP16XX || ARCH_OMAP2 || ARCH_OMAP3
198 help 198 help
199 Support for TI OMAP1610/OMAP1710/OMAP2420/OMAP3430 watchdog. Say 'Y' 199 Support for TI OMAP1610/OMAP1710/OMAP2420/OMAP3430 watchdog. Say 'Y'
200 here to enable the OMAP1610/OMAP1710/OMAP2420/OMAP3430 watchdog timer. 200 here to enable the OMAP1610/OMAP1710/OMAP2420/OMAP3430 watchdog timer.
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 26e728dc1337..c0039b35fb25 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -82,11 +82,11 @@ static const int omap1_dma_reqs[][2] = {};
82static const unsigned long omap1_mcbsp_port[][2] = {}; 82static const unsigned long omap1_mcbsp_port[][2] = {};
83#endif 83#endif
84 84
85#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) 85#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
86static const int omap24xx_dma_reqs[][2] = { 86static const int omap24xx_dma_reqs[][2] = {
87 { OMAP24XX_DMA_MCBSP1_TX, OMAP24XX_DMA_MCBSP1_RX }, 87 { OMAP24XX_DMA_MCBSP1_TX, OMAP24XX_DMA_MCBSP1_RX },
88 { OMAP24XX_DMA_MCBSP2_TX, OMAP24XX_DMA_MCBSP2_RX }, 88 { OMAP24XX_DMA_MCBSP2_TX, OMAP24XX_DMA_MCBSP2_RX },
89#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP34XX) 89#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3)
90 { OMAP24XX_DMA_MCBSP3_TX, OMAP24XX_DMA_MCBSP3_RX }, 90 { OMAP24XX_DMA_MCBSP3_TX, OMAP24XX_DMA_MCBSP3_RX },
91 { OMAP24XX_DMA_MCBSP4_TX, OMAP24XX_DMA_MCBSP4_RX }, 91 { OMAP24XX_DMA_MCBSP4_TX, OMAP24XX_DMA_MCBSP4_RX },
92 { OMAP24XX_DMA_MCBSP5_TX, OMAP24XX_DMA_MCBSP5_RX }, 92 { OMAP24XX_DMA_MCBSP5_TX, OMAP24XX_DMA_MCBSP5_RX },
@@ -124,7 +124,7 @@ static const unsigned long omap2430_mcbsp_port[][2] = {
124static const unsigned long omap2430_mcbsp_port[][2] = {}; 124static const unsigned long omap2430_mcbsp_port[][2] = {};
125#endif 125#endif
126 126
127#if defined(CONFIG_ARCH_OMAP34XX) 127#if defined(CONFIG_ARCH_OMAP3)
128static const unsigned long omap34xx_mcbsp_port[][2] = { 128static const unsigned long omap34xx_mcbsp_port[][2] = {
129 { OMAP34XX_MCBSP1_BASE + OMAP_MCBSP_REG_DXR, 129 { OMAP34XX_MCBSP1_BASE + OMAP_MCBSP_REG_DXR,
130 OMAP34XX_MCBSP1_BASE + OMAP_MCBSP_REG_DRR }, 130 OMAP34XX_MCBSP1_BASE + OMAP_MCBSP_REG_DRR },
diff --git a/sound/soc/omap/omap-mcbsp.h b/sound/soc/omap/omap-mcbsp.h
index 647d2f981ab0..1968d03bc532 100644
--- a/sound/soc/omap/omap-mcbsp.h
+++ b/sound/soc/omap/omap-mcbsp.h
@@ -50,7 +50,7 @@ enum omap_mcbsp_div {
50#undef NUM_LINKS 50#undef NUM_LINKS
51#define NUM_LINKS 3 51#define NUM_LINKS 3
52#endif 52#endif
53#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP34XX) 53#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3)
54#undef NUM_LINKS 54#undef NUM_LINKS
55#define NUM_LINKS 5 55#define NUM_LINKS 5
56#endif 56#endif
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-11 10:48:57 -0500