Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit a8eb7ca0cbb41c9cd379b8d2a2a5efb503aa65e9

Authored by Tony Lindgren
1 parent 088ef950dc
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

omap3: Replace ARCH_OMAP34XX with ARCH_OMAP3 

Replace ARCH_OMAP34XX with ARCH_OMAP3

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

Showing 28 changed files with 92 additions and 96 deletions Side-by-side Diff

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