From 712251c419e184be60908e9cdd6d00d40d9c990a Mon Sep 17 00:00:00 2001
From: Wolfgang Grandegger <wg@grandegger.com>
Date: Fri, 6 Jun 2008 13:50:03 +0200
Subject: [PATCH] --- yaml --- r: 101649 b: refs/heads/master c:
 4fb035f69e3d08506b65d33b97be1b0e78af39a2 h: refs/heads/master i:   101647:
 f53b8f4ff898f2c8df9ac9c958ed6aedbe00c6ed v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/powerpc/boot/dts/tqm8540.dts     | 4 ++--
 trunk/arch/powerpc/boot/dts/tqm8541.dts     | 4 ++--
 trunk/arch/powerpc/boot/dts/tqm8555.dts     | 4 ++--
 trunk/arch/powerpc/boot/dts/tqm8560.dts     | 4 ++--
 trunk/arch/powerpc/platforms/85xx/tqm85xx.c | 8 ++++----
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index d8ae93107557..5eaf63fee628 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 917f0af9e5a9ceecf9e72537fabb501254ba321d
+refs/heads/master: 4fb035f69e3d08506b65d33b97be1b0e78af39a2
diff --git a/trunk/arch/powerpc/boot/dts/tqm8540.dts b/trunk/arch/powerpc/boot/dts/tqm8540.dts
index 7b653a583a2d..3504db31d4b9 100644
--- a/trunk/arch/powerpc/boot/dts/tqm8540.dts
+++ b/trunk/arch/powerpc/boot/dts/tqm8540.dts
@@ -12,8 +12,8 @@
 /dts-v1/;
 
 / {
-	model = "tqm,8540";
-	compatible = "tqm,8540", "tqm,85xx";
+	model = "tqc,tqm8540";
+	compatible = "tqc,tqm8540";
 	#address-cells = <1>;
 	#size-cells = <1>;
 
diff --git a/trunk/arch/powerpc/boot/dts/tqm8541.dts b/trunk/arch/powerpc/boot/dts/tqm8541.dts
index 8fe73ef34195..8241ae3051f5 100644
--- a/trunk/arch/powerpc/boot/dts/tqm8541.dts
+++ b/trunk/arch/powerpc/boot/dts/tqm8541.dts
@@ -12,8 +12,8 @@
 /dts-v1/;
 
 / {
-	model = "tqm,8541";
-	compatible = "tqm,8541", "tqm,85xx";
+	model = "tqc,tqm8541";
+	compatible = "tqc,tqm8541";
 	#address-cells = <1>;
 	#size-cells = <1>;
 
diff --git a/trunk/arch/powerpc/boot/dts/tqm8555.dts b/trunk/arch/powerpc/boot/dts/tqm8555.dts
index 0a53bb9ce76f..5a57cefadaa1 100644
--- a/trunk/arch/powerpc/boot/dts/tqm8555.dts
+++ b/trunk/arch/powerpc/boot/dts/tqm8555.dts
@@ -12,8 +12,8 @@
 /dts-v1/;
 
 / {
-	model = "tqm,8555";
-	compatible = "tqm,8555", "tqm,85xx";
+	model = "tqc,tqm8555";
+	compatible = "tqc,tqm8555";
 	#address-cells = <1>;
 	#size-cells = <1>;
 
diff --git a/trunk/arch/powerpc/boot/dts/tqm8560.dts b/trunk/arch/powerpc/boot/dts/tqm8560.dts
index a4ee596e97bc..979058c2b5d4 100644
--- a/trunk/arch/powerpc/boot/dts/tqm8560.dts
+++ b/trunk/arch/powerpc/boot/dts/tqm8560.dts
@@ -12,8 +12,8 @@
 /dts-v1/;
 
 / {
-	model = "tqm,8560";
-	compatible = "tqm,8560", "tqm,85xx";
+	model = "tqc,tqm8560";
+	compatible = "tqc,tqm8560";
 	#address-cells = <1>;
 	#size-cells = <1>;
 
diff --git a/trunk/arch/powerpc/platforms/85xx/tqm85xx.c b/trunk/arch/powerpc/platforms/85xx/tqm85xx.c
index 77681acf1bae..a682cbcdfb9e 100644
--- a/trunk/arch/powerpc/platforms/85xx/tqm85xx.c
+++ b/trunk/arch/powerpc/platforms/85xx/tqm85xx.c
@@ -165,10 +165,10 @@ static int __init tqm85xx_probe(void)
 {
 	unsigned long root = of_get_flat_dt_root();
 
-	if ((of_flat_dt_is_compatible(root, "tqm,8540")) ||
-	    (of_flat_dt_is_compatible(root, "tqm,8541")) ||
-	    (of_flat_dt_is_compatible(root, "tqm,8555")) ||
-	    (of_flat_dt_is_compatible(root, "tqm,8560")))
+	if ((of_flat_dt_is_compatible(root, "tqc,tqm8540")) ||
+	    (of_flat_dt_is_compatible(root, "tqc,tqm8541")) ||
+	    (of_flat_dt_is_compatible(root, "tqc,tqm8555")) ||
+	    (of_flat_dt_is_compatible(root, "tqc,tqm8560")))
 		return 1;
 
 	return 0;