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

Download as
Browse Code ยป

Commit 088ef950dc0dd58d2f339e1616c9092fea923f06

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

omap2: Convert ARCH_OMAP24XX to ARCH_OMAP2 

Convert ARCH_OMAP24XX to ARCH_OMAP2

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

Showing 23 changed files with 63 additions and 67 deletions Side-by-side Diff

arch/arm/mach-omap2/Kconfig
Diff comments   View file @ 088ef95
1 1 comment "OMAP Core Type"
2 2 depends on ARCH_OMAP2
3 3  
4   -config ARCH_OMAP24XX
5   - bool "OMAP24xx Based System"
6   - depends on ARCH_OMAP2
7   -
8 4 config ARCH_OMAP2420
9 5 bool "OMAP2420 support"
10   - depends on ARCH_OMAP24XX
  6 + depends on ARCH_OMAP2
11 7 select OMAP_DM_TIMER
12 8 select ARCH_OMAP_OTG
13 9  
14 10 config ARCH_OMAP2430
15 11 bool "OMAP2430 support"
16   - depends on ARCH_OMAP24XX
  12 + depends on ARCH_OMAP2
17 13  
18 14 config ARCH_OMAP34XX
19 15 bool "OMAP34xx Based System"
... ... @@ -42,7 +38,7 @@
42 38  
43 39 config MACH_OMAP_GENERIC
44 40 bool "Generic OMAP board"
45   - depends on ARCH_OMAP2 && ARCH_OMAP24XX
  41 + depends on ARCH_OMAP2
46 42  
47 43 config MACH_OMAP2_TUSB6010
48 44 bool
49 45  
50 46  
... ... @@ -51,16 +47,16 @@
51 47  
52 48 config MACH_OMAP_H4
53 49 bool "OMAP 2420 H4 board"
54   - depends on ARCH_OMAP2 && ARCH_OMAP24XX
  50 + depends on ARCH_OMAP2
55 51 select OMAP_DEBUG_DEVICES
56 52  
57 53 config MACH_OMAP_APOLLON
58 54 bool "OMAP 2420 Apollon board"
59   - depends on ARCH_OMAP2 && ARCH_OMAP24XX
  55 + depends on ARCH_OMAP2
60 56  
61 57 config MACH_OMAP_2430SDP
62 58 bool "OMAP 2430 SDP board"
63   - depends on ARCH_OMAP2 && ARCH_OMAP24XX
  59 + depends on ARCH_OMAP2
64 60  
65 61 config MACH_OMAP3_BEAGLE
66 62 bool "OMAP3 BEAGLE board"
arch/arm/mach-omap2/Makefile
Diff comments   View file @ 088ef95
... ... @@ -48,7 +48,7 @@
48 48 # Power Management
49 49 ifeq ($(CONFIG_PM),y)
50 50 obj-$(CONFIG_ARCH_OMAP2) += pm24xx.o
51   -obj-$(CONFIG_ARCH_OMAP24XX) += sleep24xx.o
  51 +obj-$(CONFIG_ARCH_OMAP2) += sleep24xx.o
52 52 obj-$(CONFIG_ARCH_OMAP3) += pm34xx.o sleep34xx.o cpuidle34xx.o
53 53 obj-$(CONFIG_PM_DEBUG) += pm-debug.o
54 54  
arch/arm/mach-omap2/clock.h
Diff comments   View file @ 088ef95
... ... @@ -129,7 +129,7 @@
129 129 extern const struct clksel_rate gpt_sys_rates[];
130 130 extern const struct clksel_rate gfx_l3_rates[];
131 131  
132   -#if defined(CONFIG_ARCH_OMAP24XX) && defined(CONFIG_CPU_FREQ)
  132 +#if defined(CONFIG_ARCH_OMAP2) && defined(CONFIG_CPU_FREQ)
