History

ARM: at91: gpio make struct at91_gpio_bank an initdata

this will simplify the switch to the DT and later to the platform_device

Jean-Christophe PLAGNIOL-VILLARD committed 15 years ago

Commit 1a2d9151 parent 619d4a48 files · +13 −13Browse files

Unified · Split

8 files
  1. arch/arm/mach-at91/at91cap9.c +1 −1
  2. arch/arm/mach-at91/at91rm9200.c +1 −1
  3. arch/arm/mach-at91/at91sam9260.c +1 −1
  4. arch/arm/mach-at91/at91sam9261.c +1 −1
  5. arch/arm/mach-at91/at91sam9263.c +1 −1
  6. arch/arm/mach-at91/at91sam9g45.c +1 −1
  7. arch/arm/mach-at91/at91sam9rl.c +1 −1
  8. arch/arm/mach-at91/gpio.c +6 −6
arch/arm/mach-at91/at91cap9.c+1−1
@@ -298,7 +298,7 @@ void __init at91cap9_set_console_clock(int id) · 297 unmodified lines
298298 * GPIO
299299 * -------------------------------------------------------------------- */
300300
301−static struct at91_gpio_bank at91cap9_gpio[] = {
301+static struct at91_gpio_bank at91cap9_gpio[] __initdata = {
302302 {
303303 .id = AT91CAP9_ID_PIOABCD,
304304 .regbase = AT91CAP9_BASE_PIOA,
arch/arm/mach-at91/at91rm9200.c+1−1
@@ -273,7 +273,7 @@ void __init at91rm9200_set_console_clock(int id) · 272 unmodified lines
273273 * GPIO
274274 * -------------------------------------------------------------------- */
275275
276−static struct at91_gpio_bank at91rm9200_gpio[] = {
276+static struct at91_gpio_bank at91rm9200_gpio[] __initdata = {
277277 {
278278 .id = AT91RM9200_ID_PIOA,
279279 .regbase = AT91RM9200_BASE_PIOA,
arch/arm/mach-at91/at91sam9260.c+1−1
@@ -274,7 +274,7 @@ void __init at91sam9260_set_console_clock(int id) · 273 unmodified lines
274274 * GPIO
275275 * -------------------------------------------------------------------- */
276276
277−static struct at91_gpio_bank at91sam9260_gpio[] = {
277+static struct at91_gpio_bank at91sam9260_gpio[] __initdata = {
278278 {
279279 .id = AT91SAM9260_ID_PIOA,
280280 .regbase = AT91SAM9260_BASE_PIOA,
arch/arm/mach-at91/at91sam9261.c+1−1
@@ -253,7 +253,7 @@ void __init at91sam9261_set_console_clock(int id) · 252 unmodified lines
253253 * GPIO
254254 * -------------------------------------------------------------------- */
255255
256−static struct at91_gpio_bank at91sam9261_gpio[] = {
256+static struct at91_gpio_bank at91sam9261_gpio[] __initdata = {
257257 {
258258 .id = AT91SAM9261_ID_PIOA,
259259 .regbase = AT91SAM9261_BASE_PIOA,
arch/arm/mach-at91/at91sam9263.c+1−1
@@ -269,7 +269,7 @@ void __init at91sam9263_set_console_clock(int id) · 268 unmodified lines
269269 * GPIO
270270 * -------------------------------------------------------------------- */
271271
272−static struct at91_gpio_bank at91sam9263_gpio[] = {
272+static struct at91_gpio_bank at91sam9263_gpio[] __initdata = {
273273 {
274274 .id = AT91SAM9263_ID_PIOA,
275275 .regbase = AT91SAM9263_BASE_PIOA,
arch/arm/mach-at91/at91sam9g45.c+1−1
@@ -299,7 +299,7 @@ void __init at91sam9g45_set_console_clock(int id) · 298 unmodified lines
299299 * GPIO
300300 * -------------------------------------------------------------------- */
301301
302−static struct at91_gpio_bank at91sam9g45_gpio[] = {
302+static struct at91_gpio_bank at91sam9g45_gpio[] __initdata = {
303303 {
304304 .id = AT91SAM9G45_ID_PIOA,
305305 .regbase = AT91SAM9G45_BASE_PIOA,
arch/arm/mach-at91/at91sam9rl.c+1−1
@@ -246,7 +246,7 @@ void __init at91sam9rl_set_console_clock(int id) · 245 unmodified lines
246246 * GPIO
247247 * -------------------------------------------------------------------- */
248248
249−static struct at91_gpio_bank at91sam9rl_gpio[] = {
249+static struct at91_gpio_bank at91sam9rl_gpio[] __initdata = {
250250 {
251251 .id = AT91SAM9RL_ID_PIOA,
252252 .regbase = AT91SAM9RL_BASE_PIOA,
arch/arm/mach-at91/gpio.c+6−6
@@ -29,7 +29,7 @@ · 28 unmodified lines
2929 struct at91_gpio_chip {
3030 struct gpio_chip chip;
3131 struct at91_gpio_chip *next; /* Bank sharing same clock */
32− struct at91_gpio_bank *bank; /* Bank definition */
32+ int id; /* ID of register bank */
3333 void __iomem *regbase; /* Base of register bank */
3434 struct clk *clock; /* associated clock */
3535 };
@@ -286,7 +286,7 @@ static int gpio_irq_set_wake(struct irq_data *d, unsigned state) · 250 unmodified lines
286286 else
287287 wakeups[bank] &= ~mask;
288288
289− irq_set_irq_wake(gpio_chip[bank].bank->id, state);
289+ irq_set_irq_wake(gpio_chip[bank].id, state);
290290
291291 return 0;
292292 }
@@ -498,7 +498,7 @@ void __init at91_gpio_irq_setup(void) · 205 unmodified lines
498498 for (pioc = 0, pin = PIN_BASE, this = gpio_chip, prev = NULL;
499499 pioc++ < gpio_banks;
500500 prev = this, this++) {
501− unsigned id = this->bank->id;
501+ unsigned id = this->id;
502502 unsigned i;
503503
504504 __raw_writel(~0, this->regbase + PIO_IDR);
@@ -613,10 +613,10 @@ void __init at91_gpio_init(struct at91_gpio_bank *data, int nr_banks) · 108 unmodified lines
613613 for (i = 0; i < nr_banks; i++) {
614614 at91_gpio = &gpio_chip[i];
615615
616− at91_gpio->bank = &data[i];
616+ at91_gpio->id = data[i].id;
617617 at91_gpio->chip.base = PIN_BASE + i * 32;
618618
619− at91_gpio->regbase = ioremap(at91_gpio->bank->regbase, 512);
619+ at91_gpio->regbase = ioremap(data[i].regbase, 512);
620620 if (!at91_gpio->regbase) {
621621 pr_err("at91_gpio.%d, failed to map registers, ignoring.\n", i);
622622 continue;
@@ -632,7 +632,7 @@ void __init at91_gpio_init(struct at91_gpio_bank *data, int nr_banks) · 9 unmodified lines
632632 clk_enable(at91_gpio->clock);
633633
634634 /* AT91SAM9263_ID_PIOCDE groups PIOC, PIOD, PIOE */
635− if (last && last->bank->id == at91_gpio->bank->id)
635+ if (last && last->id == at91_gpio->id)
636636 last->next = at91_gpio;
637637 last = at91_gpio;
638638