diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-18 15:19:04 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-26 19:59:29 +0000 |
| commit | 8ede1ae65e61282cddba39bde4142be3885a6f5a (patch) | |
| tree | 463ba459812b80e78ea82da97f041bf34d5cd968 | |
| parent | 0b26051b3e28c8877e69f183318561ac0926bdc8 (diff) | |
| download | linux-3.10-8ede1ae65e61282cddba39bde4142be3885a6f5a.tar.gz linux-3.10-8ede1ae65e61282cddba39bde4142be3885a6f5a.tar.bz2 linux-3.10-8ede1ae65e61282cddba39bde4142be3885a6f5a.zip | |
ARM: amba: bcmring: use common amba device initializers
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mach-bcmring/core.c | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/arch/arm/mach-bcmring/core.c b/arch/arm/mach-bcmring/core.c index 6b67b7e8426..22e4e0a28ad 100644 --- a/arch/arm/mach-bcmring/core.c +++ b/arch/arm/mach-bcmring/core.c @@ -52,27 +52,8 @@ #include <mach/csp/chipcHw_inline.h> #include <mach/csp/tmrHw_reg.h> -#define AMBA_DEVICE(name, initname, base, plat, size) \ -static struct amba_device name##_device = { \ - .dev = { \ - .coherent_dma_mask = ~0, \ - .init_name = initname, \ - .platform_data = plat \ - }, \ - .res = { \ - .start = MM_ADDR_IO_##base, \ - .end = MM_ADDR_IO_##base + (size) - 1, \ - .flags = IORESOURCE_MEM \ - }, \ - .dma_mask = ~0, \ - .irq = { \ - IRQ_##base \ - } \ -} - - -AMBA_DEVICE(uartA, "uarta", UARTA, NULL, SZ_4K); -AMBA_DEVICE(uartB, "uartb", UARTB, NULL, SZ_4K); +static AMBA_APB_DEVICE(uartA, "uarta", MM_ADDR_IO_UARTA, { IRQ_UARTA }, NULL); +static AMBA_APB_DEVICE(uartB, "uartb", MM_ADDR_IO_UARTB, { IRQ_UARTB }, NULL); static struct clk pll1_clk = { .name = "PLL1", |