Like for the TQM5200, the vendor prefix "tqc," is now used for all
TQM85xx modules from TQ-Components GmbH (http://www.tqc.de) in the
corresponding DTS files.
Signed-off-by: Wolfgang Grandegger <[EMAIL PROTECTED]>
---
arch/powerpc/boot/dts/tqm8540.dts | 4 ++--
arch/powerpc/boot/dts/tqm8541.dts | 4 ++--
arch/powerpc/boot/dts/tqm8548-bigflash.dts | 4 ++--
arch/powerpc/boot/dts/tqm8548.dts | 4 ++--
arch/powerpc/boot/dts/tqm8555.dts | 4 ++--
arch/powerpc/boot/dts/tqm8560.dts | 4 ++--
arch/powerpc/platforms/85xx/tqm85xx.c | 10 +++++-----
7 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/arch/powerpc/boot/dts/tqm8540.dts
b/arch/powerpc/boot/dts/tqm8540.dts
index 1addb3a..20e2496 100644
--- a/arch/powerpc/boot/dts/tqm8540.dts
+++ b/arch/powerpc/boot/dts/tqm8540.dts
@@ -12,8 +12,8 @@
/dts-v1/;
/ {
- model = "tqm,8540";
- compatible = "tqm,8540", "tqm,85xx";
+ model = "tqc,8540";
+ compatible = "tqc,8540", "tqc,85xx";
#address-cells = <1>;
#size-cells = <1>;
diff --git a/arch/powerpc/boot/dts/tqm8541.dts
b/arch/powerpc/boot/dts/tqm8541.dts
index 9e01093..1cf1e4e 100644
--- a/arch/powerpc/boot/dts/tqm8541.dts
+++ b/arch/powerpc/boot/dts/tqm8541.dts
@@ -12,8 +12,8 @@
/dts-v1/;
/ {
- model = "tqm,8541";
- compatible = "tqm,8541", "tqm,85xx";
+ model = "tqc,8541";
+ compatible = "tqc,8541", "tqc,85xx";
#address-cells = <1>;
#size-cells = <1>;
diff --git a/arch/powerpc/boot/dts/tqm8548-bigflash.dts
b/arch/powerpc/boot/dts/tqm8548-bigflash.dts
index 895bb80..4f8f033 100644
--- a/arch/powerpc/boot/dts/tqm8548-bigflash.dts
+++ b/arch/powerpc/boot/dts/tqm8548-bigflash.dts
@@ -13,8 +13,8 @@
/dts-v1/;
/ {
- model = "tqm,8548";
- compatible = "tqm,8548", "tqm,85xx";
+ model = "tqc,8548";
+ compatible = "tqc,8548", "tqc,85xx";
#address-cells = <1>;
#size-cells = <1>;
diff --git a/arch/powerpc/boot/dts/tqm8548.dts
b/arch/powerpc/boot/dts/tqm8548.dts
index d09250a..1155dc0 100644
--- a/arch/powerpc/boot/dts/tqm8548.dts
+++ b/arch/powerpc/boot/dts/tqm8548.dts
@@ -13,8 +13,8 @@
/dts-v1/;
/ {
- model = "tqm,8548";
- compatible = "tqm,8548", "tqm,85xx";
+ model = "tqc,8548";
+ compatible = "tqc,8548", "tqc,85xx";
#address-cells = <1>;
#size-cells = <1>;
diff --git a/arch/powerpc/boot/dts/tqm8555.dts
b/arch/powerpc/boot/dts/tqm8555.dts
index a20eb06..da7b90a 100644
--- a/arch/powerpc/boot/dts/tqm8555.dts
+++ b/arch/powerpc/boot/dts/tqm8555.dts
@@ -12,8 +12,8 @@
/dts-v1/;
/ {
- model = "tqm,8555";
- compatible = "tqm,8555", "tqm,85xx";
+ model = "tqc,8555";
+ compatible = "tqc,8555", "tqc,85xx";
#address-cells = <1>;
#size-cells = <1>;
diff --git a/arch/powerpc/boot/dts/tqm8560.dts
b/arch/powerpc/boot/dts/tqm8560.dts
index c2c25cd..12c7ca6 100644
--- a/arch/powerpc/boot/dts/tqm8560.dts
+++ b/arch/powerpc/boot/dts/tqm8560.dts
@@ -13,8 +13,8 @@
/dts-v1/;
/ {
- model = "tqm,8560";
- compatible = "tqm,8560", "tqm,85xx";
+ model = "tqc,8560";
+ compatible = "tqc,8560", "tqc,85xx";
#address-cells = <1>;
#size-cells = <1>;
diff --git a/arch/powerpc/platforms/85xx/tqm85xx.c
b/arch/powerpc/platforms/85xx/tqm85xx.c
index 5746a40..45418df 100644
--- a/arch/powerpc/platforms/85xx/tqm85xx.c
+++ b/arch/powerpc/platforms/85xx/tqm85xx.c
@@ -174,11 +174,11 @@ 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,8548")) ||
- (of_flat_dt_is_compatible(root, "tqm,8555")) ||
- (of_flat_dt_is_compatible(root, "tqm,8560")))
+ if ((of_flat_dt_is_compatible(root, "tqc,8540")) ||
+ (of_flat_dt_is_compatible(root, "tqc,8541")) ||
+ (of_flat_dt_is_compatible(root, "tqc,8548")) ||
+ (of_flat_dt_is_compatible(root, "tqc,8555")) ||
+ (of_flat_dt_is_compatible(root, "tqc,8560")))
return 1;
return 0;
--
1.5.4.2
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev
