These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / powerpc / boot / dts / fsl / b4420si-post.dtsi

diff --git a/kernel/arch/powerpc/boot/dts/fsl/b4420si-post.dtsi b/kernel/arch/powerpc/boot/dts/fsl/b4420si-post.dtsi
index 86161ae..f996cce 100644 (file)
--- a/kernel/arch/powerpc/boot/dts/fsl/b4420si-post.dtsi
+++ b/kernel/arch/powerpc/boot/dts/fsl/b4420si-post.dtsi
@@ -80,27 +80,18 @@
                compatible = "fsl,b4420-device-config", "fsl,qoriq-device-config-2.0";
        };
 
-/include/ "qoriq-clockgen2.dtsi"
        global-utilities@e1000 {
-               compatible = "fsl,b4420-clockgen", "fsl,qoriq-clockgen-2.0";
-
-               mux0: mux0@0 {
-                       #clock-cells = <0>;
-                       reg = <0x0 0x4>;
-                       compatible = "fsl,qoriq-core-mux-2.0";
-                       clocks = <&pll0 0>, <&pll0 1>, <&pll0 2>,
-                               <&pll1 0>, <&pll1 1>, <&pll1 2>;
-                       clock-names = "pll0", "pll0-div2", "pll0-div4",
-                               "pll1", "pll1-div2", "pll1-div4";
-                       clock-output-names = "cmux0";
-               };
+               compatible = "fsl,b4420-clockgen", "fsl,b4-clockgen",
+                             "fsl,qoriq-clockgen-2.0";
        };
 
        rcpm: global-utilities@e2000 {
                compatible = "fsl,b4420-rcpm", "fsl,qoriq-rcpm-2.0";
        };
 
-       L2: l2-cache-controller@c20000 {
+       L2_1: l2-cache-controller@c20000 {
                compatible = "fsl,b4420-l2-cache-controller";
+               reg = <0xc20000 0x40000>;
+               next-level-cache = <&cpc>;
        };
 };