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

Download as
Browse Code ยป

Commit 59b479e0985f0b795d68331d6443a7f89c47768d

Authored by Tony Lindgren
1 parent 0e6d8cad44
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

omap: Start using CONFIG_SOC_OMAP 

We want to have just CONFIG_ARCH_OMAP2, 3 and 4. The rest
are nowadays just subcategories of these.

Search and replace the following:

ARCH_OMAP2420		SOC_OMAP2420
ARCH_OMAP2430		SOC_OMAP2430
ARCH_OMAP3430		SOC_OMAP3430

No functional changes.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Thomas Weber <weber@corscience.de>
Acked-by: Sourav Poddar <sourav.poddar@ti.com>

Showing 24 changed files with 71 additions and 71 deletions Side-by-side Diff

arch/arm/mach-omap2/Kconfig
Diff comments   View file @ 59b479e
... ... @@ -53,20 +53,20 @@
53 53 comment "OMAP Core Type"
54 54 depends on ARCH_OMAP2
55 55  
56   -config ARCH_OMAP2420
  56 +config SOC_OMAP2420
57 57 bool "OMAP2420 support"
58 58 depends on ARCH_OMAP2
59 59 default y
60 60 select OMAP_DM_TIMER
61 61 select ARCH_OMAP_OTG
62 62  
63   -config ARCH_OMAP2430
  63 +config SOC_OMAP2430
64 64 bool "OMAP2430 support"
65 65 depends on ARCH_OMAP2
66 66 default y
67 67 select ARCH_OMAP_OTG
68 68  
69   -config ARCH_OMAP3430
  69 +config SOC_OMAP3430
70 70 bool "OMAP3430 support"
71 71 depends on ARCH_OMAP3
72 72 default y
73 73  
74 74  
75 75  
... ... @@ -106,25 +106,25 @@
106 106  
107 107 config MACH_OMAP2_TUSB6010
108 108 bool
109   - depends on ARCH_OMAP2 && ARCH_OMAP2420
  109 + depends on ARCH_OMAP2 && SOC_OMAP2420
110 110 default y if MACH_NOKIA_N8X0
111 111  
112 112 config MACH_OMAP_H4
113 113 bool "OMAP 2420 H4 board"
114   - depends on ARCH_OMAP2420
  114 + depends on SOC_OMAP2420
115 115 default y
116 116 select OMAP_PACKAGE_ZAF
117 117 select OMAP_DEBUG_DEVICES
118 118  
119 119 config MACH_OMAP_APOLLON
120 120 bool "OMAP 2420 Apollon board"
121   - depends on ARCH_OMAP2420
  121 + depends on SOC_OMAP2420
122 122 default y
123 123 select OMAP_PACKAGE_ZAC
124 124  
125 125 config MACH_OMAP_2430SDP
126 126 bool "OMAP 2430 SDP board"
127   - depends on ARCH_OMAP2430
  127 + depends on SOC_OMAP2430
128 128 default y
129 129 select OMAP_PACKAGE_ZAC
130 130  
... ... @@ -219,7 +219,7 @@
219 219  
220 220 config MACH_NOKIA_N8X0
221 221 bool "Nokia N800/N810"
222   - depends on ARCH_OMAP2420
  222 + depends on SOC_OMAP2420
223 223 default y
224 224 select OMAP_PACKAGE_ZAC
225 225 select MACH_NOKIA_N800
arch/arm/mach-omap2/Makefile
Diff comments   View file @ 59b479e
... ... @@ -31,8 +31,8 @@
31 31 AFLAGS_omap44xx-smc.o :=-Wa,-march=armv7-a$(plus_sec)
32 32  
33 33 # Functions loaded to SRAM
34   -obj-$(CONFIG_ARCH_OMAP2420) += sram242x.o
35   -obj-$(CONFIG_ARCH_OMAP2430) += sram243x.o
  34 +obj-$(CONFIG_SOC_OMAP2420) += sram242x.o
  35 +obj-$(CONFIG_SOC_OMAP2430) += sram243x.o
