diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-18 09:50:51 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-26 14:59:28 -0500 |
| commit | 2f64ccd9e0eb5686056f44ffaf5d33c7e9733972 (patch) | |
| tree | a19513404a14cc72b643221cdb994b5ecc3b27e3 /arch/arm/mach-integrator/core.c | |
| parent | 9199340bf02f72eed3ca264a0989ac645b292ca6 (diff) | |
ARM: amba: integrator: use common amba device initializers
Tested-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-integrator/core.c')
| -rw-r--r-- | arch/arm/mach-integrator/core.c | 70 |
1 files changed, 13 insertions, 57 deletions
diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c index 29baef9d8f76..15b87f26ac96 100644 --- a/arch/arm/mach-integrator/core.c +++ b/arch/arm/mach-integrator/core.c | |||
| @@ -35,67 +35,23 @@ | |||
| 35 | 35 | ||
| 36 | static struct amba_pl010_data integrator_uart_data; | 36 | static struct amba_pl010_data integrator_uart_data; |
| 37 | 37 | ||
| 38 | static struct amba_device rtc_device = { | 38 | #define INTEGRATOR_RTC_IRQ { IRQ_RTCINT } |
| 39 | .dev = { | 39 | #define INTEGRATOR_UART0_IRQ { IRQ_UARTINT0 } |
| 40 | .init_name = "mb:15", | 40 | #define INTEGRATOR_UART1_IRQ { IRQ_UARTINT1 } |
| 41 | }, | 41 | #define KMI0_IRQ { IRQ_KMIINT0 } |
| 42 | .res = { | 42 | #define KMI1_IRQ { IRQ_KMIINT1 } |
| 43 | .start = INTEGRATOR_RTC_BASE, | ||
| 44 | .end = INTEGRATOR_RTC_BASE + SZ_4K - 1, | ||
| 45 | .flags = IORESOURCE_MEM, | ||
| 46 | }, | ||
| 47 | .irq = { IRQ_RTCINT }, | ||
| 48 | }; | ||
| 49 | 43 | ||
| 50 | static struct amba_device uart0_device = { | 44 | static AMBA_APB_DEVICE(rtc, "mb:15", 0, |
| 51 | .dev = { | 45 | INTEGRATOR_RTC_BASE, INTEGRATOR_RTC_IRQ, NULL); |
| 52 | .init_name = "mb:16", | ||
| 53 | .platform_data = &integrator_uart_data, | ||
| 54 | }, | ||
| 55 | .res = { | ||
| 56 | .start = INTEGRATOR_UART0_BASE, | ||
| 57 | .end = INTEGRATOR_UART0_BASE + SZ_4K - 1, | ||
| 58 | .flags = IORESOURCE_MEM, | ||
| 59 | }, | ||
| 60 | .irq = { IRQ_UARTINT0 }, | ||
| 61 | }; | ||
| 62 | 46 | ||
| 63 | static struct amba_device uart1_device = { | 47 | static AMBA_APB_DEVICE(uart0, "mb:16", 0, |
| 64 | .dev = { | 48 | INTEGRATOR_UART0_BASE, INTEGRATOR_UART0_IRQ, &integrator_uart_data); |
| 65 | .init_name = "mb:17", | ||
| 66 | .platform_data = &integrator_uart_data, | ||
| 67 | }, | ||
| 68 | .res = { | ||
| 69 | .start = INTEGRATOR_UART1_BASE, | ||
| 70 | .end = INTEGRATOR_UART1_BASE + SZ_4K - 1, | ||
| 71 | .flags = IORESOURCE_MEM, | ||
| 72 | }, | ||
| 73 | .irq = { IRQ_UARTINT1 }, | ||
| 74 | }; | ||
| 75 | 49 | ||
| 76 | static struct amba_device kmi0_device = { | 50 | static AMBA_APB_DEVICE(uart1, "mb:17", 0, |
| 77 | .dev = { | 51 | INTEGRATOR_UART1_BASE, INTEGRATOR_UART1_IRQ, &integrator_uart_data); |
| 78 | .init_name = "mb:18", | ||
| 79 | }, | ||
| 80 | .res = { | ||
| 81 | .start = KMI0_BASE, | ||
| 82 | .end = KMI0_BASE + SZ_4K - 1, | ||
| 83 | .flags = IORESOURCE_MEM, | ||
| 84 | }, | ||
| 85 | .irq = { IRQ_KMIINT0 }, | ||
| 86 | }; | ||
| 87 | 52 | ||
| 88 | static struct amba_device kmi1_device = { | 53 | static AMBA_APB_DEVICE(kmi0, "mb:18", 0, KMI0_BASE, KMI0_IRQ, NULL); |
| 89 | .dev = { | 54 | static AMBA_APB_DEVICE(kmi1, "mb:19", 0, KMI1_BASE, KMI1_IRQ, NULL); |
| 90 | .init_name = "mb:19", | ||
| 91 | }, | ||
| 92 | .res = { | ||
| 93 | .start = KMI1_BASE, | ||
| 94 | .end = KMI1_BASE + SZ_4K - 1, | ||
| 95 | .flags = IORESOURCE_MEM, | ||
| 96 | }, | ||
| 97 | .irq = { IRQ_KMIINT1 }, | ||
| 98 | }; | ||
| 99 | 55 | ||
| 100 | static struct amba_device *amba_devs[] __initdata = { | 56 | static struct amba_device *amba_devs[] __initdata = { |
| 101 | &rtc_device, | 57 | &rtc_device, |