133 133 extern void omap2_clk_init_cpufreq_table(struct cpufreq_frequency_table **table);
134 134 extern void omap2_clk_exit_cpufreq_table(struct cpufreq_frequency_table **table);
135 135 #else
arch/arm/mach-omap2/clockdomains.h
Diff comments   View file @ 088ef95
... ... @@ -84,7 +84,7 @@
84 84  
85 85 /* 24XX-specific possible dependencies */
86 86  
87   -#ifdef CONFIG_ARCH_OMAP24XX
  87 +#ifdef CONFIG_ARCH_OMAP2
88 88  
89 89 /* Wakeup dependency source arrays */
90 90  
arch/arm/mach-omap2/io.c
Diff comments   View file @ 088ef95
... ... @@ -55,7 +55,7 @@
55 55 * default mapping provided here.
56 56 */
57 57  
58   -#ifdef CONFIG_ARCH_OMAP24XX
  58 +#ifdef CONFIG_ARCH_OMAP2
59 59 static struct map_desc omap24xx_io_desc[] __initdata = {
60 60 {
61 61 .virtual = L3_24XX_VIRT,
arch/arm/mach-omap2/mux.c
Diff comments   View file @ 088ef95
... ... @@ -75,7 +75,7 @@
75 75 }
76 76 }
77 77  
78   -#if defined(CONFIG_ARCH_OMAP24XX) && defined(CONFIG_OMAP_MUX)
  78 +#if defined(CONFIG_ARCH_OMAP2) && defined(CONFIG_OMAP_MUX)
79 79  
80 80 static struct omap_mux_cfg arch_mux_cfg;
81 81  
arch/arm/mach-omap2/powerdomains24xx.h
Diff comments   View file @ 088ef95
... ... @@ -30,7 +30,7 @@
30 30  
31 31 /* 24XX powerdomains and dependencies */
32 32  
33   -#ifdef CONFIG_ARCH_OMAP24XX
  33 +#ifdef CONFIG_ARCH_OMAP2
34 34  
35 35 /* Powerdomains */
36 36  
... ... @@ -82,7 +82,7 @@
82 82 },
83 83 };
84 84  
85   -#endif /* CONFIG_ARCH_OMAP24XX */
  85 +#endif /* CONFIG_ARCH_OMAP2 */
86 86  
87 87  
88 88  
arch/arm/plat-omap/Kconfig
Diff comments   View file @ 088ef95
... ... @@ -124,7 +124,7 @@
124 124  
125 125 config OMAP_32K_TIMER
126 126 bool "Use 32KHz timer"
127   - depends on ARCH_OMAP16XX || ARCH_OMAP24XX || ARCH_OMAP34XX || ARCH_OMAP4
  127 + depends on ARCH_OMAP16XX || ARCH_OMAP2 || ARCH_OMAP34XX || ARCH_OMAP4
128 128 help
129 129 Select this option if you want to enable the OMAP 32KHz timer.
130 130 This timer saves power compared to the OMAP_MPU_TIMER, and has
... ... @@ -145,7 +145,7 @@
145 145  
146 146 config OMAP_DM_TIMER
147 147 bool "Use dual-mode timer"
148   - depends on ARCH_OMAP16XX || ARCH_OMAP24XX || ARCH_OMAP34XX || ARCH_OMAP4
  148 + depends on ARCH_OMAP16XX || ARCH_OMAP2 || ARCH_OMAP34XX || ARCH_OMAP4
149 149 help
150 150 Select this option if you want to use OMAP Dual-Mode timers.
151 151  
arch/arm/plat-omap/devices.c
Diff comments   View file @ 088ef95
... ... @@ -244,7 +244,7 @@
244 244  
245 245 #if defined(CONFIG_HW_RANDOM_OMAP) || defined(CONFIG_HW_RANDOM_OMAP_MODULE)
246 246  
247   -#ifdef CONFIG_ARCH_OMAP24XX
  247 +#ifdef CONFIG_ARCH_OMAP2
248 248 #define OMAP_RNG_BASE 0x480A0000
249 249 #else
250 250 #define OMAP_RNG_BASE 0xfffe5000
arch/arm/plat-omap/gpio.c
Diff comments   View file @ 088ef95
... ... @@ -177,12 +177,12 @@
177 177 u16 irq;
178 178 u16 virtual_irq_start;
179 179 int method;
180   -#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP24XX) || \
  180 +#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2) || \
