[POWERPC] QE: get rid of most device_types and model

Now we're searching for "fsl,qe", "fsl,qe-muram", "fsl,qe-muram-data"
and "fsl,qe-ic".

Unfortunately it's still impossible to remove device_type = "qe"
from the existing device trees because older u-boots are looking for it.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

4 files changed, 23 insertions, 16 deletions

diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts
index 690252456d3d..e300df4d3e05 100644
--- a/arch/powerpc/boot/dts/mpc832x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc832x_mds.dts
@@ -206,17 +206,18 @@
                 #size-cells = <1>;
                 device_type = "qe";
                 compatible = "fsl,qe";
-                model = "QE";
                 ranges = <0 e0100000 00100000>;
                 reg = <e0100000 480>;
                 brg-frequency = <0>;
                 bus-frequency = <BCD3D80>;
 
                 muram@10000 {
-                        device_type = "muram";
+                        compatible = "fsl,qe-muram", "fsl,cpm-muram";
                         ranges = <0 00010000 00004000>;
 
                         data-only@0 {
+                                compatible = "fsl,qe-muram-data",
+                                             "fsl,cpm-muram-data";
                                 reg = <0 4000>;
                         };
                 };
@@ -320,9 +321,9 @@
                         };
                 };
 
-                qeic: qeic@80 {
+                qeic: interrupt-controller@80 {
                         interrupt-controller;
-                        device_type = "qeic";
+                        compatible = "fsl,qe-ic";
                         #address-cells = <0>;
                         #interrupt-cells = <1>;
                         reg = <80 80>;
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index 10ff7aadf9dc..4d5cfd32cd7c 100644
--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -166,17 +166,19 @@
                 #address-cells = <1>;
                 #size-cells = <1>;
                 device_type = "qe";
-                model = "QE";
+                compatible = "fsl,qe";
                 ranges = <0 e0100000 00100000>;
                 reg = <e0100000 480>;
                 brg-frequency = <0>;
                 bus-frequency = <BCD3D80>;
 
                 muram@10000 {
-                        device_type = "muram";
+                        compatible = "fsl,qe-muram", "fsl,cpm-muram";
                         ranges = <0 00010000 00004000>;
 
                         data-only@0 {
+                                compatible = "fsl,qe-muram-data",
+                                             "fsl,cpm-muram-data";
                                 reg = <0 4000>;
                         };
                 };
@@ -252,9 +254,9 @@
                         };
                 };
 
-                qeic:qeic@80 {
+                qeic:interrupt-controller@80 {
                         interrupt-controller;
-                        device_type = "qeic";
+                        compatible = "fsl,qe-ic";
                         #address-cells = <0>;
                         #interrupt-cells = <1>;
                         reg = <80 80>;
diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts
index 2181d2cdbff2..9a2581b6a170 100644
--- a/arch/powerpc/boot/dts/mpc836x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc836x_mds.dts
@@ -207,17 +207,19 @@
                 #address-cells = <1>;
                 #size-cells = <1>;
                 device_type = "qe";
-                model = "QE";
+                compatible = "fsl,qe";
                 ranges = <0 e0100000 00100000>;
                 reg = <e0100000 480>;
                 brg-frequency = <0>;
                 bus-frequency = <179A7B00>;
 
                 muram@10000 {
-                        device_type = "muram";
+                        compatible = "fsl,qe-muram", "fsl,cpm-muram";
                         ranges = <0 00010000 0000c000>;
 
                         data-only@0{
+                                compatible = "fsl,qe-muram-data",
+                                             "fsl,cpm-muram-data";
                                 reg = <0 c000>;
                         };
                 };
@@ -303,9 +305,9 @@
                         };
                 };
 
-                qeic: qeic@80 {
+                qeic: interrupt-controller@80 {
                         interrupt-controller;
-                        device_type = "qeic";
+                        compatible = "fsl,qe-ic";
                         #address-cells = <0>;
                         #interrupt-cells = <1>;
                         reg = <80 80>;
diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts
index 5818a7c861e7..04f5c6f68256 100644
--- a/arch/powerpc/boot/dts/mpc8568mds.dts
+++ b/arch/powerpc/boot/dts/mpc8568mds.dts
@@ -284,17 +284,19 @@
                 #address-cells = <1>;
                 #size-cells = <1>;
                 device_type = "qe";
-                model = "QE";
+                compatible = "fsl,qe";
                 ranges = <0 e0080000 00040000>;
                 reg = <e0080000 480>;
                 brg-frequency = <0>;
                 bus-frequency = <179A7B00>;
 
                 muram@10000 {
-                        device_type = "muram";
+                        compatible = "fsl,qe-muram", "fsl,cpm-muram";
                         ranges = <0 00010000 0000c000>;
 
                         data-only@0{
+                                compatible = "fsl,qe-muram-data",
+                                             "fsl,cpm-muram-data";
                                 reg = <0 c000>;
                         };
                 };
@@ -385,9 +387,9 @@
                         };
                 };
 
-                qeic: qeic@80 {
+                qeic: interrupt-controller@80 {
                         interrupt-controller;
-                        device_type = "qeic";
+                        compatible = "fsl,qe-ic";
                         #address-cells = <0>;
                         #interrupt-cells = <1>;
                         reg = <80 80>;