36 36 obj-$(CONFIG_ARCH_OMAP3) += sram34xx.o
37 37  
38 38 AFLAGS_sram242x.o :=-Wa,-march=armv6
... ... @@ -40,8 +40,8 @@
40 40 AFLAGS_sram34xx.o :=-Wa,-march=armv7-a
41 41  
42 42 # Pin multiplexing
43   -obj-$(CONFIG_ARCH_OMAP2420) += mux2420.o
44   -obj-$(CONFIG_ARCH_OMAP2430) += mux2430.o
  43 +obj-$(CONFIG_SOC_OMAP2420) += mux2420.o
  44 +obj-$(CONFIG_SOC_OMAP2430) += mux2430.o
45 45 obj-$(CONFIG_ARCH_OMAP3) += mux34xx.o
46 46 obj-$(CONFIG_ARCH_OMAP4) += mux44xx.o
47 47  
... ... @@ -113,8 +113,8 @@
113 113 clkt2xxx_dpllcore.o \
114 114 clkt2xxx_virt_prcm_set.o \
115 115 clkt2xxx_apll.o clkt2xxx_osc.o
116   -obj-$(CONFIG_ARCH_OMAP2420) += clock2420_data.o
117   -obj-$(CONFIG_ARCH_OMAP2430) += clock2430.o clock2430_data.o
  116 +obj-$(CONFIG_SOC_OMAP2420) += clock2420_data.o
  117 +obj-$(CONFIG_SOC_OMAP2430) += clock2430.o clock2430_data.o
118 118 obj-$(CONFIG_ARCH_OMAP3) += $(clock-common) clock3xxx.o \
119 119 clock34xx.o clkt34xx_dpll3m2.o \
120 120 clock3517.o clock36xx.o \
121 121  
... ... @@ -123,12 +123,12 @@
123 123 dpll3xxx.o
124 124  
125 125 # OMAP2 clock rate set data (old "OPP" data)
126   -obj-$(CONFIG_ARCH_OMAP2420) += opp2420_data.o
127   -obj-$(CONFIG_ARCH_OMAP2430) += opp2430_data.o
  126 +obj-$(CONFIG_SOC_OMAP2420) += opp2420_data.o
  127 +obj-$(CONFIG_SOC_OMAP2430) += opp2430_data.o
128 128  
129 129 # hwmod data
130   -obj-$(CONFIG_ARCH_OMAP2420) += omap_hwmod_2420_data.o
131   -obj-$(CONFIG_ARCH_OMAP2430) += omap_hwmod_2430_data.o
  130 +obj-$(CONFIG_SOC_OMAP2420) += omap_hwmod_2420_data.o
  131 +obj-$(CONFIG_SOC_OMAP2430) += omap_hwmod_2430_data.o
132 132 obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_3xxx_data.o
133 133 obj-$(CONFIG_ARCH_OMAP4) += omap_hwmod_44xx_data.o
134 134  
arch/arm/mach-omap2/clock2xxx.h
Diff comments   View file @ 59b479e
... ... @@ -20,13 +20,13 @@
20 20 u32 omap2xxx_get_sysclkdiv(void);
21 21 void omap2xxx_clk_prepare_for_reboot(void);
22 22  
23   -#ifdef CONFIG_ARCH_OMAP2420
  23 +#ifdef CONFIG_SOC_OMAP2420
24 24 int omap2420_clk_init(void);
25 25 #else
26 26 #define omap2420_clk_init() 0
27 27 #endif
28 28  
29   -#ifdef CONFIG_ARCH_OMAP2430
  29 +#ifdef CONFIG_SOC_OMAP2430
30 30 int omap2430_clk_init(void);
31 31 #else
32 32 #define omap2430_clk_init() 0
arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c
Diff comments   View file @ 59b479e
... ... @@ -171,7 +171,7 @@
171 171  
172 172 /* 2430-specific possible wakeup dependencies */
173 173  
174   -#ifdef CONFIG_ARCH_OMAP2430
  174 +#ifdef CONFIG_SOC_OMAP2430
175 175  
176 176 /* 2430 PM_WKDEP_MDM: CORE, MPU, WKUP */
177 177 static struct clkdm_dep mdm_2430_wkdeps[] = {
... ... @@ -194,7 +194,7 @@
194 194 { NULL },
195 195 };
196 196  
197   -#endif /* CONFIG_ARCH_OMAP2430 */
  197 +#endif /* CONFIG_SOC_OMAP2430 */
198 198  
199 199  
200 200 /* OMAP3-specific possible dependencies */
... ... @@ -450,7 +450,7 @@
450 450 * 2420-only clockdomains
451 451 */
452 452  
453   -#if defined(CONFIG_ARCH_OMAP2420)
  453 +#if defined(CONFIG_SOC_OMAP2420)
454 454  
455 455 static struct clockdomain mpu_2420_clkdm = {
456 456 .name = "mpu_clkdm",
457 457  
... ... @@ -514,14 +514,14 @@
514 514 .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2420),
515 515 };
516 516  
517   -#endif /* CONFIG_ARCH_OMAP2420 */
  517 +#endif /* CONFIG_SOC_OMAP2420 */
518 518  
519 519  
520 520 /*
521 521 * 2430-only clockdomains
522 522 */
523 523  
524   -#if defined(CONFIG_ARCH_OMAP2430)
  524 +#if defined(CONFIG_SOC_OMAP2430)
525 525  
526 526 static struct clockdomain mpu_2430_clkdm = {
527 527 .name = "mpu_clkdm",
... ... @@ -600,7 +600,7 @@
600 600 .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430),
601 601 };
602 602  
603   -#endif /* CONFIG_ARCH_OMAP2430 */
  603 +#endif /* CONFIG_SOC_OMAP2430 */
604 604  
605 605  
606 606 /*
... ... @@ -811,7 +811,7 @@
811 811 &cm_clkdm,
812 812 &prm_clkdm,
813 813  
814   -#ifdef CONFIG_ARCH_OMAP2420
  814 +#ifdef CONFIG_SOC_OMAP2420
815 815 &mpu_2420_clkdm,
816 816 &iva1_2420_clkdm,
817 817 &dsp_2420_clkdm,
... ... @@ -821,7 +821,7 @@
821 821 &dss_2420_clkdm,
822 822 #endif
823 823  
824   -#ifdef CONFIG_ARCH_OMAP2430
  824 +#ifdef CONFIG_SOC_OMAP2430
825 825 &mpu_2430_clkdm,
826 826 &mdm_clkdm,
827 827 &dsp_2430_clkdm,
arch/arm/mach-omap2/common.c
Diff comments   View file @ 59b479e
... ... @@ -40,7 +40,7 @@
40 40  
41 41 #endif
42 42  
43   -#if defined(CONFIG_ARCH_OMAP2420)
  43 +#if defined(CONFIG_SOC_OMAP2420)
44 44  
45 45 static struct omap_globals omap242x_globals = {
46 46 .class = OMAP242X_CLASS,
... ... @@ -61,7 +61,7 @@
61 61 }
62 62 #endif
63 63  
64   -#if defined(CONFIG_ARCH_OMAP2430)
  64 +#if defined(CONFIG_SOC_OMAP2430)
65 65  
66 66 static struct omap_globals omap243x_globals = {
67 67 .class = OMAP243X_CLASS,
arch/arm/mach-omap2/devices.c
Diff comments   View file @ 59b479e
... ... @@ -333,7 +333,7 @@
333 333 },
334 334 };
335 335  
336   -#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) || \
  336 +#if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_ARCH_OMAP3) || \
337 337 defined(CONFIG_ARCH_OMAP4)
338 338 static struct omap2_mcspi_platform_config omap2_mcspi3_config = {
339 339 .num_cs = 2,
... ... @@ -400,7 +400,7 @@
400 400 }
401 401 #endif
402 402  
403   -#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) || \
  403 +#if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_ARCH_OMAP3) || \
404 404 defined(CONFIG_ARCH_OMAP4)
405 405 static inline void omap2_mcspi3_init(void)
406 406 {
... ... @@ -895,7 +895,7 @@
895 895 /*-------------------------------------------------------------------------*/
896 896  
897 897 #if defined(CONFIG_HDQ_MASTER_OMAP) || defined(CONFIG_HDQ_MASTER_OMAP_MODULE)
898   -#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3430)
  898 +#if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_SOC_OMAP3430)
