Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b80a6373 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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



This reverts commit 7e0b4cd0.

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: default avatarArnd Bergmann <arnd@arndb.de>
parent 57a0ec38

Documentation/devicetree/bindings/net/socfpga-dwmac.txt

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
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";

	};

};

arch/arm/boot/dts/socfpga.dtsi

+16 −33
Original line number Diff line number Diff line
@@ -450,43 +450,26 @@ 
				};

			};



		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";

		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";

			};

		};



		ethernet1: ethernet1 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "altr,socfpga-stmmac";

			altr,sysmgr-syscon = <&sysmgr 0x60>;

			status = "disabled";

			ranges;

		};



			gmac1: gmac1@ff702000 {

				device_type = "network";

				compatible = "snps,dwmac-3.70a", "snps,dwmac";

		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";

		};



		L2: l2-cache@fffef000 {

arch/arm/boot/dts/socfpga_arria5_socdk.dts

+0 −24
Original line number Diff line number Diff line
@@ -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>;

};

arch/arm/boot/dts/socfpga_cyclone5_socdk.dts

+0 −17
Original line number Diff line number Diff line
@@ -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>;

};

arch/arm/boot/dts/socfpga_cyclone5_sockit.dts

+1 −21
Original line number Diff line number Diff line
@@ -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";

};