summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/emu.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-12-18 15:13:47 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-26 19:59:28 +0000
commite911ff17467248edcd8639243c0c1b1f933057d8 (patch)
tree26946d35d997d665ec0a1bd9324756db2ef93a7e /arch/arm/mach-omap2/emu.c
parent2f64ccd9e0eb5686056f44ffaf5d33c7e9733972 (diff)
downloadblackbird-op-linux-e911ff17467248edcd8639243c0c1b1f933057d8.tar.gz
blackbird-op-linux-e911ff17467248edcd8639243c0c1b1f933057d8.zip
ARM: amba: omap2: use common amba device initializers
Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-omap2/emu.c')
-rw-r--r--arch/arm/mach-omap2/emu.c26
1 files changed, 2 insertions, 24 deletions
diff --git a/arch/arm/mach-omap2/emu.c b/arch/arm/mach-omap2/emu.c
index 9c442e290ccb..ce91aad4cdad 100644
--- a/arch/arm/mach-omap2/emu.c
+++ b/arch/arm/mach-omap2/emu.c
@@ -30,29 +30,8 @@ MODULE_AUTHOR("Alexander Shishkin");
#define ETB_BASE (L4_EMU_34XX_PHYS + 0x1b000)
#define DAPCTL (L4_EMU_34XX_PHYS + 0x1d000)
-static struct amba_device omap3_etb_device = {
- .dev = {
- .init_name = "etb",
- },
- .res = {
- .start = ETB_BASE,
- .end = ETB_BASE + SZ_4K - 1,
- .flags = IORESOURCE_MEM,
- },
- .periphid = 0x000bb907,
-};
-
-static struct amba_device omap3_etm_device = {
- .dev = {
- .init_name = "etm",
- },
- .res = {
- .start = ETM_BASE,
- .end = ETM_BASE + SZ_4K - 1,
- .flags = IORESOURCE_MEM,
- },
- .periphid = 0x102bb921,
-};
+static AMBA_APB_DEVICE(omap3_etb, "etb", 0x000bb907, ETB_BASE, { }, NULL);
+static AMBA_APB_DEVICE(omap3_etm, "etm", 0x102bb921, ETM_BASE, { }, NULL);
static int __init emu_init(void)
{
@@ -66,4 +45,3 @@ static int __init emu_init(void)
}
subsys_initcall(emu_init);
-
OpenPOWER on IntegriCloud