181 181 defined(CONFIG_ARCH_OMAP34XX) || defined(CONFIG_ARCH_OMAP4)
182 182 u32 suspend_wakeup;
183 183 u32 saved_wakeup;
184 184 #endif
185   -#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \
  185 +#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) || \
186 186 defined(CONFIG_ARCH_OMAP4)
187 187 u32 non_wakeup_gpios;
188 188 u32 enabled_non_wakeup_gpios;
... ... @@ -248,7 +248,7 @@
248 248 };
249 249 #endif
250 250  
251   -#ifdef CONFIG_ARCH_OMAP24XX
  251 +#ifdef CONFIG_ARCH_OMAP2
252 252  
253 253 static struct gpio_bank gpio_bank_242x[4] = {
254 254 { OMAP242X_GPIO1_BASE, NULL, INT_24XX_GPIO_BANK1, IH_GPIO_BASE,
... ... @@ -426,7 +426,7 @@
426 426 reg += OMAP7XX_GPIO_DIR_CONTROL;
427 427 break;
428 428 #endif
429   -#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
  429 +#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX)
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_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
  496 +#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX)
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_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
  549 +#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX)
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_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \
  595 +#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) || \
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_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \
  687 +#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) || \
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_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \
  859 +#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) || \
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_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
  940 +#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX)
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_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
  957 +#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX)
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_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
  1011 +#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX)
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_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
  1080 +#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX)
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_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \
  1134 +#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) || \
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_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \
  1230 +#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) || \
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_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
  1289 +#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX)
1290 1290 if (bank->method == METHOD_GPIO_24XX)
1291 1291 isr_reg = bank->base + OMAP24XX_GPIO_IRQSTATUS1;
1292 1292 #endif
... ... @@ -1756,7 +1756,7 @@
1756 1756 bank_size = SZ_2K;
1757 1757 }
1758 1758 #endif
1759   -#ifdef CONFIG_ARCH_OMAP24XX
  1759 +#ifdef CONFIG_ARCH_OMAP2
1760 1760 if (cpu_is_omap242x()) {
1761 1761 gpio_bank_count = 4;
1762 1762 gpio_bank = gpio_bank_242x;
... ... @@ -1809,7 +1809,7 @@
1809 1809 gpio_count = 32; /* 7xx has 32-bit GPIOs */
1810 1810 }
1811 1811  
1812   -#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \
  1812 +#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) || \
1813 1813 defined(CONFIG_ARCH_OMAP4)
1814 1814 if (bank->method == METHOD_GPIO_24XX) {
1815 1815 static const u32 non_wakeup_gpios[] = {
... ... @@ -1903,7 +1903,7 @@
1903 1903 return 0;
1904 1904 }
1905 1905  
1906   -#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP24XX) || \
  1906 +#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2) || \
1907 1907 defined(CONFIG_ARCH_OMAP34XX) || defined(CONFIG_ARCH_OMAP4)
1908 1908 static int omap_gpio_suspend(struct sys_device *dev, pm_message_t mesg)
1909 1909 {
... ... @@ -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_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
  1930 +#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX)
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_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
  1978 +#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX)
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_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \
  2016 +#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) || \
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_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
  2033 +#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX)
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_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
  2048 +#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX)
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_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
  2077 +#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX)
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_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
  2116 +#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX)
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 +
... ... @@ -2240,7 +2240,7 @@
2240 2240  
2241 2241 mpuio_init();
2242 2242  
2243   -#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP24XX) || \
  2243 +#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2) || \
2244 2244 defined(CONFIG_ARCH_OMAP34XX) || defined(CONFIG_ARCH_OMAP4)
2245 2245 if (cpu_is_omap16xx() || cpu_class_is_omap2()) {
2246 2246 if (ret == 0) {
... ... @@ -2300,7 +2300,7 @@
2300 2300 /* FIXME for at least omap2, show pullup/pulldown state */
2301 2301  
2302 2302 irqstat = irq_desc[irq].status;
2303   -#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP24XX) || \
  2303 +#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2) || \
2304 2304 defined(CONFIG_ARCH_OMAP34XX) || defined(CONFIG_ARCH_OMAP4)
2305 2305 if (is_in && ((bank->suspend_wakeup & mask)
2306 2306 || irqstat & IRQ_TYPE_SENSE_MASK)) {
arch/arm/plat-omap/i2c.c
Diff comments   View file @ 088ef95
... ... @@ -50,7 +50,7 @@
50 50  
51 51 static struct resource i2c_resources[][2] = {
52 52 { I2C_RESOURCE_BUILDER(0, 0) },
53   -#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
  53 +#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX)
54 54 { I2C_RESOURCE_BUILDER(OMAP2_I2C_BASE2, INT_24XX_I2C2_IRQ) },
55 55 #endif
56 56 #if defined(CONFIG_ARCH_OMAP34XX)
... ... @@ -72,7 +72,7 @@
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_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
  75 +#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX)
76 76 I2C_DEV_BUILDER(2, i2c_resources[1], &i2c_rate[1]),
77 77 #endif
78 78 #if defined(CONFIG_ARCH_OMAP34XX)
arch/arm/plat-omap/include/plat/cpu.h
Diff comments   View file @ 088ef95
... ... @@ -114,7 +114,7 @@
114 114 # define OMAP_NAME omap16xx
115 115 # endif
116 116 #endif
117   -#if (defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX))
  117 +#if (defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX))
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
... ... @@ -233,7 +233,7 @@
233 233 #endif
234 234  
235 235 #if defined(MULTI_OMAP2)
236   -# if defined(CONFIG_ARCH_OMAP24XX)
  236 +# if defined(CONFIG_ARCH_OMAP2)
237 237 # undef cpu_is_omap24xx
238 238 # undef cpu_is_omap242x
239 239 # undef cpu_is_omap243x
... ... @@ -248,7 +248,7 @@
248 248 # define cpu_is_omap343x() is_omap343x()
249 249 # endif
250 250 #else
251   -# if defined(CONFIG_ARCH_OMAP24XX)
  251 +# if defined(CONFIG_ARCH_OMAP2)
252 252 # undef cpu_is_omap24xx
253 253 # define cpu_is_omap24xx() 1
254 254 # endif
... ... @@ -374,7 +374,7 @@
374 374 # define cpu_is_omap1710() is_omap1710()
375 375 #endif
376 376  
377   -#if defined(CONFIG_ARCH_OMAP24XX)
  377 +#if defined(CONFIG_ARCH_OMAP2)
378 378 # undef cpu_is_omap2420
379 379 # undef cpu_is_omap2422
380 380 # undef cpu_is_omap2423
arch/arm/plat-omap/include/plat/mcbsp.h
Diff comments   View file @ 088ef95
... ... @@ -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_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) || \
  106 +#elif defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX) || \
107 107 defined(CONFIG_ARCH_OMAP4)
108 108  
109 109 #define OMAP_MCBSP_REG_DRR2 0x00
arch/arm/plat-omap/include/plat/menelaus.h
Diff comments   View file @ 088ef95
... ... @@ -40,7 +40,7 @@
40 40  
41 41 extern int menelaus_set_regulator_sleep(int enable, u32 val);
42 42  
43   -#if defined(CONFIG_ARCH_OMAP24XX) && defined(CONFIG_MENELAUS)
  43 +#if defined(CONFIG_ARCH_OMAP2) && defined(CONFIG_MENELAUS)
44 44 #define omap_has_menelaus() 1
45 45 #else
46 46 #define omap_has_menelaus() 0
arch/arm/plat-omap/include/plat/mux.h
Diff comments   View file @ 088ef95
... ... @@ -135,7 +135,7 @@
135 135 const unsigned int mux_reg;
136 136 unsigned char debug;
137 137  
138   -#if defined(CONFIG_ARCH_OMAP1) || defined(CONFIG_ARCH_OMAP24XX)
  138 +#if defined(CONFIG_ARCH_OMAP1) || defined(CONFIG_ARCH_OMAP2)
139 139 const unsigned char mask_offset;
140 140 const unsigned char mask;
141 141  
arch/arm/plat-omap/include/plat/omap24xx.h
Diff comments   View file @ 088ef95
... ... @@ -23,8 +23,8 @@
23 23 *
24 24 */
25 25  
26   -#ifndef __ASM_ARCH_OMAP24XX_H
27   -#define __ASM_ARCH_OMAP24XX_H
  26 +#ifndef __ASM_ARCH_OMAP2_H
  27 +#define __ASM_ARCH_OMAP2_H
28 28  
29 29 /*
30 30 * Please place only base defines here and put the rest in device
... ... @@ -85,5 +85,5 @@
85 85 #define OMAP24XX_SEC_AES_BASE (OMAP24XX_SEC_BASE + 0x6000)
86 86 #define OMAP24XX_SEC_PKA_BASE (OMAP24XX_SEC_BASE + 0x8000)
87 87  
88   -#endif /* __ASM_ARCH_OMAP24XX_H */
  88 +#endif /* __ASM_ARCH_OMAP2_H */
arch/arm/plat-omap/sram.c
Diff comments   View file @ 088ef95
... ... @@ -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_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
  56 +#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX)
57 57 #define SRAM_BOOTLOADER_SZ 0x00
58 58 #else
59 59 #define SRAM_BOOTLOADER_SZ 0x80
drivers/char/hw_random/Kconfig
Diff comments   View file @ 088ef95
... ... @@ -114,7 +114,7 @@
114 114  
115 115 config HW_RANDOM_OMAP
116 116 tristate "OMAP Random Number Generator support"
117   - depends on HW_RANDOM && (ARCH_OMAP16XX || ARCH_OMAP24XX)
  117 + depends on HW_RANDOM && (ARCH_OMAP16XX || ARCH_OMAP2)
118 118 default HW_RANDOM
119 119 ---help---
120 120 This driver provides kernel-side support for the Random Number
... ... @@ -94,7 +94,7 @@
94 94  
95 95 config MENELAUS
96 96 bool "Texas Instruments TWL92330/Menelaus PM chip"
97   - depends on I2C=y && ARCH_OMAP24XX
  97 + depends on I2C=y && ARCH_OMAP2
98 98 help
99 99 If you say yes here you get support for the Texas Instruments
100 100 TWL92330/Menelaus Power Management chip. This include voltage
drivers/net/smc911x.h
Diff comments   View file @ 088ef95
... ... @@ -47,7 +47,7 @@
47 47 #define SMC_USE_32BIT 1
48 48 #define SMC_IRQ_SENSE IRQF_TRIGGER_LOW
49 49 #define SMC_MEM_RESERVED 1
50   -#elif defined(CONFIG_ARCH_OMAP24XX)
  50 +#elif defined(CONFIG_ARCH_OMAP2)
51 51 #define SMC_USE_16BIT 0
52 52 #define SMC_USE_32BIT 1
53 53 #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_OMAP24XX || ARCH_OMAP34XX
  167 + depends on ARCH_OMAP2 || ARCH_OMAP34XX
168 168 help
169 169 SPI master controller for OMAP24xx/OMAP34xx Multichannel SPI
170 170 (McSPI) modules.
drivers/watchdog/Kconfig
Diff comments   View file @ 088ef95
... ... @@ -194,7 +194,7 @@
194 194  
195 195 config OMAP_WATCHDOG
196 196 tristate "OMAP Watchdog"
197   - depends on ARCH_OMAP16XX || ARCH_OMAP24XX || ARCH_OMAP34XX
  197 + depends on ARCH_OMAP16XX || ARCH_OMAP2 || ARCH_OMAP34XX
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 @ 088ef95
... ... @@ -82,7 +82,7 @@
82 82 static const unsigned long omap1_mcbsp_port[][2] = {};
83 83 #endif
84 84  
85   -#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
  85 +#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP34XX)
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 },