diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-10 22:21:36 -0800 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-10 22:21:36 -0800 |
| commit | c15a04338b5a6d4305d107a5b6c0cd43418b7f3e (patch) | |
| tree | 04d40a3b4fbc0477aa71c11044a20ff2d6666004 /arch/arm/mach-spear3xx/spear3xx.c | |
| parent | 192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d (diff) | |
| parent | 60571f98d292b74586ff8330d8bc965eb01e8df0 (diff) | |
Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock
Diffstat (limited to 'arch/arm/mach-spear3xx/spear3xx.c')
| -rw-r--r-- | arch/arm/mach-spear3xx/spear3xx.c | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/arch/arm/mach-spear3xx/spear3xx.c b/arch/arm/mach-spear3xx/spear3xx.c index 10af45da86a..b1733c37f20 100644 --- a/arch/arm/mach-spear3xx/spear3xx.c +++ b/arch/arm/mach-spear3xx/spear3xx.c @@ -28,31 +28,12 @@ static struct pl061_platform_data gpio_plat_data = { .irq_base = SPEAR3XX_GPIO_INT_BASE, }; -struct amba_device spear3xx_gpio_device = { - .dev = { - .init_name = "gpio", - .platform_data = &gpio_plat_data, - }, - .res = { - .start = SPEAR3XX_ICM3_GPIO_BASE, - .end = SPEAR3XX_ICM3_GPIO_BASE + SZ_4K - 1, - .flags = IORESOURCE_MEM, - }, - .irq = {SPEAR3XX_IRQ_BASIC_GPIO, NO_IRQ}, -}; +AMBA_APB_DEVICE(spear3xx_gpio, "gpio", 0, SPEAR3XX_ICM3_GPIO_BASE, + {SPEAR3XX_IRQ_BASIC_GPIO}, &gpio_plat_data); /* uart device registration */ -struct amba_device spear3xx_uart_device = { - .dev = { - .init_name = "uart", - }, - .res = { - .start = SPEAR3XX_ICM1_UART_BASE, - .end = SPEAR3XX_ICM1_UART_BASE + SZ_4K - 1, - .flags = IORESOURCE_MEM, - }, - .irq = {SPEAR3XX_IRQ_UART, NO_IRQ}, -}; +AMBA_APB_DEVICE(spear3xx_uart, "uart", 0, SPEAR3XX_ICM1_UART_BASE, + {SPEAR3XX_IRQ_UART}, NULL); /* Do spear3xx familiy common initialization part here */ void __init spear3xx_init(void) |