summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-versatile/versatile_pb.c
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/versatile_pb.c
parentcdd4e1a76cef22bb0368da7eba6f5a44bccb89b0 (diff)
downloadop-kernel-dev-8f5088b614ff83f405bc975d31abf3270b0bdfc5.zip
op-kernel-dev-8f5088b614ff83f405bc975d31abf3270b0bdfc5.tar.gz
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/versatile_pb.c')
-rw-r--r--arch/arm/mach-versatile/versatile_pb.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-versatile/versatile_pb.c b/arch/arm/mach-versatile/versatile_pb.c
index 1a5fe6e..1973833 100644
--- a/arch/arm/mach-versatile/versatile_pb.c
+++ b/arch/arm/mach-versatile/versatile_pb.c
@@ -73,13 +73,13 @@ static struct pl061_platform_data gpio3_plat_data = {
*/
/* FPGA Primecells */
-AMBA_DEVICE(uart3, "fpga:09", UART3, NULL);
-AMBA_DEVICE(sci1, "fpga:0a", SCI1, NULL);
-AMBA_DEVICE(mmc1, "fpga:0b", MMCI1, &mmc1_plat_data);
+APB_DEVICE(uart3, "fpga:09", UART3, NULL);
+APB_DEVICE(sci1, "fpga:0a", SCI1, NULL);
+APB_DEVICE(mmc1, "fpga:0b", MMCI1, &mmc1_plat_data);
/* DevChip Primecells */
-AMBA_DEVICE(gpio2, "dev:e6", GPIO2, &gpio2_plat_data);
-AMBA_DEVICE(gpio3, "dev:e7", GPIO3, &gpio3_plat_data);
+APB_DEVICE(gpio2, "dev:e6", GPIO2, &gpio2_plat_data);
+APB_DEVICE(gpio3, "dev:e7", GPIO3, &gpio3_plat_data);
static struct amba_device *amba_devs[] __initdata = {
&uart3_device,
OpenPOWER on IntegriCloud