diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-27 06:30:31 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-27 06:30:31 -0400 |
| commit | b0df89868006517417251e02cc4ce5d4b0165885 (patch) | |
| tree | 6800388c633a13f64fd1f7845ce026ca2606522f /arch/arm/mach-integrator/core.c | |
| parent | 4ba21e868f4b6e2ce5432055e206edadc6319533 (diff) | |
| parent | 6c634726352f0d796a4b5e6aa9849ee5b45712ce (diff) | |
Merge branch 'devel-stable' into for-linus
Conflicts:
arch/arm/Kconfig.debug
arch/arm/plat-versatile/Kconfig
Merge fixes:
arch/arm/mach-integrator/Kconfig
drivers/clocksource/Kconfig
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 cba1907c2e1c..304dfb2b346a 100644 --- a/arch/arm/mach-integrator/core.c +++ b/arch/arm/mach-integrator/core.c | |||
| @@ -36,67 +36,23 @@ | |||
| 36 | 36 | ||
| 37 | static struct amba_pl010_data integrator_uart_data; | 37 | static struct amba_pl010_data integrator_uart_data; |
| 38 | 38 | ||
| 39 | static struct amba_device rtc_device = { | 39 | #define INTEGRATOR_RTC_IRQ { IRQ_RTCINT } |
| 40 | .dev = { | 40 | #define INTEGRATOR_UART0_IRQ { IRQ_UARTINT0 } |
| 41 | .init_name = "mb:15", | 41 | #define INTEGRATOR_UART1_IRQ { IRQ_UARTINT1 } |
| 42 | }, | 42 | #define KMI0_IRQ { IRQ_KMIINT0 } |
| 43 | .res = { | 43 | #define KMI1_IRQ { IRQ_KMIINT1 } |
| 44 | .start = INTEGRATOR_RTC_BASE, | ||
| 45 | .end = INTEGRATOR_RTC_BASE + SZ_4K - 1, | ||
| 46 | .flags = IORESOURCE_MEM, | ||
| 47 | }, | ||
| 48 | .irq = { IRQ_RTCINT, NO_IRQ }, | ||
| 49 | }; | ||
| 50 | 44 | ||
| 51 | static struct amba_device uart0_device = { | 45 | static AMBA_APB_DEVICE(rtc, "mb:15", 0, |
| 52 | .dev = { | 46 | INTEGRATOR_RTC_BASE, INTEGRATOR_RTC_IRQ, NULL); |
| 53 | .init_name = "mb:16", | ||
| 54 | .platform_data = &integrator_uart_data, | ||
| 55 | }, | ||
| 56 | .res = { | ||
| 57 | .start = INTEGRATOR_UART0_BASE, | ||
| 58 | .end = INTEGRATOR_UART0_BASE + SZ_4K - 1, | ||
| 59 | .flags = IORESOURCE_MEM, | ||
| 60 | }, | ||
| 61 | .irq = { IRQ_UARTINT0, NO_IRQ }, | ||
| 62 | }; | ||
| 63 | 47 | ||
| 64 | static struct amba_device uart1_device = { | 48 | static AMBA_APB_DEVICE(uart0, "mb:16", 0, |
| 65 | .dev = { | 49 | INTEGRATOR_UART0_BASE, INTEGRATOR_UART0_IRQ, &integrator_uart_data); |
| 66 | .init_name = "mb:17", | ||
| 67 | .platform_data = &integrator_uart_data, | ||
| 68 | }, | ||
| 69 | .res = { | ||
| 70 | .start = INTEGRATOR_UART1_BASE, | ||
| 71 | .end = INTEGRATOR_UART1_BASE + SZ_4K - 1, | ||
| 72 | .flags = IORESOURCE_MEM, | ||
| 73 | }, | ||
| 74 | .irq = { IRQ_UARTINT1, NO_IRQ }, | ||
| 75 | }; | ||
| 76 | 50 | ||
| 77 | static struct amba_device kmi0_device = { | 51 | static AMBA_APB_DEVICE(uart1, "mb:17", 0, |
| 78 | .dev = { | 52 | INTEGRATOR_UART1_BASE, INTEGRATOR_UART1_IRQ, &integrator_uart_data); |
| 79 | .init_name = "mb:18", | ||
| 80 | }, | ||
| 81 | .res = { | ||
| 82 | .start = KMI0_BASE, | ||
| 83 | .end = KMI0_BASE + SZ_4K - 1, | ||
| 84 | .flags = IORESOURCE_MEM, | ||
| 85 | }, | ||
| 86 | .irq = { IRQ_KMIINT0, NO_IRQ }, | ||
| 87 | }; | ||
| 88 | 53 | ||
| 89 | static struct amba_device kmi1_device = { | 54 | static AMBA_APB_DEVICE(kmi0, "mb:18", 0, KMI0_BASE, KMI0_IRQ, NULL); |
| 90 | .dev = { | 55 | static AMBA_APB_DEVICE(kmi1, "mb:19", 0, KMI1_BASE, KMI1_IRQ, NULL); |
| 91 | .init_name = "mb:19", | ||
| 92 | }, | ||
| 93 | .res = { | ||
| 94 | .start = KMI1_BASE, | ||
| 95 | .end = KMI1_BASE + SZ_4K - 1, | ||
| 96 | .flags = IORESOURCE_MEM, | ||
| 97 | }, | ||
| 98 | .irq = { IRQ_KMIINT1, NO_IRQ }, | ||
| 99 | }; | ||
| 100 | 56 | ||
| 101 | static struct amba_device *amba_devs[] __initdata = { | 57 | static struct amba_device *amba_devs[] __initdata = { |
| 102 | &rtc_device, | 58 | &rtc_device, |