summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-versatile/core.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-12-18 12:21:09 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-25 11:04:03 +0000
commit8f5088b614ff83f405bc975d31abf3270b0bdfc5 (patch)
treea72cd8cff4f5c31a01281b570e9d73bf8a6bf9e9 /arch/arm/mach-versatile/core.h
parentcdd4e1a76cef22bb0368da7eba6f5a44bccb89b0 (diff)
downloadblackbird-op-linux-8f5088b614ff83f405bc975d31abf3270b0bdfc5.tar.gz
blackbird-op-linux-8f5088b614ff83f405bc975d31abf3270b0bdfc5.zip
ARM: amba: versatile: get rid of private platform amba_device initializer
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-versatile/core.h')
-rw-r--r--arch/arm/mach-versatile/core.h20
1 files changed, 5 insertions, 15 deletions
diff --git a/arch/arm/mach-versatile/core.h b/arch/arm/mach-versatile/core.h
index 2ef2f555f315..683e60776a85 100644
--- a/arch/arm/mach-versatile/core.h
+++ b/arch/arm/mach-versatile/core.h
@@ -36,20 +36,10 @@ extern unsigned int mmc_status(struct device *dev);
extern struct of_dev_auxdata versatile_auxdata_lookup[];
#endif
-#define AMBA_DEVICE(name,busid,base,plat) \
-static struct amba_device name##_device = { \
- .dev = { \
- .coherent_dma_mask = ~0, \
- .init_name = busid, \
- .platform_data = plat, \
- }, \
- .res = { \
- .start = VERSATILE_##base##_BASE, \
- .end = (VERSATILE_##base##_BASE) + SZ_4K - 1,\
- .flags = IORESOURCE_MEM, \
- }, \
- .dma_mask = ~0, \
- .irq = base##_IRQ, \
-}
+#define APB_DEVICE(name, busid, base, plat) \
+static AMBA_APB_DEVICE(name, busid, 0, VERSATILE_##base##_BASE, base##_IRQ, plat)
+
+#define AHB_DEVICE(name, busid, base, plat) \
+static AMBA_AHB_DEVICE(name, busid, 0, VERSATILE_##base##_BASE, base##_IRQ, plat)
#endif
OpenPOWER on IntegriCloud