diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/boot/dts/ccu9540.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/hrefprev60.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/hrefv60plus.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/snowball.dts | 2 | ||||
-rw-r--r-- | arch/arm/mach-ux500/cpu-db8500.c | 12 |
5 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/ccu9540.dts b/arch/arm/boot/dts/ccu9540.dts index 26dfe83178be..04305463f00d 100644 --- a/arch/arm/boot/dts/ccu9540.dts +++ b/arch/arm/boot/dts/ccu9540.dts | |||
@@ -14,7 +14,7 @@ | |||
14 | 14 | ||
15 | / { | 15 | / { |
16 | model = "ST-Ericsson CCU9540 platform with Device Tree"; | 16 | model = "ST-Ericsson CCU9540 platform with Device Tree"; |
17 | compatible = "st-ericsson,ccu9540"; | 17 | compatible = "st-ericsson,ccu9540", "st-ericsson,u9540"; |
18 | 18 | ||
19 | memory { | 19 | memory { |
20 | reg = <0x00000000 0x20000000>; | 20 | reg = <0x00000000 0x20000000>; |
diff --git a/arch/arm/boot/dts/hrefprev60.dts b/arch/arm/boot/dts/hrefprev60.dts index cd9e53584847..b398946fd64a 100644 --- a/arch/arm/boot/dts/hrefprev60.dts +++ b/arch/arm/boot/dts/hrefprev60.dts | |||
@@ -16,7 +16,7 @@ | |||
16 | 16 | ||
17 | / { | 17 | / { |
18 | model = "ST-Ericsson HREF (pre-v60) platform with Device Tree"; | 18 | model = "ST-Ericsson HREF (pre-v60) platform with Device Tree"; |
19 | compatible = "st-ericsson,mop500"; | 19 | compatible = "st-ericsson,mop500", "st-ericsson,u8500"; |
20 | 20 | ||
21 | gpio_keys { | 21 | gpio_keys { |
22 | button@1 { | 22 | button@1 { |
diff --git a/arch/arm/boot/dts/hrefv60plus.dts b/arch/arm/boot/dts/hrefv60plus.dts index 82103a22c600..a01ac8f000d6 100644 --- a/arch/arm/boot/dts/hrefv60plus.dts +++ b/arch/arm/boot/dts/hrefv60plus.dts | |||
@@ -16,7 +16,7 @@ | |||
16 | 16 | ||
17 | / { | 17 | / { |
18 | model = "ST-Ericsson HREF (v60+) platform with Device Tree"; | 18 | model = "ST-Ericsson HREF (v60+) platform with Device Tree"; |
19 | compatible = "st-ericsson,hrefv60+"; | 19 | compatible = "st-ericsson,hrefv60+", "st-ericsson,u8500"; |
20 | 20 | ||
21 | gpio_keys { | 21 | gpio_keys { |
22 | button@1 { | 22 | button@1 { |
diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts index 6a2b58b6919d..9e02a913eb62 100644 --- a/arch/arm/boot/dts/snowball.dts +++ b/arch/arm/boot/dts/snowball.dts | |||
@@ -14,7 +14,7 @@ | |||
14 | 14 | ||
15 | / { | 15 | / { |
16 | model = "Calao Systems Snowball platform with device tree"; | 16 | model = "Calao Systems Snowball platform with device tree"; |
17 | compatible = "calaosystems,snowball-a9500"; | 17 | compatible = "calaosystems,snowball-a9500", "st-ericsson,u9500"; |
18 | 18 | ||
19 | memory { | 19 | memory { |
20 | reg = <0x00000000 0x20000000>; | 20 | reg = <0x00000000 0x20000000>; |
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 472b49f90317..c65e7e3ce439 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c | |||
@@ -330,11 +330,11 @@ static void __init u8500_init_machine(void) | |||
330 | of_platform_populate(NULL, u8500_local_bus_nodes, u8500_auxdata_lookup, parent); | 330 | of_platform_populate(NULL, u8500_local_bus_nodes, u8500_auxdata_lookup, parent); |
331 | } | 331 | } |
332 | 332 | ||
333 | static const char * u8500_dt_board_compat[] = { | 333 | static const char * stericsson_dt_platform_compat[] = { |
334 | "calaosystems,snowball-a9500", | 334 | "st-ericsson,u8500", |
335 | "st-ericsson,hrefv60+", | 335 | "st-ericsson,u8540", |
336 | "st-ericsson,mop500", | 336 | "st-ericsson,u9500", |
337 | "st-ericsson,ccu9540", | 337 | "st-ericsson,u9540", |
338 | NULL, | 338 | NULL, |
339 | }; | 339 | }; |
340 | 340 | ||
@@ -346,7 +346,7 @@ DT_MACHINE_START(U8500_DT, "ST-Ericsson Ux5x0 platform (Device Tree Support)") | |||
346 | .handle_irq = gic_handle_irq, | 346 | .handle_irq = gic_handle_irq, |
347 | .init_machine = u8500_init_machine, | 347 | .init_machine = u8500_init_machine, |
348 | .init_late = NULL, | 348 | .init_late = NULL, |
349 | .dt_compat = u8500_dt_board_compat, | 349 | .dt_compat = stericsson_dt_platform_compat, |
350 | MACHINE_END | 350 | MACHINE_END |
351 | 351 | ||
352 | #endif | 352 | #endif |