ARM: 5718/1: Sane busids for RealView board components

This removes the totally bogus bus ID:s with two-digit hex numerals
either referring to the base address of corresponding versatile
machine or just some arbitrarily chosen digit in favor of just using
the device identifier as a string. I kept the "dev:" prefix for
DevChips, "fpga:" prefix for FPGA:s and "issp:" prefix for the
other processor bus, just in case someone likes them.

Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 19 insertions, 19 deletions

diff --git a/arch/arm/mach-realview/realview_pbx.c b/arch/arm/mach-realview/realview_pbx.c
index ce6c5d25fbef..cf68b5426061 100644
--- a/arch/arm/mach-realview/realview_pbx.c
+++ b/arch/arm/mach-realview/realview_pbx.c
@@ -182,29 +182,29 @@ static struct pl061_platform_data gpio2_plat_data = {
 #define PBX_SSP_DMA             { 9, 8 }
 
 /* FPGA Primecells */
-AMBA_DEVICE(aaci,       "fpga:04",      AACI,           NULL);
-AMBA_DEVICE(mmc0,       "fpga:05",      MMCI0,          &realview_mmc0_plat_data);
-AMBA_DEVICE(kmi0,       "fpga:06",      KMI0,           NULL);
-AMBA_DEVICE(kmi1,       "fpga:07",      KMI1,           NULL);
-AMBA_DEVICE(uart3,      "fpga:09",      PBX_UART3,      NULL);
+AMBA_DEVICE(aaci,       "fpga:aaci",    AACI,           NULL);
+AMBA_DEVICE(mmc0,       "fpga:mmc0",    MMCI0,          &realview_mmc0_plat_data);
+AMBA_DEVICE(kmi0,       "fpga:kmi0",    KMI0,           NULL);
+AMBA_DEVICE(kmi1,       "fpga:kmi1",    KMI1,           NULL);
+AMBA_DEVICE(uart3,      "fpga:uart3",   PBX_UART3,      NULL);
 
 /* DevChip Primecells */
-AMBA_DEVICE(smc,        "dev:00",       PBX_SMC,        NULL);
-AMBA_DEVICE(sctl,       "dev:e0",       SCTL,           NULL);
-AMBA_DEVICE(wdog,       "dev:e1",       PBX_WATCHDOG,   NULL);
-AMBA_DEVICE(gpio0,      "dev:e4",       PBX_GPIO0,      &gpio0_plat_data);
-AMBA_DEVICE(gpio1,      "dev:e5",       GPIO1,          &gpio1_plat_data);
-AMBA_DEVICE(gpio2,      "dev:e6",       GPIO2,          &gpio2_plat_data);
-AMBA_DEVICE(rtc,        "dev:e8",       PBX_RTC,        NULL);
-AMBA_DEVICE(sci0,       "dev:f0",       SCI,            NULL);
-AMBA_DEVICE(uart0,      "dev:f1",       PBX_UART0,      NULL);
-AMBA_DEVICE(uart1,      "dev:f2",       PBX_UART1,      NULL);
-AMBA_DEVICE(uart2,      "dev:f3",       PBX_UART2,      NULL);
-AMBA_DEVICE(ssp0,       "dev:f4",       PBX_SSP,        NULL);
+AMBA_DEVICE(smc,        "dev:smc",      PBX_SMC,        NULL);
+AMBA_DEVICE(sctl,       "dev:sctl",     SCTL,           NULL);
+AMBA_DEVICE(wdog,       "dev:wdog",     PBX_WATCHDOG,   NULL);
+AMBA_DEVICE(gpio0,      "dev:gpio0",    PBX_GPIO0,      &gpio0_plat_data);
+AMBA_DEVICE(gpio1,      "dev:gpio1",    GPIO1,          &gpio1_plat_data);
+AMBA_DEVICE(gpio2,      "dev:gpio2",    GPIO2,          &gpio2_plat_data);
+AMBA_DEVICE(rtc,        "dev:rtc",      PBX_RTC,        NULL);
+AMBA_DEVICE(sci0,       "dev:sci0",     SCI,            NULL);
+AMBA_DEVICE(uart0,      "dev:uart0",    PBX_UART0,      NULL);
+AMBA_DEVICE(uart1,      "dev:uart1",    PBX_UART1,      NULL);
+AMBA_DEVICE(uart2,      "dev:uart2",    PBX_UART2,      NULL);
+AMBA_DEVICE(ssp0,       "dev:ssp0",     PBX_SSP,        NULL);
 
 /* Primecells on the NEC ISSP chip */
-AMBA_DEVICE(clcd,       "issp:20",      PBX_CLCD,       &clcd_plat_data);
-AMBA_DEVICE(dmac,       "issp:30",      DMAC,           NULL);
+AMBA_DEVICE(clcd,       "issp:clcd",    PBX_CLCD,       &clcd_plat_data);
+AMBA_DEVICE(dmac,       "issp:dmac",    DMAC,           NULL);
 
 static struct amba_device *amba_devs[] __initdata = {
         &dmac_device,