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>

diff --git a/Documentation/devicetree/bindings/net/socfpga-dwmac.txt b/Documentation/devicetree/bindings/net/socfpga-dwmac.txt
deleted file mode 100644 (file)
index d53d376..0000000
--- 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 404553c97f3162a63947dd0356519c6bc93e71b5..74cceae8fdefc3861df00bd5b87f3ccb9953c3c8 100644 (file)
--- a/arch/arm/boot/dts/socfpga.dtsi
+++ b/arch/arm/boot/dts/socfpga.dtsi
@@ -450,43 +450,26 @@ qspi_clk: qspi_clk {
                                };
                        };
 
-               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 2d6b38ba93701d92f0e22d61fb36f035fab2c4f2..5beffb2265f4869c0f38ca97385d35b0ebfb5555 100644 (file)
--- a/arch/arm/boot/dts/socfpga_arria5_socdk.dts
+++ b/arch/arm/boot/dts/socfpga_arria5_socdk.dts
@@ -37,28 +37,4 @@ aliases {
                */
                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 26c63a07f8b943639e8dff89fb7c4cc429f1befc..2ee52ab8cabbbb3613d03d3d832ccfd16ff21233 100644 (file)
--- a/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts
+++ b/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts
@@ -38,20 +38,3 @@ aliases {
                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 469bb5cac88661cf84b386b2346ee039850df37e..50b99a2c12aeb9549d70e09f9ea18c6bca797f1a 100644 (file)
--- a/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
+++ b/arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
@@ -30,28 +30,8 @@ memory {
                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 91f6ccf714ee8bedaddc6c7aef7ff641a78a2f5c..222313f5420bbafe18968845a8bbe9e25c6b3ef1 100644 (file)
--- a/arch/arm/boot/dts/socfpga_vt.dts
+++ b/arch/arm/boot/dts/socfpga_vt.dts
@@ -86,11 +86,3 @@ sysmgr@ffd08000 {
                };
        };
 };
-
-&ethernet0 {
-        status = "okay";
-};
-
-&gmac0 {
-       phy-mode = "gmii";
-};