899 899 #define OMAP_HDQ_BASE 0x480B2000
900 900 #endif
901 901 static struct resource omap_hdq_resources[] = {
arch/arm/mach-omap2/io.c
Diff comments   View file @ 59b479e
... ... @@ -66,7 +66,7 @@
66 66 },
67 67 };
68 68  
69   -#ifdef CONFIG_ARCH_OMAP2420
  69 +#ifdef CONFIG_SOC_OMAP2420
70 70 static struct map_desc omap242x_io_desc[] __initdata = {
71 71 {
72 72 .virtual = DSP_MEM_2420_VIRT,
... ... @@ -90,7 +90,7 @@
90 90  
91 91 #endif
92 92  
93   -#ifdef CONFIG_ARCH_OMAP2430
  93 +#ifdef CONFIG_SOC_OMAP2430
94 94 static struct map_desc omap243x_io_desc[] __initdata = {
95 95 {
96 96 .virtual = L4_WK_243X_VIRT,
... ... @@ -241,7 +241,7 @@
241 241 omap_sram_init();
242 242 }
243 243  
244   -#ifdef CONFIG_ARCH_OMAP2420
  244 +#ifdef CONFIG_SOC_OMAP2420
245 245 void __init omap242x_map_common_io(void)
246 246 {
247 247 iotable_init(omap24xx_io_desc, ARRAY_SIZE(omap24xx_io_desc));
... ... @@ -250,7 +250,7 @@
250 250 }
251 251 #endif
252 252  
253   -#ifdef CONFIG_ARCH_OMAP2430
  253 +#ifdef CONFIG_SOC_OMAP2430
254 254 void __init omap243x_map_common_io(void)
255 255 {
256 256 iotable_init(omap24xx_io_desc, ARRAY_SIZE(omap24xx_io_desc));
arch/arm/mach-omap2/mailbox.c
Diff comments   View file @ 59b479e
... ... @@ -310,7 +310,7 @@
310 310 struct omap_mbox *omap3_mboxes[] = { &mbox_dsp_info, NULL };
311 311 #endif
312 312  
313   -#if defined(CONFIG_ARCH_OMAP2420)
  313 +#if defined(CONFIG_SOC_OMAP2420)
314 314 /* IVA */
315 315 static struct omap_mbox2_priv omap2_mbox_iva_priv = {
316 316 .tx_fifo = {
arch/arm/mach-omap2/mcbsp.c
Diff comments   View file @ 59b479e
... ... @@ -104,7 +104,7 @@
104 104  
105 105 /* Platform data */
106 106  
107   -#ifdef CONFIG_ARCH_OMAP2420
  107 +#ifdef CONFIG_SOC_OMAP2420
108 108 static struct omap_mcbsp_platform_data omap2420_mcbsp_pdata[] = {
109 109 {
110 110 .phys_base = OMAP24XX_MCBSP1_BASE,
... ... @@ -129,7 +129,7 @@
129 129 #define OMAP2420_MCBSP_REG_NUM 0
130 130 #endif
131 131  
132   -#ifdef CONFIG_ARCH_OMAP2430
  132 +#ifdef CONFIG_SOC_OMAP2430
133 133 static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = {
134 134 {
135 135 .phys_base = OMAP24XX_MCBSP1_BASE,
arch/arm/mach-omap2/opp2xxx.h
Diff comments   View file @ 59b479e
... ... @@ -418,7 +418,7 @@
418 418  
419 419 extern const struct prcm_config omap2420_rate_table[];
420 420  
421   -#ifdef CONFIG_ARCH_OMAP2430
  421 +#ifdef CONFIG_SOC_OMAP2430
422 422 extern const struct prcm_config omap2430_rate_table[];
423 423 #else
424 424 #define omap2430_rate_table NULL
arch/arm/mach-omap2/powerdomains2xxx_data.c
Diff comments   View file @ 59b479e
... ... @@ -78,7 +78,7 @@
78 78 * 2430-specific powerdomains
79 79 */
80 80  
81   -#ifdef CONFIG_ARCH_OMAP2430
  81 +#ifdef CONFIG_SOC_OMAP2430
82 82  
83 83 /* XXX 2430 KILLDOMAINWKUP bit? No current users apparently */
84 84  
... ... @@ -97,7 +97,7 @@
97 97 },
98 98 };
99 99  
100   -#endif /* CONFIG_ARCH_OMAP2430 */
  100 +#endif /* CONFIG_SOC_OMAP2430 */
101 101  
102 102 /* As powerdomains are added or removed above, this list must also be changed */
103 103 static struct powerdomain *powerdomains_omap2xxx[] __initdata = {
... ... @@ -111,7 +111,7 @@
111 111 &core_24xx_pwrdm,
112 112 #endif
113 113  
114   -#ifdef CONFIG_ARCH_OMAP2430
  114 +#ifdef CONFIG_SOC_OMAP2430
115 115 &mdm_pwrdm,
116 116 #endif
117 117 NULL
arch/arm/plat-omap/counter_32k.c
Diff comments   View file @ 59b479e
... ... @@ -54,7 +54,7 @@
54 54 #define omap16xx_32k_read NULL
55 55 #endif
56 56  
57   -#ifdef CONFIG_ARCH_OMAP2420
  57 +#ifdef CONFIG_SOC_OMAP2420
58 58 static cycle_t notrace omap2420_32k_read(struct clocksource *cs)
59 59 {
60 60 return omap_readl(OMAP2420_32KSYNCT_BASE + 0x10) - offset_32k;
... ... @@ -63,7 +63,7 @@
63 63 #define omap2420_32k_read NULL
64 64 #endif
65 65  
66   -#ifdef CONFIG_ARCH_OMAP2430
  66 +#ifdef CONFIG_SOC_OMAP2430
67 67 static cycle_t notrace omap2430_32k_read(struct clocksource *cs)
68 68 {
69 69 return omap_readl(OMAP2430_32KSYNCT_BASE + 0x10) - offset_32k;
arch/arm/plat-omap/include/plat/cpu.h
Diff comments   View file @ 59b479e
... ... @@ -170,11 +170,11 @@
170 170 # undef cpu_is_omap24xx
171 171 # define cpu_is_omap24xx() is_omap24xx()
172 172 # endif
173   -# if defined (CONFIG_ARCH_OMAP2420)
  173 +# if defined (CONFIG_SOC_OMAP2420)
174 174 # undef cpu_is_omap242x
175 175 # define cpu_is_omap242x() is_omap242x()
176 176 # endif
177   -# if defined (CONFIG_ARCH_OMAP2430)
  177 +# if defined (CONFIG_SOC_OMAP2430)
178 178 # undef cpu_is_omap243x
179 179 # define cpu_is_omap243x() is_omap243x()
180 180 # endif
181 181  
... ... @@ -189,11 +189,11 @@
189 189 # undef cpu_is_omap24xx
190 190 # define cpu_is_omap24xx() 1
191 191 # endif
192   -# if defined(CONFIG_ARCH_OMAP2420)
  192 +# if defined(CONFIG_SOC_OMAP2420)
193 193 # undef cpu_is_omap242x
194 194 # define cpu_is_omap242x() 1
195 195 # endif
196   -# if defined(CONFIG_ARCH_OMAP2430)
  196 +# if defined(CONFIG_SOC_OMAP2430)
197 197 # undef cpu_is_omap243x
198 198 # define cpu_is_omap243x() 1
199 199 # endif
... ... @@ -201,7 +201,7 @@
201 201 # undef cpu_is_omap34xx
202 202 # define cpu_is_omap34xx() 1
203 203 # endif
204   -# if defined(CONFIG_ARCH_OMAP3430)
  204 +# if defined(CONFIG_SOC_OMAP3430)
205 205 # undef cpu_is_omap343x
206 206 # define cpu_is_omap343x() 1
207 207 # endif
arch/arm/plat-omap/include/plat/io.h
Diff comments   View file @ 59b479e
... ... @@ -259,7 +259,7 @@
259 259 extern void omap1_map_common_io(void);
260 260 extern void omap1_init_common_hw(void);
261 261  
262   -#ifdef CONFIG_ARCH_OMAP2420
  262 +#ifdef CONFIG_SOC_OMAP2420
263 263 extern void omap242x_map_common_io(void);
264 264 #else
265 265 static inline void omap242x_map_common_io(void)
... ... @@ -267,7 +267,7 @@
267 267 }
268 268 #endif
269 269  
270   -#ifdef CONFIG_ARCH_OMAP2430
  270 +#ifdef CONFIG_SOC_OMAP2430
271 271 extern void omap243x_map_common_io(void);
272 272 #else
273 273 static inline void omap243x_map_common_io(void)
arch/arm/plat-omap/include/plat/multi.h
Diff comments   View file @ 59b479e
... ... @@ -66,7 +66,7 @@
66 66 # error "OMAP1 and OMAP2PLUS can't be selected at the same time"
67 67 # endif
68 68 #endif
69   -#ifdef CONFIG_ARCH_OMAP2420
  69 +#ifdef CONFIG_SOC_OMAP2420
70 70 # ifdef OMAP_NAME
71 71 # undef MULTI_OMAP2
72 72 # define MULTI_OMAP2
... ... @@ -74,7 +74,7 @@
74 74 # define OMAP_NAME omap2420
75 75 # endif
76 76 #endif
77   -#ifdef CONFIG_ARCH_OMAP2430
  77 +#ifdef CONFIG_SOC_OMAP2430
78 78 # ifdef OMAP_NAME
79 79 # undef MULTI_OMAP2
80 80 # define MULTI_OMAP2
arch/arm/plat-omap/sram.c
Diff comments   View file @ 59b479e
... ... @@ -312,7 +312,7 @@
312 312 }
313 313 #endif
314 314  
315   -#ifdef CONFIG_ARCH_OMAP2420
  315 +#ifdef CONFIG_SOC_OMAP2420
316 316 static int __init omap242x_sram_init(void)
317 317 {
318 318 _omap2_sram_ddr_init = omap_sram_push(omap242x_sram_ddr_init,
... ... @@ -333,7 +333,7 @@
333 333 }
334 334 #endif
335 335  
336   -#ifdef CONFIG_ARCH_OMAP2430
  336 +#ifdef CONFIG_SOC_OMAP2430
337 337 static int __init omap243x_sram_init(void)
338 338 {
339 339 _omap2_sram_ddr_init = omap_sram_push(omap243x_sram_ddr_init,
drivers/mmc/host/Kconfig
Diff comments   View file @ 59b479e
... ... @@ -225,7 +225,7 @@
225 225  
226 226 config MMC_OMAP_HS
227 227 tristate "TI OMAP High Speed Multimedia Card Interface support"
228   - depends on ARCH_OMAP2430 || ARCH_OMAP3 || ARCH_OMAP4
  228 + depends on SOC_OMAP2430 || ARCH_OMAP3 || ARCH_OMAP4
229 229 help
230 230 This selects the TI OMAP High Speed Multimedia card Interface.
231 231 If you have an OMAP2430 or OMAP3 board or OMAP4 board with a
drivers/spi/omap2_mcspi.c
Diff comments   View file @ 59b479e
... ... @@ -1111,7 +1111,7 @@
1111 1111 OMAP24XX_DMA_SPI2_TX1,
1112 1112 };
1113 1113  
1114   -#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) \
  1114 +#if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_ARCH_OMAP3) \
1115 1115 || defined(CONFIG_ARCH_OMAP4)
1116 1116 static u8 __initdata spi3_rxdma_id[] = {
1117 1117 OMAP24XX_DMA_SPI3_RX0,
... ... @@ -1154,7 +1154,7 @@
1154 1154 txdma_id = spi2_txdma_id;
1155 1155 num_chipselect = 2;
1156 1156 break;
1157   -#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) \
  1157 +#if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_ARCH_OMAP3) \
1158 1158 || defined(CONFIG_ARCH_OMAP4)
1159 1159 case 3:
1160 1160 rxdma_id = spi3_rxdma_id;
drivers/usb/musb/musb_core.c
Diff comments   View file @ 59b479e
... ... @@ -1535,7 +1535,7 @@
1535 1535  
1536 1536 /*-------------------------------------------------------------------------*/
1537 1537  
1538   -#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3430) || \
  1538 +#if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_SOC_OMAP3430) || \
1539 1539 defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_ARCH_U8500) || \
1540 1540 defined(CONFIG_ARCH_U5500)
1541 1541  
drivers/usb/musb/musb_core.h
Diff comments   View file @ 59b479e
... ... @@ -212,8 +212,8 @@
212 212 * directly with the "flat" model, or after setting up an index register.
213 213 */
214 214  
215   -#if defined(CONFIG_ARCH_DAVINCI) || defined(CONFIG_ARCH_OMAP2430) \
216   - || defined(CONFIG_ARCH_OMAP3430) || defined(CONFIG_BLACKFIN) \
  215 +#if defined(CONFIG_ARCH_DAVINCI) || defined(CONFIG_SOC_OMAP2430) \
  216 + || defined(CONFIG_SOC_OMAP3430) || defined(CONFIG_BLACKFIN) \
217 217 || defined(CONFIG_ARCH_OMAP4)
218 218 /* REVISIT indexed access seemed to
219 219 * misbehave (on DaVinci) for at least peripheral IN ...
... ... @@ -358,7 +358,7 @@
358 358  
359 359 struct musb_context_registers {
360 360  
361   -#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) || \
  361 +#if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_ARCH_OMAP3) || \
362 362 defined(CONFIG_ARCH_OMAP4)
363 363 u32 otg_sysconfig, otg_forcestandby;
364 364 #endif
drivers/usb/musb/musbhsdma.h
Diff comments   View file @ 59b479e
... ... @@ -31,7 +31,7 @@
31 31 *
32 32 */
33 33  
34   -#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3430)
  34 +#if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_SOC_OMAP3430)
35 35 #include "omap2430.h"
36 36 #endif
37 37  
drivers/w1/masters/Kconfig
Diff comments   View file @ 59b479e
... ... @@ -60,7 +60,7 @@
60 60  
61 61 config HDQ_MASTER_OMAP
62 62 tristate "OMAP HDQ driver"
63   - depends on ARCH_OMAP2430 || ARCH_OMAP3
  63 + depends on SOC_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.
sound/soc/omap/omap-mcbsp.c
Diff comments   View file @ 59b479e
... ... @@ -92,7 +92,7 @@
92 92 static const int omap24xx_dma_reqs[][2] = {
93 93 { OMAP24XX_DMA_MCBSP1_TX, OMAP24XX_DMA_MCBSP1_RX },
94 94 { OMAP24XX_DMA_MCBSP2_TX, OMAP24XX_DMA_MCBSP2_RX },
95   -#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3)
  95 +#if defined(CONFIG_SOC_OMAP2430) || defined(CONFIG_ARCH_OMAP3)
96 96 { OMAP24XX_DMA_MCBSP3_TX, OMAP24XX_DMA_MCBSP3_RX },
97 97 { OMAP24XX_DMA_MCBSP4_TX, OMAP24XX_DMA_MCBSP4_RX },
98 98 { OMAP24XX_DMA_MCBSP5_TX, OMAP24XX_DMA_MCBSP5_RX },
... ... @@ -113,7 +113,7 @@
113 113 static const int omap44xx_dma_reqs[][2] = {};
114 114 #endif
115 115  
116   -#if defined(CONFIG_ARCH_OMAP2420)
  116 +#if defined(CONFIG_SOC_OMAP2420)
117 117 static const unsigned long omap2420_mcbsp_port[][2] = {
118 118 { OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DXR1,
119 119 OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DRR1 },
... ... @@ -124,7 +124,7 @@
124 124 static const unsigned long omap2420_mcbsp_port[][2] = {};
125 125 #endif
126 126  
127   -#if defined(CONFIG_ARCH_OMAP2430)
  127 +#if defined(CONFIG_SOC_OMAP2430)
128 128 static const unsigned long omap2430_mcbsp_port[][2] = {
129 129 { OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DXR,
130 130 OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DRR },
sound/soc/omap/omap-mcbsp.h
Diff comments   View file @ 59b479e
... ... @@ -43,7 +43,7 @@
43 43 OMAP_MCBSP_CLKGDV, /* Sample rate generator divider */
44 44 };
45 45  
46   -#if defined(CONFIG_ARCH_OMAP2420)
  46 +#if defined(CONFIG_SOC_OMAP2420)
47 47 #define NUM_LINKS 2
48 48 #endif
49 49 #if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX)
... ... @@ -54,7 +54,7 @@
54 54 #undef NUM_LINKS
55 55 #define NUM_LINKS 4
56 56 #endif
57   -#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3)
  57 +#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_OMAP2430)
58 58 #undef NUM_LINKS
59 59 #define NUM_LINKS 5
60 60 #endif