summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-spear3xx/spear300.c
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2012-03-10 22:21:36 -0800
committerKukjin Kim <kgene.kim@samsung.com>2012-03-10 22:21:36 -0800
commitc15a04338b5a6d4305d107a5b6c0cd43418b7f3e (patch)
tree04d40a3b4fbc0477aa71c11044a20ff2d6666004 /arch/arm/mach-spear3xx/spear300.c
parent192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d (diff)
parent60571f98d292b74586ff8330d8bc965eb01e8df0 (diff)
downloadop-kernel-dev-c15a04338b5a6d4305d107a5b6c0cd43418b7f3e.zip
op-kernel-dev-c15a04338b5a6d4305d107a5b6c0cd43418b7f3e.tar.gz
Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock
Diffstat (limited to 'arch/arm/mach-spear3xx/spear300.c')
-rw-r--r--arch/arm/mach-spear3xx/spear300.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/arch/arm/mach-spear3xx/spear300.c b/arch/arm/mach-spear3xx/spear300.c
index a5e46b4..9da50e281 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,
OpenPOWER on IntegriCloud