diff options
author | Linus Walleij <linus.walleij@stericsson.com> | 2009-09-21 07:30:32 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-21 11:39:48 -0400 |
commit | 4321532cec25e1747961d83fb4f78ec24ea92966 (patch) | |
tree | dd0c4ff853f3c89bdf1ad04aff9eebc39c99a4c4 /arch | |
parent | 59b69e27ca9f6c6347b1ec07066a9250140cb9e8 (diff) |
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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-realview/core.c | 18 | ||||
-rw-r--r-- | arch/arm/mach-realview/realview_eb.c | 38 | ||||
-rw-r--r-- | arch/arm/mach-realview/realview_pb1176.c | 38 | ||||
-rw-r--r-- | arch/arm/mach-realview/realview_pb11mp.c | 38 | ||||
-rw-r--r-- | arch/arm/mach-realview/realview_pba8.c | 38 | ||||
-rw-r--r-- | arch/arm/mach-realview/realview_pbx.c | 38 |
6 files changed, 104 insertions, 104 deletions
diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c index dc3519c50ab2..5a5e1f72461e 100644 --- a/arch/arm/mach-realview/core.c +++ b/arch/arm/mach-realview/core.c | |||
@@ -296,31 +296,31 @@ static struct clk ref24_clk = { | |||
296 | 296 | ||
297 | static struct clk_lookup lookups[] = { | 297 | static struct clk_lookup lookups[] = { |
298 | { /* UART0 */ | 298 | { /* UART0 */ |
299 | .dev_id = "dev:f1", | 299 | .dev_id = "dev:uart0", |
300 | .clk = &ref24_clk, | 300 | .clk = &ref24_clk, |
301 | }, { /* UART1 */ | 301 | }, { /* UART1 */ |
302 | .dev_id = "dev:f2", | 302 | .dev_id = "dev:uart1", |
303 | .clk = &ref24_clk, | 303 | .clk = &ref24_clk, |
304 | }, { /* UART2 */ | 304 | }, { /* UART2 */ |
305 | .dev_id = "dev:f3", | 305 | .dev_id = "dev:uart2", |
306 | .clk = &ref24_clk, | 306 | .clk = &ref24_clk, |
307 | }, { /* UART3 */ | 307 | }, { /* UART3 */ |
308 | .dev_id = "fpga:09", | 308 | .dev_id = "fpga:uart3", |
309 | .clk = &ref24_clk, | 309 | .clk = &ref24_clk, |
310 | }, { /* KMI0 */ | 310 | }, { /* KMI0 */ |
311 | .dev_id = "fpga:06", | 311 | .dev_id = "fpga:kmi0", |
312 | .clk = &ref24_clk, | 312 | .clk = &ref24_clk, |
313 | }, { /* KMI1 */ | 313 | }, { /* KMI1 */ |
314 | .dev_id = "fpga:07", | 314 | .dev_id = "fpga:kmi1", |
315 | .clk = &ref24_clk, | 315 | .clk = &ref24_clk, |
316 | }, { /* MMC0 */ | 316 | }, { /* MMC0 */ |
317 | .dev_id = "fpga:05", | 317 | .dev_id = "fpga:mmc0", |
318 | .clk = &ref24_clk, | 318 | .clk = &ref24_clk, |
319 | }, { /* EB:CLCD */ | 319 | }, { /* EB:CLCD */ |
320 | .dev_id = "dev:20", | 320 | .dev_id = "dev:clcd", |
321 | .clk = &oscvco_clk, | 321 | .clk = &oscvco_clk, |
322 | }, { /* PB:CLCD */ | 322 | }, { /* PB:CLCD */ |
323 | .dev_id = "issp:20", | 323 | .dev_id = "issp:clcd", |
324 | .clk = &oscvco_clk, | 324 | .clk = &oscvco_clk, |
325 | } | 325 | } |
326 | }; | 326 | }; |
diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c index abd13b448671..c0795ea3b3a7 100644 --- a/arch/arm/mach-realview/realview_eb.c +++ b/arch/arm/mach-realview/realview_eb.c | |||
@@ -193,27 +193,27 @@ static struct pl061_platform_data gpio2_plat_data = { | |||
193 | #define EB_SSP_DMA { 9, 8 } | 193 | #define EB_SSP_DMA { 9, 8 } |
194 | 194 | ||
195 | /* FPGA Primecells */ | 195 | /* FPGA Primecells */ |
196 | AMBA_DEVICE(aaci, "fpga:04", AACI, NULL); | 196 | AMBA_DEVICE(aaci, "fpga:aaci", AACI, NULL); |
197 | AMBA_DEVICE(mmc0, "fpga:05", MMCI0, &realview_mmc0_plat_data); | 197 | AMBA_DEVICE(mmc0, "fpga:mmc0", MMCI0, &realview_mmc0_plat_data); |
198 | AMBA_DEVICE(kmi0, "fpga:06", KMI0, NULL); | 198 | AMBA_DEVICE(kmi0, "fpga:kmi0", KMI0, NULL); |
199 | AMBA_DEVICE(kmi1, "fpga:07", KMI1, NULL); | 199 | AMBA_DEVICE(kmi1, "fpga:kmi1", KMI1, NULL); |
200 | AMBA_DEVICE(uart3, "fpga:09", EB_UART3, NULL); | 200 | AMBA_DEVICE(uart3, "fpga:uart3", EB_UART3, NULL); |
201 | 201 | ||
202 | /* DevChip Primecells */ | 202 | /* DevChip Primecells */ |
203 | AMBA_DEVICE(smc, "dev:00", EB_SMC, NULL); | 203 | AMBA_DEVICE(smc, "dev:smc", EB_SMC, NULL); |
204 | AMBA_DEVICE(clcd, "dev:20", EB_CLCD, &clcd_plat_data); | 204 | AMBA_DEVICE(clcd, "dev:clcd", EB_CLCD, &clcd_plat_data); |
205 | AMBA_DEVICE(dmac, "dev:30", DMAC, NULL); | 205 | AMBA_DEVICE(dmac, "dev:dmac", DMAC, NULL); |
206 | AMBA_DEVICE(sctl, "dev:e0", SCTL, NULL); | 206 | AMBA_DEVICE(sctl, "dev:sctl", SCTL, NULL); |
207 | AMBA_DEVICE(wdog, "dev:e1", EB_WATCHDOG, NULL); | 207 | AMBA_DEVICE(wdog, "dev:wdog", EB_WATCHDOG, NULL); |
208 | AMBA_DEVICE(gpio0, "dev:e4", EB_GPIO0, &gpio0_plat_data); | 208 | AMBA_DEVICE(gpio0, "dev:gpio0", EB_GPIO0, &gpio0_plat_data); |
209 | AMBA_DEVICE(gpio1, "dev:e5", GPIO1, &gpio1_plat_data); | 209 | AMBA_DEVICE(gpio1, "dev:gpio1", GPIO1, &gpio1_plat_data); |
210 | AMBA_DEVICE(gpio2, "dev:e6", GPIO2, &gpio2_plat_data); | 210 | AMBA_DEVICE(gpio2, "dev:gpio2", GPIO2, &gpio2_plat_data); |
211 | AMBA_DEVICE(rtc, "dev:e8", EB_RTC, NULL); | 211 | AMBA_DEVICE(rtc, "dev:rtc", EB_RTC, NULL); |
212 | AMBA_DEVICE(sci0, "dev:f0", SCI, NULL); | 212 | AMBA_DEVICE(sci0, "dev:sci0", SCI, NULL); |
213 | AMBA_DEVICE(uart0, "dev:f1", EB_UART0, NULL); | 213 | AMBA_DEVICE(uart0, "dev:uart0", EB_UART0, NULL); |
214 | AMBA_DEVICE(uart1, "dev:f2", EB_UART1, NULL); | 214 | AMBA_DEVICE(uart1, "dev:uart1", EB_UART1, NULL); |
215 | AMBA_DEVICE(uart2, "dev:f3", EB_UART2, NULL); | 215 | AMBA_DEVICE(uart2, "dev:uart2", EB_UART2, NULL); |
216 | AMBA_DEVICE(ssp0, "dev:f4", EB_SSP, NULL); | 216 | AMBA_DEVICE(ssp0, "dev:ssp0", EB_SSP, NULL); |
217 | 217 | ||
218 | static struct amba_device *amba_devs[] __initdata = { | 218 | static struct amba_device *amba_devs[] __initdata = { |
219 | &dmac_device, | 219 | &dmac_device, |
diff --git a/arch/arm/mach-realview/realview_pb1176.c b/arch/arm/mach-realview/realview_pb1176.c index 17fbb0e889b6..395dc18070b4 100644 --- a/arch/arm/mach-realview/realview_pb1176.c +++ b/arch/arm/mach-realview/realview_pb1176.c | |||
@@ -170,29 +170,29 @@ static struct pl061_platform_data gpio2_plat_data = { | |||
170 | #define PB1176_SSP_DMA { 9, 8 } | 170 | #define PB1176_SSP_DMA { 9, 8 } |
171 | 171 | ||
172 | /* FPGA Primecells */ | 172 | /* FPGA Primecells */ |
173 | AMBA_DEVICE(aaci, "fpga:04", AACI, NULL); | 173 | AMBA_DEVICE(aaci, "fpga:aaci", AACI, NULL); |
174 | AMBA_DEVICE(mmc0, "fpga:05", MMCI0, &realview_mmc0_plat_data); | 174 | AMBA_DEVICE(mmc0, "fpga:mmc0", MMCI0, &realview_mmc0_plat_data); |
175 | AMBA_DEVICE(kmi0, "fpga:06", KMI0, NULL); | 175 | AMBA_DEVICE(kmi0, "fpga:kmi0", KMI0, NULL); |
176 | AMBA_DEVICE(kmi1, "fpga:07", KMI1, NULL); | 176 | AMBA_DEVICE(kmi1, "fpga:kmi1", KMI1, NULL); |
177 | AMBA_DEVICE(uart3, "fpga:09", PB1176_UART3, NULL); | 177 | AMBA_DEVICE(uart3, "fpga:uart3", PB1176_UART3, NULL); |
178 | 178 | ||
179 | /* DevChip Primecells */ | 179 | /* DevChip Primecells */ |
180 | AMBA_DEVICE(smc, "dev:00", PB1176_SMC, NULL); | 180 | AMBA_DEVICE(smc, "dev:smc", PB1176_SMC, NULL); |
181 | AMBA_DEVICE(sctl, "dev:e0", SCTL, NULL); | 181 | AMBA_DEVICE(sctl, "dev:sctl", SCTL, NULL); |
182 | AMBA_DEVICE(wdog, "dev:e1", PB1176_WATCHDOG, NULL); | 182 | AMBA_DEVICE(wdog, "dev:wdog", PB1176_WATCHDOG, NULL); |
183 | AMBA_DEVICE(gpio0, "dev:e4", PB1176_GPIO0, &gpio0_plat_data); | 183 | AMBA_DEVICE(gpio0, "dev:gpio0", PB1176_GPIO0, &gpio0_plat_data); |
184 | AMBA_DEVICE(gpio1, "dev:e5", GPIO1, &gpio1_plat_data); | 184 | AMBA_DEVICE(gpio1, "dev:gpio1", GPIO1, &gpio1_plat_data); |
185 | AMBA_DEVICE(gpio2, "dev:e6", GPIO2, &gpio2_plat_data); | 185 | AMBA_DEVICE(gpio2, "dev:gpio2", GPIO2, &gpio2_plat_data); |
186 | AMBA_DEVICE(rtc, "dev:e8", PB1176_RTC, NULL); | 186 | AMBA_DEVICE(rtc, "dev:rtc", PB1176_RTC, NULL); |
187 | AMBA_DEVICE(sci0, "dev:f0", SCI, NULL); | 187 | AMBA_DEVICE(sci0, "dev:sci0", SCI, NULL); |
188 | AMBA_DEVICE(uart0, "dev:f1", PB1176_UART0, NULL); | 188 | AMBA_DEVICE(uart0, "dev:uart0", PB1176_UART0, NULL); |
189 | AMBA_DEVICE(uart1, "dev:f2", PB1176_UART1, NULL); | 189 | AMBA_DEVICE(uart1, "dev:uart1", PB1176_UART1, NULL); |
190 | AMBA_DEVICE(uart2, "dev:f3", PB1176_UART2, NULL); | 190 | AMBA_DEVICE(uart2, "dev:uart2", PB1176_UART2, NULL); |
191 | AMBA_DEVICE(ssp0, "dev:f4", PB1176_SSP, NULL); | 191 | AMBA_DEVICE(ssp0, "dev:ssp0", PB1176_SSP, NULL); |
192 | 192 | ||
193 | /* Primecells on the NEC ISSP chip */ | 193 | /* Primecells on the NEC ISSP chip */ |
194 | AMBA_DEVICE(clcd, "issp:20", PB1176_CLCD, &clcd_plat_data); | 194 | AMBA_DEVICE(clcd, "issp:clcd", PB1176_CLCD, &clcd_plat_data); |
195 | //AMBA_DEVICE(dmac, "issp:30", PB1176_DMAC, NULL); | 195 | //AMBA_DEVICE(dmac, "issp:dmac", PB1176_DMAC, NULL); |
196 | 196 | ||
197 | static struct amba_device *amba_devs[] __initdata = { | 197 | static struct amba_device *amba_devs[] __initdata = { |
198 | // &dmac_device, | 198 | // &dmac_device, |
diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c index fdd042b85f40..c0c9e35e6e38 100644 --- a/arch/arm/mach-realview/realview_pb11mp.c +++ b/arch/arm/mach-realview/realview_pb11mp.c | |||
@@ -172,29 +172,29 @@ static struct pl061_platform_data gpio2_plat_data = { | |||
172 | #define PB11MP_SSP_DMA { 9, 8 } | 172 | #define PB11MP_SSP_DMA { 9, 8 } |
173 | 173 | ||
174 | /* FPGA Primecells */ | 174 | /* FPGA Primecells */ |
175 | AMBA_DEVICE(aaci, "fpga:04", AACI, NULL); | 175 | AMBA_DEVICE(aaci, "fpga:aaci", AACI, NULL); |
176 | AMBA_DEVICE(mmc0, "fpga:05", MMCI0, &realview_mmc0_plat_data); | 176 | AMBA_DEVICE(mmc0, "fpga:mmc0", MMCI0, &realview_mmc0_plat_data); |
177 | AMBA_DEVICE(kmi0, "fpga:06", KMI0, NULL); | 177 | AMBA_DEVICE(kmi0, "fpga:kmi0", KMI0, NULL); |
178 | AMBA_DEVICE(kmi1, "fpga:07", KMI1, NULL); | 178 | AMBA_DEVICE(kmi1, "fpga:kmi1", KMI1, NULL); |
179 | AMBA_DEVICE(uart3, "fpga:09", PB11MP_UART3, NULL); | 179 | AMBA_DEVICE(uart3, "fpga:uart3", PB11MP_UART3, NULL); |
180 | 180 | ||
181 | /* DevChip Primecells */ | 181 | /* DevChip Primecells */ |
182 | AMBA_DEVICE(smc, "dev:00", PB11MP_SMC, NULL); | 182 | AMBA_DEVICE(smc, "dev:smc", PB11MP_SMC, NULL); |
183 | AMBA_DEVICE(sctl, "dev:e0", SCTL, NULL); | 183 | AMBA_DEVICE(sctl, "dev:sctl", SCTL, NULL); |
184 | AMBA_DEVICE(wdog, "dev:e1", PB11MP_WATCHDOG, NULL); | 184 | AMBA_DEVICE(wdog, "dev:wdog", PB11MP_WATCHDOG, NULL); |
185 | AMBA_DEVICE(gpio0, "dev:e4", PB11MP_GPIO0, &gpio0_plat_data); | 185 | AMBA_DEVICE(gpio0, "dev:gpio0", PB11MP_GPIO0, &gpio0_plat_data); |
186 | AMBA_DEVICE(gpio1, "dev:e5", GPIO1, &gpio1_plat_data); | 186 | AMBA_DEVICE(gpio1, "dev:gpio1", GPIO1, &gpio1_plat_data); |
187 | AMBA_DEVICE(gpio2, "dev:e6", GPIO2, &gpio2_plat_data); | 187 | AMBA_DEVICE(gpio2, "dev:gpio2", GPIO2, &gpio2_plat_data); |
188 | AMBA_DEVICE(rtc, "dev:e8", PB11MP_RTC, NULL); | 188 | AMBA_DEVICE(rtc, "dev:rtc", PB11MP_RTC, NULL); |
189 | AMBA_DEVICE(sci0, "dev:f0", SCI, NULL); | 189 | AMBA_DEVICE(sci0, "dev:sci0", SCI, NULL); |
190 | AMBA_DEVICE(uart0, "dev:f1", PB11MP_UART0, NULL); | 190 | AMBA_DEVICE(uart0, "dev:uart0", PB11MP_UART0, NULL); |
191 | AMBA_DEVICE(uart1, "dev:f2", PB11MP_UART1, NULL); | 191 | AMBA_DEVICE(uart1, "dev:uart1", PB11MP_UART1, NULL); |
192 | AMBA_DEVICE(uart2, "dev:f3", PB11MP_UART2, NULL); | 192 | AMBA_DEVICE(uart2, "dev:uart2", PB11MP_UART2, NULL); |
193 | AMBA_DEVICE(ssp0, "dev:f4", PB11MP_SSP, NULL); | 193 | AMBA_DEVICE(ssp0, "dev:ssp0", PB11MP_SSP, NULL); |
194 | 194 | ||
195 | /* Primecells on the NEC ISSP chip */ | 195 | /* Primecells on the NEC ISSP chip */ |
196 | AMBA_DEVICE(clcd, "issp:20", PB11MP_CLCD, &clcd_plat_data); | 196 | AMBA_DEVICE(clcd, "issp:clcd", PB11MP_CLCD, &clcd_plat_data); |
197 | AMBA_DEVICE(dmac, "issp:30", DMAC, NULL); | 197 | AMBA_DEVICE(dmac, "issp:dmac", DMAC, NULL); |
198 | 198 | ||
199 | static struct amba_device *amba_devs[] __initdata = { | 199 | static struct amba_device *amba_devs[] __initdata = { |
200 | &dmac_device, | 200 | &dmac_device, |
diff --git a/arch/arm/mach-realview/realview_pba8.c b/arch/arm/mach-realview/realview_pba8.c index 70bba9900d97..4fc64e146c32 100644 --- a/arch/arm/mach-realview/realview_pba8.c +++ b/arch/arm/mach-realview/realview_pba8.c | |||
@@ -162,29 +162,29 @@ static struct pl061_platform_data gpio2_plat_data = { | |||
162 | #define PBA8_SSP_DMA { 9, 8 } | 162 | #define PBA8_SSP_DMA { 9, 8 } |
163 | 163 | ||
164 | /* FPGA Primecells */ | 164 | /* FPGA Primecells */ |
165 | AMBA_DEVICE(aaci, "fpga:04", AACI, NULL); | 165 | AMBA_DEVICE(aaci, "fpga:aaci", AACI, NULL); |
166 | AMBA_DEVICE(mmc0, "fpga:05", MMCI0, &realview_mmc0_plat_data); | 166 | AMBA_DEVICE(mmc0, "fpga:mmc0", MMCI0, &realview_mmc0_plat_data); |
167 | AMBA_DEVICE(kmi0, "fpga:06", KMI0, NULL); | 167 | AMBA_DEVICE(kmi0, "fpga:kmi0", KMI0, NULL); |
168 | AMBA_DEVICE(kmi1, "fpga:07", KMI1, NULL); | 168 | AMBA_DEVICE(kmi1, "fpga:kmi1", KMI1, NULL); |
169 | AMBA_DEVICE(uart3, "fpga:09", PBA8_UART3, NULL); | 169 | AMBA_DEVICE(uart3, "fpga:uart3", PBA8_UART3, NULL); |
170 | 170 | ||
171 | /* DevChip Primecells */ | 171 | /* DevChip Primecells */ |
172 | AMBA_DEVICE(smc, "dev:00", PBA8_SMC, NULL); | 172 | AMBA_DEVICE(smc, "dev:smc", PBA8_SMC, NULL); |
173 | AMBA_DEVICE(sctl, "dev:e0", SCTL, NULL); | 173 | AMBA_DEVICE(sctl, "dev:sctl", SCTL, NULL); |
174 | AMBA_DEVICE(wdog, "dev:e1", PBA8_WATCHDOG, NULL); | 174 | AMBA_DEVICE(wdog, "dev:wdog", PBA8_WATCHDOG, NULL); |
175 | AMBA_DEVICE(gpio0, "dev:e4", PBA8_GPIO0, &gpio0_plat_data); | 175 | AMBA_DEVICE(gpio0, "dev:gpio0", PBA8_GPIO0, &gpio0_plat_data); |
176 | AMBA_DEVICE(gpio1, "dev:e5", GPIO1, &gpio1_plat_data); | 176 | AMBA_DEVICE(gpio1, "dev:gpio1", GPIO1, &gpio1_plat_data); |
177 | AMBA_DEVICE(gpio2, "dev:e6", GPIO2, &gpio2_plat_data); | 177 | AMBA_DEVICE(gpio2, "dev:gpio2", GPIO2, &gpio2_plat_data); |
178 | AMBA_DEVICE(rtc, "dev:e8", PBA8_RTC, NULL); | 178 | AMBA_DEVICE(rtc, "dev:rtc", PBA8_RTC, NULL); |
179 | AMBA_DEVICE(sci0, "dev:f0", SCI, NULL); | 179 | AMBA_DEVICE(sci0, "dev:sci0", SCI, NULL); |
180 | AMBA_DEVICE(uart0, "dev:f1", PBA8_UART0, NULL); | 180 | AMBA_DEVICE(uart0, "dev:uart0", PBA8_UART0, NULL); |
181 | AMBA_DEVICE(uart1, "dev:f2", PBA8_UART1, NULL); | 181 | AMBA_DEVICE(uart1, "dev:uart1", PBA8_UART1, NULL); |
182 | AMBA_DEVICE(uart2, "dev:f3", PBA8_UART2, NULL); | 182 | AMBA_DEVICE(uart2, "dev:uart2", PBA8_UART2, NULL); |
183 | AMBA_DEVICE(ssp0, "dev:f4", PBA8_SSP, NULL); | 183 | AMBA_DEVICE(ssp0, "dev:ssp0", PBA8_SSP, NULL); |
184 | 184 | ||
185 | /* Primecells on the NEC ISSP chip */ | 185 | /* Primecells on the NEC ISSP chip */ |
186 | AMBA_DEVICE(clcd, "issp:20", PBA8_CLCD, &clcd_plat_data); | 186 | AMBA_DEVICE(clcd, "issp:clcd", PBA8_CLCD, &clcd_plat_data); |
187 | AMBA_DEVICE(dmac, "issp:30", DMAC, NULL); | 187 | AMBA_DEVICE(dmac, "issp:dmac", DMAC, NULL); |
188 | 188 | ||
189 | static struct amba_device *amba_devs[] __initdata = { | 189 | static struct amba_device *amba_devs[] __initdata = { |
190 | &dmac_device, | 190 | &dmac_device, |
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 = { | |||
182 | #define PBX_SSP_DMA { 9, 8 } | 182 | #define PBX_SSP_DMA { 9, 8 } |
183 | 183 | ||
184 | /* FPGA Primecells */ | 184 | /* FPGA Primecells */ |
185 | AMBA_DEVICE(aaci, "fpga:04", AACI, NULL); | 185 | AMBA_DEVICE(aaci, "fpga:aaci", AACI, NULL); |
186 | AMBA_DEVICE(mmc0, "fpga:05", MMCI0, &realview_mmc0_plat_data); | 186 | AMBA_DEVICE(mmc0, "fpga:mmc0", MMCI0, &realview_mmc0_plat_data); |
187 | AMBA_DEVICE(kmi0, "fpga:06", KMI0, NULL); | 187 | AMBA_DEVICE(kmi0, "fpga:kmi0", KMI0, NULL); |
188 | AMBA_DEVICE(kmi1, "fpga:07", KMI1, NULL); | 188 | AMBA_DEVICE(kmi1, "fpga:kmi1", KMI1, NULL); |
189 | AMBA_DEVICE(uart3, "fpga:09", PBX_UART3, NULL); | 189 | AMBA_DEVICE(uart3, "fpga:uart3", PBX_UART3, NULL); |
190 | 190 | ||
191 | /* DevChip Primecells */ | 191 | /* DevChip Primecells */ |
192 | AMBA_DEVICE(smc, "dev:00", PBX_SMC, NULL); | 192 | AMBA_DEVICE(smc, "dev:smc", PBX_SMC, NULL); |
193 | AMBA_DEVICE(sctl, "dev:e0", SCTL, NULL); | 193 | AMBA_DEVICE(sctl, "dev:sctl", SCTL, NULL); |
194 | AMBA_DEVICE(wdog, "dev:e1", PBX_WATCHDOG, NULL); | 194 | AMBA_DEVICE(wdog, "dev:wdog", PBX_WATCHDOG, NULL); |
195 | AMBA_DEVICE(gpio0, "dev:e4", PBX_GPIO0, &gpio0_plat_data); | 195 | AMBA_DEVICE(gpio0, "dev:gpio0", PBX_GPIO0, &gpio0_plat_data); |
196 | AMBA_DEVICE(gpio1, "dev:e5", GPIO1, &gpio1_plat_data); | 196 | AMBA_DEVICE(gpio1, "dev:gpio1", GPIO1, &gpio1_plat_data); |
197 | AMBA_DEVICE(gpio2, "dev:e6", GPIO2, &gpio2_plat_data); | 197 | AMBA_DEVICE(gpio2, "dev:gpio2", GPIO2, &gpio2_plat_data); |
198 | AMBA_DEVICE(rtc, "dev:e8", PBX_RTC, NULL); | 198 | AMBA_DEVICE(rtc, "dev:rtc", PBX_RTC, NULL); |
199 | AMBA_DEVICE(sci0, "dev:f0", SCI, NULL); | 199 | AMBA_DEVICE(sci0, "dev:sci0", SCI, NULL); |
200 | AMBA_DEVICE(uart0, "dev:f1", PBX_UART0, NULL); | 200 | AMBA_DEVICE(uart0, "dev:uart0", PBX_UART0, NULL); |
201 | AMBA_DEVICE(uart1, "dev:f2", PBX_UART1, NULL); | 201 | AMBA_DEVICE(uart1, "dev:uart1", PBX_UART1, NULL); |
202 | AMBA_DEVICE(uart2, "dev:f3", PBX_UART2, NULL); | 202 | AMBA_DEVICE(uart2, "dev:uart2", PBX_UART2, NULL); |
203 | AMBA_DEVICE(ssp0, "dev:f4", PBX_SSP, NULL); | 203 | AMBA_DEVICE(ssp0, "dev:ssp0", PBX_SSP, NULL); |
204 | 204 | ||
205 | /* Primecells on the NEC ISSP chip */ | 205 | /* Primecells on the NEC ISSP chip */ |
206 | AMBA_DEVICE(clcd, "issp:20", PBX_CLCD, &clcd_plat_data); | 206 | AMBA_DEVICE(clcd, "issp:clcd", PBX_CLCD, &clcd_plat_data); |
207 | AMBA_DEVICE(dmac, "issp:30", DMAC, NULL); | 207 | AMBA_DEVICE(dmac, "issp:dmac", DMAC, NULL); |
208 | 208 | ||
209 | static struct amba_device *amba_devs[] __initdata = { | 209 | static struct amba_device *amba_devs[] __initdata = { |
210 | &dmac_device, | 210 | &dmac_device, |