Revert "dts: socfpga: Add DTS entry for adding the stmmac glue layer for stmmac."

This reverts commit 7e0b4cd06201ee9dbdf2d13bfd7b8a021b414e42.

The binding changes need to be done differently as well, let's
take them through netdev, and merge the dts changes in a new
patch here.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

6 files changed, 17 insertions, 138 deletions

diff --git a/Documentation/devicetree/bindings/net/socfpga-dwmac.txt b/Documentation/devicetree/bindings/net/socfpga-dwmac.txt
deleted file mode 100644
index d53d3765b2c6..000000000000
--- a/Documentation/devicetree/bindings/net/socfpga-dwmac.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-Altera SOCFPGA SoC DWMAC controller
-
-The device node has following properties.
-
-Required properties:
- - compatible   : Should contain "altr,socfpga-stmmac"
- - altr,sysmgr-syscon : Should be the phandle to the system manager node that
-   encompasses the glue register, and the register offset.
-
-Sub-nodes:
-The dwmac core should be added as subnode to SOCFPGA dwmac glue.
-- dwmac :       The binding details of dwmac can be found in
-  Documentation/devicetree/bindings/net/stmmac.txt
-
-Example:
-
-ethernet0: ethernet0 {
-        #address-cells = <1>;
-        #size-cells = <1>;
-
-        compatible = "altr,socfpga-stmmac";
-        altr,sysmgr-syscon = <&sysmgr 0x60>;
-        status = "disabled";
-        ranges;
-
-        gmac0: gmac0@ff700000 {
-                compatible = "snps,dwmac-3.70a", "snps,dwmac";
-                reg = <0xff700000 0x2000>;
-                interrupts = <0 115 4>;
-                interrupt-names = "macirq";
-                mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */
-                clocks = <&emac0_clk>;
-                clock-names = "stmmaceth";
-        };
-};
diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi
index 404553c97f31..74cceae8fdef 100644
--- a/arch/arm/boot/dts/socfpga.dtsi
+++ b/arch/arm/boot/dts/socfpga.dtsi
@@ -450,43 +450,26 @@
                                 };
                         };
 
-                ethernet0: ethernet0 {
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-                        compatible = "altr,socfpga-stmmac";
-                        altr,sysmgr-syscon = <&sysmgr 0x60>;
+                gmac0: ethernet@ff700000 {
+                        compatible = "altr,socfpga-stmmac", "snps,dwmac-3.70a", "snps,dwmac";
+                        reg = <0xff700000 0x2000>;
+                        interrupts = <0 115 4>;
+                        interrupt-names = "macirq";
+                        mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */
+                        clocks = <&emac0_clk>;
+                        clock-names = "stmmaceth";
                         status = "disabled";
-                        ranges;
-
-                        gmac0: gmac0@ff700000 {
-                                compatible = "snps,dwmac-3.70a", "snps,dwmac";
-                                reg = <0xff700000 0x2000>;
-                                interrupts = <0 115 4>;
-                                interrupt-names = "macirq";
-                                mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */
-                                clocks = <&emac0_clk>;
-                                clock-names = "stmmaceth";
-                        };
                 };
 
-                ethernet1: ethernet1 {
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-                        compatible = "altr,socfpga-stmmac";
-                        altr,sysmgr-syscon = <&sysmgr 0x60>;
+                gmac1: ethernet@ff702000 {
+                        compatible = "altr,socfpga-stmmac", "snps,dwmac-3.70a", "snps,dwmac";
+                        reg = <0xff702000 0x2000>;
+                        interrupts = <0 120 4>;
+                        interrupt-names = "macirq";
+                        mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */
+                        clocks = <&emac1_clk>;
+                        clock-names = "stmmaceth";
                         status = "disabled";
-                        ranges;
-
-                        gmac1: gmac1@ff702000 {
-                                device_type = "network";
-                                compatible = "snps,dwmac-3.70a", "snps,dwmac";
-                                reg = <0xff702000 0x2000>;
-                                interrupts = <0 120 4>;
-                                interrupt-names = "macirq";
-                                mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */
-                                clocks = <&emac1_clk>;
-                                clock-names = "stmmaceth";
-                        };
                 };
 
                 L2: l2-cache@fffef000 {
diff --git a/arch/arm/boot/dts/socfpga_arria5_socdk.dts b/arch/arm/boot/dts/socfpga_arria5_socdk.dts
index 2d6b38ba9370..5beffb2265f4 100644
--- a/arch/arm/boot/dts/socfpga_arria5_socdk.dts
+++ b/arch/arm/boot/dts/socfpga_arria5_socdk.dts
@@ -37,28 +37,4 @@
                 */
                 ethernet0 = &gmac1;
         };
-
-        aliases {
-                /* this allow the ethaddr uboot environmnet variable contents
-                 * to be added to the gmac1 device tree blob.
-                 */
-                ethernet0 = &gmac1;
-        };
-};
-
-&ethernet1 {
-        status = "okay";
-};
-
-&gmac1 {
-        phy-mode = "rgmii";
-
-        rxd0-skew-ps = <0>;
-        rxd1-skew-ps = <0>;
-        rxd2-skew-ps = <0>;
-        rxd3-skew-ps = <0>;
-        txen-skew-ps = <0>;
-        txc-skew-ps = <2600>;
-        rxdv-skew-ps = <0>;
-        rxc-skew-ps = <2000>;
 };
diff --git a/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts b/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts
index 26c63a07f8b9..2ee52ab8cabb 100644
--- a/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts
+++ b/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts
@@ -38,20 +38,3 @@
                 ethernet0 = &gmac1;
         };
 };
-
-&ethernet1 {
-        status = "okay";
-};
-
-&gmac1 {
-        phy-mode = "rgmii";
-
-        rxd0-skew-ps = <0>;
-        rxd1-skew-ps = <0>;
-        rxd2-skew-ps = <0>;
-        rxd3-skew-ps = <0>;
-        txen-skew-ps = <0>;
-        txc-skew-ps = <2600>;
-        rxdv-skew-ps = <0>;
-        rxc-skew-ps = <2000>;
-};
diff --git a/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
index 469bb5cac886..50b99a2c12ae 100644
--- a/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
+++ b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
@@ -30,28 +30,8 @@
                 device_type = "memory";
                 reg = <0x0 0x40000000>; /* 1GB */
         };
-
-        aliases {
-                /* this allow the ethaddr uboot environmnet variable contents
-                 * to be added to the gmac1 device tree blob.
-                 */
-                ethernet0 = &gmac1;
-        };
-};
-
-&ethernet1 {
-        status = "okay";
 };
 
 &gmac1 {
-        phy-mode = "rgmii";
-
-        rxd0-skew-ps = <0>;
-        rxd1-skew-ps = <0>;
-        rxd2-skew-ps = <0>;
-        rxd3-skew-ps = <0>;
-        txen-skew-ps = <0>;
-        txc-skew-ps = <2600>;
-        rxdv-skew-ps = <0>;
-        rxc-skew-ps = <2000>;
+        status = "okay";
 };
diff --git a/arch/arm/boot/dts/socfpga_vt.dts b/arch/arm/boot/dts/socfpga_vt.dts
index 91f6ccf714ee..222313f5420b 100644
--- a/arch/arm/boot/dts/socfpga_vt.dts
+++ b/arch/arm/boot/dts/socfpga_vt.dts
@@ -86,11 +86,3 @@
                 };
         };
 };
-
-&ethernet0 {
-        status = "okay";
-};
-
-&gmac0 {
-        phy-mode = "gmii";
-};