From 9e8fe19ed5809c0f940b6c14f3dbd5af7e17c0d2 Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@linaro.org>
Date: Mon, 15 Oct 2012 10:07:55 +0100
Subject: [PATCH] --- yaml --- r: 342190 b: refs/heads/master c:
 79b40753a318adb3254c6d534b834c10f99cba05 h: refs/heads/master v: v3

---
 [refs]                                  |  2 +-
 trunk/arch/arm/boot/dts/ccu9540.dts     |  2 +-
 trunk/arch/arm/boot/dts/hrefprev60.dts  |  2 +-
 trunk/arch/arm/boot/dts/hrefv60plus.dts |  2 +-
 trunk/arch/arm/boot/dts/snowball.dts    |  2 +-
 trunk/arch/arm/mach-ux500/cpu-db8500.c  | 12 ++++++------
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index e32029b6e875..935b0426e8fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46c1bf813376654f6b75120b9c2cf3de0f67af7d
+refs/heads/master: 79b40753a318adb3254c6d534b834c10f99cba05
diff --git a/trunk/arch/arm/boot/dts/ccu9540.dts b/trunk/arch/arm/boot/dts/ccu9540.dts
index 26dfe83178be..04305463f00d 100644
--- a/trunk/arch/arm/boot/dts/ccu9540.dts
+++ b/trunk/arch/arm/boot/dts/ccu9540.dts
@@ -14,7 +14,7 @@
 
 / {
 	model = "ST-Ericsson CCU9540 platform with Device Tree";
-	compatible = "st-ericsson,ccu9540";
+	compatible = "st-ericsson,ccu9540", "st-ericsson,u9540";
 
 	memory {
 		reg = <0x00000000 0x20000000>;
diff --git a/trunk/arch/arm/boot/dts/hrefprev60.dts b/trunk/arch/arm/boot/dts/hrefprev60.dts
index cd9e53584847..b398946fd64a 100644
--- a/trunk/arch/arm/boot/dts/hrefprev60.dts
+++ b/trunk/arch/arm/boot/dts/hrefprev60.dts
@@ -16,7 +16,7 @@
 
 / {
 	model = "ST-Ericsson HREF (pre-v60) platform with Device Tree";
-	compatible = "st-ericsson,mop500";
+	compatible = "st-ericsson,mop500", "st-ericsson,u8500";
 
 	gpio_keys {
 		button@1 {
diff --git a/trunk/arch/arm/boot/dts/hrefv60plus.dts b/trunk/arch/arm/boot/dts/hrefv60plus.dts
index 82103a22c600..a01ac8f000d6 100644
--- a/trunk/arch/arm/boot/dts/hrefv60plus.dts
+++ b/trunk/arch/arm/boot/dts/hrefv60plus.dts
@@ -16,7 +16,7 @@
 
 / {
 	model = "ST-Ericsson HREF (v60+) platform with Device Tree";
-	compatible = "st-ericsson,hrefv60+";
+	compatible = "st-ericsson,hrefv60+", "st-ericsson,u8500";
 
 	gpio_keys {
 		button@1 {
diff --git a/trunk/arch/arm/boot/dts/snowball.dts b/trunk/arch/arm/boot/dts/snowball.dts
index 6a2b58b6919d..9e02a913eb62 100644
--- a/trunk/arch/arm/boot/dts/snowball.dts
+++ b/trunk/arch/arm/boot/dts/snowball.dts
@@ -14,7 +14,7 @@
 
 / {
 	model = "Calao Systems Snowball platform with device tree";
-	compatible = "calaosystems,snowball-a9500";
+	compatible = "calaosystems,snowball-a9500", "st-ericsson,u9500";
 
 	memory {
 		reg = <0x00000000 0x20000000>;
diff --git a/trunk/arch/arm/mach-ux500/cpu-db8500.c b/trunk/arch/arm/mach-ux500/cpu-db8500.c
index 472b49f90317..c65e7e3ce439 100644
--- a/trunk/arch/arm/mach-ux500/cpu-db8500.c
+++ b/trunk/arch/arm/mach-ux500/cpu-db8500.c
@@ -330,11 +330,11 @@ static void __init u8500_init_machine(void)
 	of_platform_populate(NULL, u8500_local_bus_nodes, u8500_auxdata_lookup, parent);
 }
 
-static const char * u8500_dt_board_compat[] = {
-	"calaosystems,snowball-a9500",
-	"st-ericsson,hrefv60+",
-	"st-ericsson,mop500",
-	"st-ericsson,ccu9540",
+static const char * stericsson_dt_platform_compat[] = {
+	"st-ericsson,u8500",
+	"st-ericsson,u8540",
+	"st-ericsson,u9500",
+	"st-ericsson,u9540",
 	NULL,
 };
 
@@ -346,7 +346,7 @@ DT_MACHINE_START(U8500_DT, "ST-Ericsson Ux5x0 platform (Device Tree Support)")
 	.handle_irq	= gic_handle_irq,
 	.init_machine	= u8500_init_machine,
 	.init_late	= NULL,
-	.dt_compat      = u8500_dt_board_compat,
+	.dt_compat      = stericsson_dt_platform_compat,
 MACHINE_END
 
 #endif