aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2008-01-28 02:27:51 -0500
committerKumar Gala <galak@kernel.crashing.org>2008-01-28 10:02:09 -0500
commit390167efa329d11099957108fc23d1ad15c3f37e (patch)
tree2ce8fd64951541ca4e04f27710583d90999b4e22
parent762931571edcf4067bc8f0de929752eb424b039e (diff)
[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>
-rw-r--r--arch/powerpc/boot/dts/mpc832x_mds.dts2
-rw-r--r--arch/powerpc/boot/dts/mpc832x_rdb.dts2
-rw-r--r--arch/powerpc/boot/dts/mpc836x_mds.dts4
-rw-r--r--arch/powerpc/boot/dts/mpc8568mds.dts4
4 files changed, 10 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts
index 15bb3459ff8..7c3c52cea75 100644
--- a/arch/powerpc/boot/dts/mpc832x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc832x_mds.dts
@@ -212,6 +212,8 @@
212 bus-frequency = <BCD3D80>; 212 bus-frequency = <BCD3D80>;
213 213
214 muram@10000 { 214 muram@10000 {
215 #address-cells = <1>;
216 #size-cells = <1>;
215 compatible = "fsl,qe-muram", "fsl,cpm-muram"; 217 compatible = "fsl,qe-muram", "fsl,cpm-muram";
216 ranges = <0 00010000 00004000>; 218 ranges = <0 00010000 00004000>;
217 219
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index f086fac5921..551fc595075 100644
--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -173,6 +173,8 @@
173 bus-frequency = <BCD3D80>; 173 bus-frequency = <BCD3D80>;
174 174
175 muram@10000 { 175 muram@10000 {
176 #address-cells = <1>;
177 #size-cells = <1>;
176 compatible = "fsl,qe-muram", "fsl,cpm-muram"; 178 compatible = "fsl,qe-muram", "fsl,cpm-muram";
177 ranges = <0 00010000 00004000>; 179 ranges = <0 00010000 00004000>;
178 180
diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts
index d3b8262df68..dc6caf0b4c2 100644
--- a/arch/powerpc/boot/dts/mpc836x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc836x_mds.dts
@@ -214,10 +214,12 @@
214 bus-frequency = <179A7B00>; 214 bus-frequency = <179A7B00>;
215 215
216 muram@10000 { 216 muram@10000 {
217 #address-cells = <1>;
218 #size-cells = <1>;
217 compatible = "fsl,qe-muram", "fsl,cpm-muram"; 219 compatible = "fsl,qe-muram", "fsl,cpm-muram";
218 ranges = <0 00010000 0000c000>; 220 ranges = <0 00010000 0000c000>;
219 221
220 data-only@0{ 222 data-only@0 {
221 compatible = "fsl,qe-muram-data", 223 compatible = "fsl,qe-muram-data",
222 "fsl,cpm-muram-data"; 224 "fsl,cpm-muram-data";
223 reg = <0 c000>; 225 reg = <0 c000>;
diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts
index c929fba7f39..97bc048f215 100644
--- a/arch/powerpc/boot/dts/mpc8568mds.dts
+++ b/arch/powerpc/boot/dts/mpc8568mds.dts
@@ -291,10 +291,12 @@
291 bus-frequency = <179A7B00>; 291 bus-frequency = <179A7B00>;
292 292
293 muram@10000 { 293 muram@10000 {
294 #address-cells = <1>;
295 #size-cells = <1>;
294 compatible = "fsl,qe-muram", "fsl,cpm-muram"; 296 compatible = "fsl,qe-muram", "fsl,cpm-muram";
295 ranges = <0 00010000 0000c000>; 297 ranges = <0 00010000 0000c000>;
296 298
297 data-only@0{ 299 data-only@0 {
298 compatible = "fsl,qe-muram-data", 300 compatible = "fsl,qe-muram-data",
299 "fsl,cpm-muram-data"; 301 "fsl,cpm-muram-data";
300 reg = <0 c000>; 302 reg = <0 c000>;