[POWERPC] QE: Explicitly set address-cells and size cells for muram

Currently there are several dts that don't specify address or size
cells for the muram.  This causes dtc to use default values, one of
which is an address-cells of two, and this breaks the parsing of the
muram ranges, which is assuming an address-cells of one. For example:

Warning (reg_format): "reg" property in
/qe@e0100000/muram@10000/data-only@0 has invalid length
(8 bytes) (#address-cells == 2, #size-cells == 1)

Explicitly setting the address and size cells gets it parsed properly
and gets rid of the four dtc warnings.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts
index 15bb345..7c3c52c 100644 (file)
--- a/arch/powerpc/boot/dts/mpc832x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc832x_mds.dts
@@ -212,6 +212,8 @@
                bus-frequency = <BCD3D80>;
 
                muram@10000 {
+                       #address-cells = <1>;
+                       #size-cells = <1>;
                        compatible = "fsl,qe-muram", "fsl,cpm-muram";
                        ranges = <0 00010000 00004000>;
 

diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index f086fac..551fc59 100644 (file)
--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -173,6 +173,8 @@
                bus-frequency = <BCD3D80>;
 
                muram@10000 {
+                       #address-cells = <1>;
+                       #size-cells = <1>;
                        compatible = "fsl,qe-muram", "fsl,cpm-muram";
                        ranges = <0 00010000 00004000>;
 

diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts
index d3b8262..dc6caf0 100644 (file)
--- a/arch/powerpc/boot/dts/mpc836x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc836x_mds.dts
@@ -214,10 +214,12 @@
                bus-frequency = <179A7B00>;
 
                muram@10000 {
+                       #address-cells = <1>;
+                       #size-cells = <1>;
                        compatible = "fsl,qe-muram", "fsl,cpm-muram";
                        ranges = <0 00010000 0000c000>;
 
-                       data-only@0{
+                       data-only@0 {
                                compatible = "fsl,qe-muram-data",
                                             "fsl,cpm-muram-data";
                                reg = <0 c000>;

diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts
index c929fba..97bc048 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8568mds.dts
+++ b/arch/powerpc/boot/dts/mpc8568mds.dts
@@ -291,10 +291,12 @@
                bus-frequency = <179A7B00>;
 
                muram@10000 {
+                       #address-cells = <1>;
+                       #size-cells = <1>;
                        compatible = "fsl,qe-muram", "fsl,cpm-muram";
                        ranges = <0 00010000 0000c000>;
 
-                       data-only@0{
+                       data-only@0 {
                                compatible = "fsl,qe-muram-data",
                                             "fsl,cpm-muram-data";
                                reg = <0 c000>;