powerpc/fsl: Updated device trees for platforms with corenet version 2

Updated the device trees according to the corenet-cf
binding definition.

Signed-off-by: Diana Craciun <Diana.Craciun@freescale.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>

diff --git a/arch/powerpc/boot/dts/b4860emu.dts b/arch/powerpc/boot/dts/b4860emu.dts
index 7290021..85646b4 100644 (file)
--- a/arch/powerpc/boot/dts/b4860emu.dts
+++ b/arch/powerpc/boot/dts/b4860emu.dts
@@ -61,21 +61,25 @@
                        device_type = "cpu";
                        reg = <0 1>;
                        next-level-cache = <&L2>;
+                       fsl,portid-mapping = <0x80000000>;
                };
                cpu1: PowerPC,e6500@2 {
                        device_type = "cpu";
                        reg = <2 3>;
                        next-level-cache = <&L2>;
+                       fsl,portid-mapping = <0x80000000>;
                };
                cpu2: PowerPC,e6500@4 {
                        device_type = "cpu";
                        reg = <4 5>;
                        next-level-cache = <&L2>;
+                       fsl,portid-mapping = <0x80000000>;
                };
                cpu3: PowerPC,e6500@6 {
                        device_type = "cpu";
                        reg = <6 7>;
                        next-level-cache = <&L2>;
+                       fsl,portid-mapping = <0x80000000>;
                };
        };
 };
@@ -157,7 +161,7 @@
        };
 
        corenet-cf@18000 {
-               compatible = "fsl,b4-corenet-cf";
+               compatible = "fsl,corenet2-cf", "fsl,corenet-cf";
                reg = <0x18000 0x1000>;
                interrupts = <16 2 1 0>;
                fsl,ccf-num-csdids = <32>;
@@ -167,6 +171,7 @@
        iommu@20000 {
                compatible = "fsl,pamu-v1.0", "fsl,pamu";
                reg = <0x20000 0x4000>;
+               fsl,portid-mapping = <0x8000>;
                #address-cells = <1>;
                #size-cells = <1>;
                interrupts = <

diff --git a/arch/powerpc/boot/dts/fsl/b4420si-post.dtsi b/arch/powerpc/boot/dts/fsl/b4420si-post.dtsi
index 60566f9..d678944 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/b4420si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/b4420si-post.dtsi
@@ -76,10 +76,6 @@
                compatible = "fsl,b4420-l3-cache-controller", "cache";
        };
 
-       corenet-cf@18000 {
-               compatible = "fsl,b4420-corenet-cf";
-       };
-
        guts: global-utilities@e0000 {
                compatible = "fsl,b4420-device-config", "fsl,qoriq-device-config-2.0";
        };

diff --cc arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi
Simple merge

diff --cc arch/powerpc/boot/dts/fsl/b4860si-post.dtsi
Simple merge

diff --cc arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi
Simple merge

diff --cc arch/powerpc/boot/dts/fsl/b4si-post.dtsi
Simple merge

diff --cc arch/powerpc/boot/dts/fsl/t4240si-post.dtsi
Simple merge

diff --cc arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi
Simple merge

diff --cc arch/powerpc/boot/dts/t4240emu.dts
Simple merge