From 462bc4c6a5413d714b128ce2001bc9a49c6cb020 Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@linaro.org>
Date: Mon, 15 Oct 2012 08:49:33 +0100
Subject: [PATCH] --- yaml --- r: 342188 b: refs/heads/master c:
 58e5b9e3d0b5e1319fd24124e79b4d4e6188bf1b h: refs/heads/master v: v3

---
 [refs]                                             | 2 +-
 trunk/arch/arm/boot/dts/{u9540.dts => ccu9540.dts} | 4 ++--
 trunk/arch/arm/mach-ux500/cpu-db8500.c             | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename trunk/arch/arm/boot/dts/{u9540.dts => ccu9540.dts} (93%)

diff --git a/[refs] b/[refs]
index 3e0ddfdd8d24..50f80f6d889d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a37e84ca31f4354373fe9a930d80566d6833a877
+refs/heads/master: 58e5b9e3d0b5e1319fd24124e79b4d4e6188bf1b
diff --git a/trunk/arch/arm/boot/dts/u9540.dts b/trunk/arch/arm/boot/dts/ccu9540.dts
similarity index 93%
rename from trunk/arch/arm/boot/dts/u9540.dts
rename to trunk/arch/arm/boot/dts/ccu9540.dts
index 95892ec6c342..26dfe83178be 100644
--- a/trunk/arch/arm/boot/dts/u9540.dts
+++ b/trunk/arch/arm/boot/dts/ccu9540.dts
@@ -13,8 +13,8 @@
 /include/ "dbx5x0.dtsi"
 
 / {
-	model = "ST-Ericsson U9540 platform with Device Tree";
-	compatible = "st-ericsson,u9540";
+	model = "ST-Ericsson CCU9540 platform with Device Tree";
+	compatible = "st-ericsson,ccu9540";
 
 	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 0b15591a087d..6e9a06d693a6 100644
--- a/trunk/arch/arm/mach-ux500/cpu-db8500.c
+++ b/trunk/arch/arm/mach-ux500/cpu-db8500.c
@@ -320,8 +320,8 @@ static void __init u8500_init_machine(void)
 		snowball_pinmaps_init();
 	else if (of_machine_is_compatible("st-ericsson,hrefv60+"))
 		hrefv60_pinmaps_init();
-	else if (of_machine_is_compatible("st-ericsson,u9540")) {}
-		/* TODO: Add u9540 pinmaps. */
+	else if (of_machine_is_compatible("st-ericsson,ccu9540")) {}
+		/* TODO: Add pinmaps for ccu9540 board. */
 
 	/* TODO: Export SoC, USB, cpu-freq and DMA40 */
 	parent = u8500_of_init_devices();
@@ -334,7 +334,7 @@ static const char * u8500_dt_board_compat[] = {
 	"calaosystems,snowball-a9500",
 	"st-ericsson,hrefv60+",
 	"st-ericsson,mop500",
-	"st-ericsson,u9540",
+	"st-ericsson,ccu9540",
 	NULL,
 };