[POWERPC] cpm: Describe multi-user ram in its own device node.

The way the current CPM binding describes available multi-user (a.k.a.
dual-ported) RAM doesn't work well when there are multiple free regions,
and it doesn't work at all if the region doesn't begin at the start of
the muram area (as the hardware needs to be programmed with offsets into
this area).  The latter situation can happen with SMC UARTs on CPM2, as its
parameter RAM is relocatable, u-boot puts it at zero, and the kernel doesn't
support moving it.

It is now described with a muram node, similar to QE.  The current CPM
binding is sufficiently recent (i.e. never appeared in an official release)
that compatibility with existing device trees is not an issue.

The code supporting the new binding is shared between cpm1 and cpm2, rather
than remain separated.  QE should be able to use this code as well, once
minor fixes are made to its device trees.

Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

4 files changed, 47 insertions, 3 deletions

diff --git a/arch/powerpc/boot/dts/ep88xc.dts b/arch/powerpc/boot/dts/ep88xc.dts
index 0406fc50b2af..02705f299790 100644
--- a/arch/powerpc/boot/dts/ep88xc.dts
+++ b/arch/powerpc/boot/dts/ep88xc.dts
@@ -142,9 +142,20 @@
                         command-proc = <9c0>;
                         interrupts = <0>;       // cpm error interrupt
                         interrupt-parent = <&CPM_PIC>;
-                        reg = <9c0 40 2000 1c00>;
+                        reg = <9c0 40>;
                         ranges;
 
+                        muram@2000 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                ranges = <0 2000 2000>;
+
+                                data@0 {
+                                        compatible = "fsl,cpm-muram-data";
+                                        reg = <0 1c00>;
+                                };
+                        };
+
                         brg@9f0 {
                                 compatible = "fsl,mpc885-brg",
                                              "fsl,cpm1-brg",
diff --git a/arch/powerpc/boot/dts/mpc8272ads.dts b/arch/powerpc/boot/dts/mpc8272ads.dts
index 3fe991d4cb03..188179df0845 100644
--- a/arch/powerpc/boot/dts/mpc8272ads.dts
+++ b/arch/powerpc/boot/dts/mpc8272ads.dts
@@ -124,6 +124,17 @@
                         reg = <119c0 30 0 2000>;
                         ranges;
 
+                        muram@0 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                ranges = <0 0 10000>;
+
+                                data@0 {
+                                        compatible = "fsl,cpm-muram-data";
+                                        reg = <0 2000 9800 800>;
+                                };
+                        };
+
                         brg@119f0 {
                                 compatible = "fsl,mpc8272-brg",
                                              "fsl,cpm2-brg",
diff --git a/arch/powerpc/boot/dts/mpc885ads.dts b/arch/powerpc/boot/dts/mpc885ads.dts
index cbcd16f74c45..8848e637293e 100644
--- a/arch/powerpc/boot/dts/mpc885ads.dts
+++ b/arch/powerpc/boot/dts/mpc885ads.dts
@@ -148,9 +148,20 @@
                         command-proc = <9c0>;
                         interrupts = <0>;       // cpm error interrupt
                         interrupt-parent = <&CPM_PIC>;
-                        reg = <9c0 40 2000 1c00>;
+                        reg = <9c0 40>;
                         ranges;
 
+                        muram@2000 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                ranges = <0 2000 2000>;
+
+                                data@0 {
+                                        compatible = "fsl,cpm-muram-data";
+                                        reg = <0 1c00>;
+                                };
+                        };
+
                         brg@9f0 {
                                 compatible = "fsl,mpc885-brg",
                                              "fsl,cpm1-brg",
diff --git a/arch/powerpc/boot/dts/pq2fads.dts b/arch/powerpc/boot/dts/pq2fads.dts
index 54e8bd1ae22f..2d564921897a 100644
--- a/arch/powerpc/boot/dts/pq2fads.dts
+++ b/arch/powerpc/boot/dts/pq2fads.dts
@@ -119,9 +119,20 @@
                         #size-cells = <1>;
                         #interrupt-cells = <2>;
                         compatible = "fsl,mpc8280-cpm", "fsl,cpm2";
-                        reg = <119c0 30 0 2000>;
+                        reg = <119c0 30>;
                         ranges;
 
+                        muram@0 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                ranges = <0 0 10000>;
+
+                                data@0 {
+                                        compatible = "fsl,cpm-muram-data";
+                                        reg = <0 2000 9800 800>;
+                                };
+                        };
+
                         brg@119f0 {
                                 compatible = "fsl,mpc8280-brg",
                                              "fsl,cpm2-brg",