aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2013-10-18 11:54:16 -0400
committerKevin Hilman <khilman@linaro.org>2013-10-18 13:50:51 -0400
commitffd076eea3226e792b2087018733bd794e8c9666 (patch)
tree342730b45fbfbf39970292baefbb22f2b8eace75
parent9657b772e9051232b686500314cc465fa0782ead (diff)
ARM: OMAP1: Fix a bunch of GPIO related section warnings after initdata got corrected
Commit f8e7ba66 (ARM: OMAP1: fix incorrect placement of __initdata tag) fixed things but we started seeing section warnings. Looks like I missed those in my automatic build scripts: Section mismatch in reference from the variable omap7xx_gpio6 to the (unknown reference) .init.data:(unknown) Section mismatch in reference from the variable omap7xx_gpio6 to the (unknown reference) .init.data:(unknown) Section mismatch in reference from the variable omap7xx_gpio5 to the (unknown reference) .init.data:(unknown) ... Fix the issue by removing __initdata for the resources. Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Kevin Hilman <khilman@linaro.org>
-rw-r--r--arch/arm/mach-omap1/gpio15xx.c8
-rw-r--r--arch/arm/mach-omap1/gpio16xx.c20
-rw-r--r--arch/arm/mach-omap1/gpio7xx.c28
3 files changed, 28 insertions, 28 deletions
diff --git a/arch/arm/mach-omap1/gpio15xx.c b/arch/arm/mach-omap1/gpio15xx.c
index 420e94bfdc6e..312a0924d786 100644
--- a/arch/arm/mach-omap1/gpio15xx.c
+++ b/arch/arm/mach-omap1/gpio15xx.c
@@ -25,7 +25,7 @@
25#define OMAP1510_GPIO_BASE 0xFFFCE000 25#define OMAP1510_GPIO_BASE 0xFFFCE000
26 26
27/* gpio1 */ 27/* gpio1 */
28static struct resource omap15xx_mpu_gpio_resources[] __initdata = { 28static struct resource omap15xx_mpu_gpio_resources[] = {
29 { 29 {
30 .start = OMAP1_MPUIO_VBASE, 30 .start = OMAP1_MPUIO_VBASE,
31 .end = OMAP1_MPUIO_VBASE + SZ_2K - 1, 31 .end = OMAP1_MPUIO_VBASE + SZ_2K - 1,
@@ -48,7 +48,7 @@ static struct omap_gpio_reg_offs omap15xx_mpuio_regs = {
48 .irqctrl = OMAP_MPUIO_GPIO_INT_EDGE, 48 .irqctrl = OMAP_MPUIO_GPIO_INT_EDGE,
49}; 49};
50 50
51static struct omap_gpio_platform_data omap15xx_mpu_gpio_config __initdata = { 51static struct omap_gpio_platform_data omap15xx_mpu_gpio_config = {
52 .is_mpuio = true, 52 .is_mpuio = true,
53 .bank_width = 16, 53 .bank_width = 16,
54 .bank_stride = 1, 54 .bank_stride = 1,
@@ -66,7 +66,7 @@ static struct platform_device omap15xx_mpu_gpio = {
66}; 66};
67 67
68/* gpio2 */ 68/* gpio2 */
69static struct resource omap15xx_gpio_resources[] __initdata = { 69static struct resource omap15xx_gpio_resources[] = {
70 { 70 {
71 .start = OMAP1510_GPIO_BASE, 71 .start = OMAP1510_GPIO_BASE,
72 .end = OMAP1510_GPIO_BASE + SZ_2K - 1, 72 .end = OMAP1510_GPIO_BASE + SZ_2K - 1,
@@ -90,7 +90,7 @@ static struct omap_gpio_reg_offs omap15xx_gpio_regs = {
90 .pinctrl = OMAP1510_GPIO_PIN_CONTROL, 90 .pinctrl = OMAP1510_GPIO_PIN_CONTROL,
91}; 91};
92 92
93static struct omap_gpio_platform_data omap15xx_gpio_config __initdata = { 93static struct omap_gpio_platform_data omap15xx_gpio_config = {
94 .bank_width = 16, 94 .bank_width = 16,
95 .regs = &omap15xx_gpio_regs, 95 .regs = &omap15xx_gpio_regs,
96}; 96};
diff --git a/arch/arm/mach-omap1/gpio16xx.c b/arch/arm/mach-omap1/gpio16xx.c
index 16e7fcf63edf..6e6ec93dcbb3 100644
--- a/arch/arm/mach-omap1/gpio16xx.c
+++ b/arch/arm/mach-omap1/gpio16xx.c
@@ -31,7 +31,7 @@
31#define SYSCONFIG_WORD 0x14 31#define SYSCONFIG_WORD 0x14
32 32
33/* mpu gpio */ 33/* mpu gpio */
34static struct resource omap16xx_mpu_gpio_resources[] __initdata = { 34static struct resource omap16xx_mpu_gpio_resources[] = {
35 { 35 {
36 .start = OMAP1_MPUIO_VBASE, 36 .start = OMAP1_MPUIO_VBASE,
37 .end = OMAP1_MPUIO_VBASE + SZ_2K - 1, 37 .end = OMAP1_MPUIO_VBASE + SZ_2K - 1,
@@ -54,7 +54,7 @@ static struct omap_gpio_reg_offs omap16xx_mpuio_regs = {
54 .irqctrl = OMAP_MPUIO_GPIO_INT_EDGE, 54 .irqctrl = OMAP_MPUIO_GPIO_INT_EDGE,
55}; 55};
56 56
57static struct omap_gpio_platform_data omap16xx_mpu_gpio_config __initdata = { 57static struct omap_gpio_platform_data omap16xx_mpu_gpio_config = {
58 .is_mpuio = true, 58 .is_mpuio = true,
59 .bank_width = 16, 59 .bank_width = 16,
60 .bank_stride = 1, 60 .bank_stride = 1,
@@ -72,7 +72,7 @@ static struct platform_device omap16xx_mpu_gpio = {
72}; 72};
73 73
74/* gpio1 */ 74/* gpio1 */
75static struct resource omap16xx_gpio1_resources[] __initdata = { 75static struct resource omap16xx_gpio1_resources[] = {
76 { 76 {
77 .start = OMAP1610_GPIO1_BASE, 77 .start = OMAP1610_GPIO1_BASE,
78 .end = OMAP1610_GPIO1_BASE + SZ_2K - 1, 78 .end = OMAP1610_GPIO1_BASE + SZ_2K - 1,
@@ -100,7 +100,7 @@ static struct omap_gpio_reg_offs omap16xx_gpio_regs = {
100 .edgectrl2 = OMAP1610_GPIO_EDGE_CTRL2, 100 .edgectrl2 = OMAP1610_GPIO_EDGE_CTRL2,
101}; 101};
102 102
103static struct omap_gpio_platform_data omap16xx_gpio1_config __initdata = { 103static struct omap_gpio_platform_data omap16xx_gpio1_config = {
104 .bank_width = 16, 104 .bank_width = 16,
105 .regs = &omap16xx_gpio_regs, 105 .regs = &omap16xx_gpio_regs,
106}; 106};
@@ -116,7 +116,7 @@ static struct platform_device omap16xx_gpio1 = {
116}; 116};
117 117
118/* gpio2 */ 118/* gpio2 */
119static struct resource omap16xx_gpio2_resources[] __initdata = { 119static struct resource omap16xx_gpio2_resources[] = {
120 { 120 {
121 .start = OMAP1610_GPIO2_BASE, 121 .start = OMAP1610_GPIO2_BASE,
122 .end = OMAP1610_GPIO2_BASE + SZ_2K - 1, 122 .end = OMAP1610_GPIO2_BASE + SZ_2K - 1,
@@ -128,7 +128,7 @@ static struct resource omap16xx_gpio2_resources[] __initdata = {
128 }, 128 },
129}; 129};
130 130
131static struct omap_gpio_platform_data omap16xx_gpio2_config __initdata = { 131static struct omap_gpio_platform_data omap16xx_gpio2_config = {
132 .bank_width = 16, 132 .bank_width = 16,
133 .regs = &omap16xx_gpio_regs, 133 .regs = &omap16xx_gpio_regs,
134}; 134};
@@ -144,7 +144,7 @@ static struct platform_device omap16xx_gpio2 = {
144}; 144};
145 145
146/* gpio3 */ 146/* gpio3 */
147static struct resource omap16xx_gpio3_resources[] __initdata = { 147static struct resource omap16xx_gpio3_resources[] = {
148 { 148 {
149 .start = OMAP1610_GPIO3_BASE, 149 .start = OMAP1610_GPIO3_BASE,
150 .end = OMAP1610_GPIO3_BASE + SZ_2K - 1, 150 .end = OMAP1610_GPIO3_BASE + SZ_2K - 1,
@@ -156,7 +156,7 @@ static struct resource omap16xx_gpio3_resources[] __initdata = {
156 }, 156 },
157}; 157};
158 158
159static struct omap_gpio_platform_data omap16xx_gpio3_config __initdata = { 159static struct omap_gpio_platform_data omap16xx_gpio3_config = {
160 .bank_width = 16, 160 .bank_width = 16,
161 .regs = &omap16xx_gpio_regs, 161 .regs = &omap16xx_gpio_regs,
162}; 162};
@@ -172,7 +172,7 @@ static struct platform_device omap16xx_gpio3 = {
172}; 172};
173 173
174/* gpio4 */ 174/* gpio4 */
175static struct resource omap16xx_gpio4_resources[] __initdata = { 175static struct resource omap16xx_gpio4_resources[] = {
176 { 176 {
177 .start = OMAP1610_GPIO4_BASE, 177 .start = OMAP1610_GPIO4_BASE,
178 .end = OMAP1610_GPIO4_BASE + SZ_2K - 1, 178 .end = OMAP1610_GPIO4_BASE + SZ_2K - 1,
@@ -184,7 +184,7 @@ static struct resource omap16xx_gpio4_resources[] __initdata = {
184 }, 184 },
185}; 185};
186 186
187static struct omap_gpio_platform_data omap16xx_gpio4_config __initdata = { 187static struct omap_gpio_platform_data omap16xx_gpio4_config = {
188 .bank_width = 16, 188 .bank_width = 16,
189 .regs = &omap16xx_gpio_regs, 189 .regs = &omap16xx_gpio_regs,
190}; 190};
diff --git a/arch/arm/mach-omap1/gpio7xx.c b/arch/arm/mach-omap1/gpio7xx.c
index 8136fdc89130..4612d2506a2d 100644
--- a/arch/arm/mach-omap1/gpio7xx.c
+++ b/arch/arm/mach-omap1/gpio7xx.c
@@ -30,7 +30,7 @@
30#define OMAP1_MPUIO_VBASE OMAP1_MPUIO_BASE 30#define OMAP1_MPUIO_VBASE OMAP1_MPUIO_BASE
31 31
32/* mpu gpio */ 32/* mpu gpio */
33static struct resource omap7xx_mpu_gpio_resources[] __initdata = { 33static struct resource omap7xx_mpu_gpio_resources[] = {
34 { 34 {
35 .start = OMAP1_MPUIO_VBASE, 35 .start = OMAP1_MPUIO_VBASE,
36 .end = OMAP1_MPUIO_VBASE + SZ_2K - 1, 36 .end = OMAP1_MPUIO_VBASE + SZ_2K - 1,
@@ -53,7 +53,7 @@ static struct omap_gpio_reg_offs omap7xx_mpuio_regs = {
53 .irqctrl = OMAP_MPUIO_GPIO_INT_EDGE >> 1, 53 .irqctrl = OMAP_MPUIO_GPIO_INT_EDGE >> 1,
54}; 54};
55 55
56static struct omap_gpio_platform_data omap7xx_mpu_gpio_config __initdata = { 56static struct omap_gpio_platform_data omap7xx_mpu_gpio_config = {
57 .is_mpuio = true, 57 .is_mpuio = true,
58 .bank_width = 16, 58 .bank_width = 16,
59 .bank_stride = 2, 59 .bank_stride = 2,
@@ -71,7 +71,7 @@ static struct platform_device omap7xx_mpu_gpio = {
71}; 71};
72 72
73/* gpio1 */ 73/* gpio1 */
74static struct resource omap7xx_gpio1_resources[] __initdata = { 74static struct resource omap7xx_gpio1_resources[] = {
75 { 75 {
76 .start = OMAP7XX_GPIO1_BASE, 76 .start = OMAP7XX_GPIO1_BASE,
77 .end = OMAP7XX_GPIO1_BASE + SZ_2K - 1, 77 .end = OMAP7XX_GPIO1_BASE + SZ_2K - 1,
@@ -94,7 +94,7 @@ static struct omap_gpio_reg_offs omap7xx_gpio_regs = {
94 .irqctrl = OMAP7XX_GPIO_INT_CONTROL, 94 .irqctrl = OMAP7XX_GPIO_INT_CONTROL,
95}; 95};
96 96
97static struct omap_gpio_platform_data omap7xx_gpio1_config __initdata = { 97static struct omap_gpio_platform_data omap7xx_gpio1_config = {
98 .bank_width = 32, 98 .bank_width = 32,
99 .regs = &omap7xx_gpio_regs, 99 .regs = &omap7xx_gpio_regs,
100}; 100};
@@ -110,7 +110,7 @@ static struct platform_device omap7xx_gpio1 = {
110}; 110};
111 111
112/* gpio2 */ 112/* gpio2 */
113static struct resource omap7xx_gpio2_resources[] __initdata = { 113static struct resource omap7xx_gpio2_resources[] = {
114 { 114 {
115 .start = OMAP7XX_GPIO2_BASE, 115 .start = OMAP7XX_GPIO2_BASE,
116 .end = OMAP7XX_GPIO2_BASE + SZ_2K - 1, 116 .end = OMAP7XX_GPIO2_BASE + SZ_2K - 1,
@@ -122,7 +122,7 @@ static struct resource omap7xx_gpio2_resources[] __initdata = {
122 }, 122 },
123}; 123};
124 124
125static struct omap_gpio_platform_data omap7xx_gpio2_config __initdata = { 125static struct omap_gpio_platform_data omap7xx_gpio2_config = {
126 .bank_width = 32, 126 .bank_width = 32,
127 .regs = &omap7xx_gpio_regs, 127 .regs = &omap7xx_gpio_regs,
128}; 128};
@@ -138,7 +138,7 @@ static struct platform_device omap7xx_gpio2 = {
138}; 138};
139 139
140/* gpio3 */ 140/* gpio3 */
141static struct resource omap7xx_gpio3_resources[] __initdata = { 141static struct resource omap7xx_gpio3_resources[] = {
142 { 142 {
143 .start = OMAP7XX_GPIO3_BASE, 143 .start = OMAP7XX_GPIO3_BASE,
144 .end = OMAP7XX_GPIO3_BASE + SZ_2K - 1, 144 .end = OMAP7XX_GPIO3_BASE + SZ_2K - 1,
@@ -150,7 +150,7 @@ static struct resource omap7xx_gpio3_resources[] __initdata = {
150 }, 150 },
151}; 151};
152 152
153static struct omap_gpio_platform_data omap7xx_gpio3_config __initdata = { 153static struct omap_gpio_platform_data omap7xx_gpio3_config = {
154 .bank_width = 32, 154 .bank_width = 32,
155 .regs = &omap7xx_gpio_regs, 155 .regs = &omap7xx_gpio_regs,
156}; 156};
@@ -166,7 +166,7 @@ static struct platform_device omap7xx_gpio3 = {
166}; 166};
167 167
168/* gpio4 */ 168/* gpio4 */
169static struct resource omap7xx_gpio4_resources[] __initdata = { 169static struct resource omap7xx_gpio4_resources[] = {
170 { 170 {
171 .start = OMAP7XX_GPIO4_BASE, 171 .start = OMAP7XX_GPIO4_BASE,
172 .end = OMAP7XX_GPIO4_BASE + SZ_2K - 1, 172 .end = OMAP7XX_GPIO4_BASE + SZ_2K - 1,
@@ -178,7 +178,7 @@ static struct resource omap7xx_gpio4_resources[] __initdata = {
178 }, 178 },
179}; 179};
180 180
181static struct omap_gpio_platform_data omap7xx_gpio4_config __initdata = { 181static struct omap_gpio_platform_data omap7xx_gpio4_config = {
182 .bank_width = 32, 182 .bank_width = 32,
183 .regs = &omap7xx_gpio_regs, 183 .regs = &omap7xx_gpio_regs,
184}; 184};
@@ -194,7 +194,7 @@ static struct platform_device omap7xx_gpio4 = {
194}; 194};
195 195
196/* gpio5 */ 196/* gpio5 */
197static struct resource omap7xx_gpio5_resources[] __initdata = { 197static struct resource omap7xx_gpio5_resources[] = {
198 { 198 {
199 .start = OMAP7XX_GPIO5_BASE, 199 .start = OMAP7XX_GPIO5_BASE,
200 .end = OMAP7XX_GPIO5_BASE + SZ_2K - 1, 200 .end = OMAP7XX_GPIO5_BASE + SZ_2K - 1,
@@ -206,7 +206,7 @@ static struct resource omap7xx_gpio5_resources[] __initdata = {
206 }, 206 },
207}; 207};
208 208
209static struct omap_gpio_platform_data omap7xx_gpio5_config __initdata = { 209static struct omap_gpio_platform_data omap7xx_gpio5_config = {
210 .bank_width = 32, 210 .bank_width = 32,
211 .regs = &omap7xx_gpio_regs, 211 .regs = &omap7xx_gpio_regs,
212}; 212};
@@ -222,7 +222,7 @@ static struct platform_device omap7xx_gpio5 = {
222}; 222};
223 223
224/* gpio6 */ 224/* gpio6 */
225static struct resource omap7xx_gpio6_resources[] __initdata = { 225static struct resource omap7xx_gpio6_resources[] = {
226 { 226 {
227 .start = OMAP7XX_GPIO6_BASE, 227 .start = OMAP7XX_GPIO6_BASE,
228 .end = OMAP7XX_GPIO6_BASE + SZ_2K - 1, 228 .end = OMAP7XX_GPIO6_BASE + SZ_2K - 1,
@@ -234,7 +234,7 @@ static struct resource omap7xx_gpio6_resources[] __initdata = {
234 }, 234 },
235}; 235};
236 236
237static struct omap_gpio_platform_data omap7xx_gpio6_config __initdata = { 237static struct omap_gpio_platform_data omap7xx_gpio6_config = {
238 .bank_width = 32, 238 .bank_width = 32,
239 .regs = &omap7xx_gpio_regs, 239 .regs = &omap7xx_gpio_regs,
240}; 240};