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

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

diff --git a/kernel/arch/powerpc/boot/dts/fsl/b4860si-post.dtsi b/kernel/arch/powerpc/boot/dts/fsl/b4860si-post.dtsi
index f35e9e0..8687198 100644 (file)
--- a/kernel/arch/powerpc/boot/dts/fsl/b4860si-post.dtsi
+++ b/kernel/arch/powerpc/boot/dts/fsl/b4860si-post.dtsi
@@ -1,7 +1,7 @@
 /*
  * B4860 Silicon/SoC Device Tree Source (post include)
  *
- * Copyright 2012 - 2014 Freescale Semiconductor Inc.
+ * Copyright 2012 - 2015 Freescale Semiconductor Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -51,14 +51,12 @@
                #address-cells = <2>;
                #size-cells = <2>;
                cell-index = <1>;
-               fsl,liodn-reg = <&guts 0x510>; /* RIO1LIODNR */
        };
 
        port2 {
                #address-cells = <2>;
                #size-cells = <2>;
                cell-index = <2>;
-               fsl,liodn-reg = <&guts 0x514>; /* RIO2LIODNR */
        };
 };
 
@@ -167,6 +165,75 @@
        };
 };
 
+&qportals {
+       qportal14: qman-portal@38000 {
+               compatible = "fsl,qman-portal";
+               reg = <0x38000 0x4000>, <0x100e000 0x1000>;
+               interrupts = <132 0x2 0 0>;
+               cell-index = <0xe>;
+       };
+       qportal15: qman-portal@3c000 {
+               compatible = "fsl,qman-portal";
+               reg = <0x3c000 0x4000>, <0x100f000 0x1000>;
+               interrupts = <134 0x2 0 0>;
+               cell-index = <0xf>;
+       };
+       qportal16: qman-portal@40000 {
+               compatible = "fsl,qman-portal";
+               reg = <0x40000 0x4000>, <0x1010000 0x1000>;
+               interrupts = <136 0x2 0 0>;
+               cell-index = <0x10>;
+       };
+       qportal17: qman-portal@44000 {
+               compatible = "fsl,qman-portal";
+               reg = <0x44000 0x4000>, <0x1011000 0x1000>;
+               interrupts = <138 0x2 0 0>;
+               cell-index = <0x11>;
+       };
+       qportal18: qman-portal@48000 {
+               compatible = "fsl,qman-portal";
+               reg = <0x48000 0x4000>, <0x1012000 0x1000>;
+               interrupts = <140 0x2 0 0>;
+               cell-index = <0x12>;
+       };
+       qportal19: qman-portal@4c000 {
+               compatible = "fsl,qman-portal";
+               reg = <0x4c000 0x4000>, <0x1013000 0x1000>;
+               interrupts = <142 0x2 0 0>;
+               cell-index = <0x13>;
+       };
+       qportal20: qman-portal@50000 {
+               compatible = "fsl,qman-portal";
+               reg = <0x50000 0x4000>, <0x1014000 0x1000>;
+               interrupts = <144 0x2 0 0>;
+               cell-index = <0x14>;
+       };
+       qportal21: qman-portal@54000 {
+               compatible = "fsl,qman-portal";
+               reg = <0x54000 0x4000>, <0x1015000 0x1000>;
+               interrupts = <146 0x2 0 0>;
+               cell-index = <0x15>;
+       };
+       qportal22: qman-portal@58000 {
+               compatible = "fsl,qman-portal";
+               reg = <0x58000 0x4000>, <0x1016000 0x1000>;
+               interrupts = <148 0x2 0 0>;
+               cell-index = <0x16>;
+       };
+       qportal23: qman-portal@5c000 {
+               compatible = "fsl,qman-portal";
+               reg = <0x5c000 0x4000>, <0x1017000 0x1000>;
+               interrupts = <150 0x2 0 0>;
+               cell-index = <0x17>;
+       };
+       qportal24: qman-portal@60000 {
+               compatible = "fsl,qman-portal";
+               reg = <0x60000 0x4000>, <0x1018000 0x1000>;
+               interrupts = <152 0x2 0 0>;
+               cell-index = <0x18>;
+       };
+};
+
 &soc {
        ddr2: memory-controller@9000 {
                compatible = "fsl,qoriq-memory-controller-v4.5", "fsl,qoriq-memory-controller";
@@ -182,27 +249,36 @@
                compatible = "fsl,b4860-device-config", "fsl,qoriq-device-config-2.0";
        };
 
-/include/ "qoriq-clockgen2.dtsi"
        global-utilities@e1000 {
-               compatible = "fsl,b4860-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,b4860-clockgen", "fsl,b4-clockgen",
+                             "fsl,qoriq-clockgen-2.0";
        };
 
        rcpm: global-utilities@e2000 {
                compatible = "fsl,b4860-rcpm", "fsl,qoriq-rcpm-2.0";
        };
 
-       L2: l2-cache-controller@c20000 {
+/include/ "qoriq-fman3-0-1g-4.dtsi"
+/include/ "qoriq-fman3-0-1g-5.dtsi"
+/include/ "qoriq-fman3-0-10g-0.dtsi"
+/include/ "qoriq-fman3-0-10g-1.dtsi"
+       fman@400000 {
+               enet4: ethernet@e8000 {
+               };
+
+               enet5: ethernet@ea000 {
+               };
+
+               enet6: ethernet@f0000 {
+               };
+
+               enet7: ethernet@f2000 {
+               };
+       };
+
+       L2_1: l2-cache-controller@c20000 {
                compatible = "fsl,b4860-l2-cache-controller";
+               reg = <0xc20000 0x40000>;
+               next-level-cache = <&cpc>;
        };
 };