diff options
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2012-02-03 12:32:26 +0100 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2012-02-03 12:32:26 +0100 |
| commit | 57225b76864210d667b935c54babf22b6c31336b (patch) | |
| tree | cce7eab28de00a88d75b8eda704f5838e10947b1 /arch/arm/mach-spear3xx/spear300.c | |
| parent | 62aa2b537c6f5957afd98e29f96897419ed5ebab (diff) | |
| parent | dcf81c1af839b77b44404453ecae6e5ac5a75f05 (diff) | |
| download | blackbird-op-linux-57225b76864210d667b935c54babf22b6c31336b.tar.gz blackbird-op-linux-57225b76864210d667b935c54babf22b6c31336b.zip | |
Merge remote-tracking branch 'armsoc/depends/rmk/for-armsoc' into at91-3.4-base
Conflicts:
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91sam9g45.c
Diffstat (limited to 'arch/arm/mach-spear3xx/spear300.c')
| -rw-r--r-- | arch/arm/mach-spear3xx/spear300.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/arch/arm/mach-spear3xx/spear300.c b/arch/arm/mach-spear3xx/spear300.c index a5e46b4ade20..9da50e281e98 100644 --- a/arch/arm/mach-spear3xx/spear300.c +++ b/arch/arm/mach-spear3xx/spear300.c @@ -430,18 +430,8 @@ static struct pl061_platform_data gpio1_plat_data = { .irq_base = SPEAR300_GPIO1_INT_BASE, }; -struct amba_device spear300_gpio1_device = { - .dev = { - .init_name = "gpio1", - .platform_data = &gpio1_plat_data, - }, - .res = { - .start = SPEAR300_GPIO_BASE, - .end = SPEAR300_GPIO_BASE + SZ_4K - 1, - .flags = IORESOURCE_MEM, - }, - .irq = {SPEAR300_VIRQ_GPIO1, NO_IRQ}, -}; +AMBA_APB_DEVICE(spear300_gpio1, "gpio1", 0, SPEAR300_GPIO_BASE, + {SPEAR300_VIRQ_GPIO1}, &gpio1_plat_data); /* spear300 routines */ void __init spear300_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs, |
