Merge remote-tracking branch 'drm-tegra/drm/tegra/for-next'

[karo-tx-linux.git] / arch / powerpc / boot / dts / fsl / b4860si-post.dtsi

diff --git a/arch/powerpc/boot/dts/fsl/b4860si-post.dtsi b/arch/powerpc/boot/dts/fsl/b4860si-post.dtsi
index 9ba904be39ee185cdd5d70ff0d9431d1a5bfcdad..8687198211061c640d481a345bab1ad689394814 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/b4860si-post.dtsi
+++ b/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 */
        };
 };
 
@@ -260,7 +258,27 @@
                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>;
        };
 };