From 390167efa329d11099957108fc23d1ad15c3f37e Mon Sep 17 00:00:00 2001 From: Paul Gortmaker Date: Mon, 28 Jan 2008 02:27:51 -0500 Subject: [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 Signed-off-by: Kumar Gala --- arch/powerpc/boot/dts/mpc832x_mds.dts | 2 ++ arch/powerpc/boot/dts/mpc832x_rdb.dts | 2 ++ arch/powerpc/boot/dts/mpc836x_mds.dts | 4 +++- arch/powerpc/boot/dts/mpc8568mds.dts | 4 +++- 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 @@ bus-frequency = ; 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 f086fac5921..551fc595075 100644 --- a/arch/powerpc/boot/dts/mpc832x_rdb.dts +++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts @@ -173,6 +173,8 @@ bus-frequency = ; 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 d3b8262df68..dc6caf0b4c2 100644 --- 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 c929fba7f39..97bc048f215 100644 --- 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>; -- cgit v1.2.2