diff options
-rw-r--r-- | arch/arm/mach-ux500/cpu-db8500.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 46cca52890bc..2bad855c1f9a 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c | |||
@@ -292,6 +292,16 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { | |||
292 | {}, | 292 | {}, |
293 | }; | 293 | }; |
294 | 294 | ||
295 | static struct of_dev_auxdata u8540_auxdata_lookup[] __initdata = { | ||
296 | /* Requires DMA bindings. */ | ||
297 | OF_DEV_AUXDATA("arm,pl011", 0x80120000, "uart0", NULL), | ||
298 | OF_DEV_AUXDATA("arm,pl011", 0x80121000, "uart1", NULL), | ||
299 | OF_DEV_AUXDATA("arm,pl011", 0x80007000, "uart2", NULL), | ||
300 | OF_DEV_AUXDATA("stericsson,db8500-prcmu", 0x80157000, "db8500-prcmu", | ||
301 | &db8500_prcmu_pdata), | ||
302 | {}, | ||
303 | }; | ||
304 | |||
295 | static const struct of_device_id u8500_local_bus_nodes[] = { | 305 | static const struct of_device_id u8500_local_bus_nodes[] = { |
296 | /* only create devices below soc node */ | 306 | /* only create devices below soc node */ |
297 | { .compatible = "stericsson,db8500", }, | 307 | { .compatible = "stericsson,db8500", }, |
@@ -318,8 +328,13 @@ static void __init u8500_init_machine(void) | |||
318 | /* TODO: Export SoC, USB, cpu-freq and DMA40 */ | 328 | /* TODO: Export SoC, USB, cpu-freq and DMA40 */ |
319 | parent = u8500_of_init_devices(); | 329 | parent = u8500_of_init_devices(); |
320 | 330 | ||
321 | /* automatically probe child nodes of db8500 device */ | 331 | /* automatically probe child nodes of dbx5x0 devices */ |
322 | of_platform_populate(NULL, u8500_local_bus_nodes, u8500_auxdata_lookup, parent); | 332 | if (of_machine_is_compatible("st-ericsson,u8540")) |
333 | of_platform_populate(NULL, u8500_local_bus_nodes, | ||
334 | u8540_auxdata_lookup, parent); | ||
335 | else | ||
336 | of_platform_populate(NULL, u8500_local_bus_nodes, | ||
337 | u8500_auxdata_lookup, parent); | ||
323 | } | 338 | } |
324 | 339 | ||
325 | static const char * stericsson_dt_platform_compat[] = { | 340 | static const char * stericsson_dt_platform_compat[] = { |