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 {
+                gmac0: ethernet@ff700000 {
-                        #address-cells = <1>;
+                        compatible = "altr,socfpga-stmmac", "snps,dwmac-3.70a", "snps,dwmac";
-                        #size-cells = <1>;
+                        reg = <0xff700000 0x2000>;
-                        compatible = "altr,socfpga-stmmac";
+                        interrupts = <0 115 4>;
-                        altr,sysmgr-syscon = <&sysmgr 0x60>;
+                        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 {
+                gmac1: ethernet@ff702000 {
-                        #address-cells = <1>;
+                        compatible = "altr,socfpga-stmmac", "snps,dwmac-3.70a", "snps,dwmac";
-                        #size-cells = <1>;
+                        reg = <0xff702000 0x2000>;
-                        compatible = "altr,socfpga-stmmac";
+                        interrupts = <0 120 4>;
-                        altr,sysmgr-syscon = <&sysmgr 0x60>;
+                        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";
+        status = "okay";
-        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_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";
-};

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 @@
1	Altera SOCFPGA SoC DWMAC controller
2
3	The device node has following properties.
4
5	Required properties:
6	- compatible : Should contain "altr,socfpga-stmmac"
7	- altr,sysmgr-syscon : Should be the phandle to the system manager node that
8	encompasses the glue register, and the register offset.
9
10	Sub-nodes:
11	The dwmac core should be added as subnode to SOCFPGA dwmac glue.
12	- dwmac : The binding details of dwmac can be found in
13	Documentation/devicetree/bindings/net/stmmac.txt
14
15	Example:
16
17	ethernet0: ethernet0 {
18	#address-cells = <1>;
19	#size-cells = <1>;
20
21	compatible = "altr,socfpga-stmmac";
22	altr,sysmgr-syscon = <&sysmgr 0x60>;
23	status = "disabled";
24	ranges;
25
26	gmac0: gmac0@ff700000 {
27	compatible = "snps,dwmac-3.70a", "snps,dwmac";
28	reg = <0xff700000 0x2000>;
29	interrupts = <0 115 4>;
30	interrupt-names = "macirq";
31	mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */
32	clocks = <&emac0_clk>;
33	clock-names = "stmmaceth";
34	};
35	};


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 @@
450	};	450	};
451	};	451	};
452		452
453	ethernet0: ethernet0 {	453	gmac0: ethernet@ff700000 {
454	#address-cells = <1>;	454	compatible = "altr,socfpga-stmmac", "snps,dwmac-3.70a", "snps,dwmac";
455	#size-cells = <1>;	455	reg = <0xff700000 0x2000>;
456	compatible = "altr,socfpga-stmmac";	456	interrupts = <0 115 4>;
457	altr,sysmgr-syscon = <&sysmgr 0x60>;	457	interrupt-names = "macirq";
		458	mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */
		459	clocks = <&emac0_clk>;
		460	clock-names = "stmmaceth";
458	status = "disabled";	461	status = "disabled";
459	ranges;
460
461	gmac0: gmac0@ff700000 {
462	compatible = "snps,dwmac-3.70a", "snps,dwmac";
463	reg = <0xff700000 0x2000>;
464	interrupts = <0 115 4>;
465	interrupt-names = "macirq";
466	mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */
467	clocks = <&emac0_clk>;
468	clock-names = "stmmaceth";
469	};
470	};	462	};
471		463
472	ethernet1: ethernet1 {	464	gmac1: ethernet@ff702000 {
473	#address-cells = <1>;	465	compatible = "altr,socfpga-stmmac", "snps,dwmac-3.70a", "snps,dwmac";
474	#size-cells = <1>;	466	reg = <0xff702000 0x2000>;
475	compatible = "altr,socfpga-stmmac";	467	interrupts = <0 120 4>;
476	altr,sysmgr-syscon = <&sysmgr 0x60>;	468	interrupt-names = "macirq";
		469	mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */
		470	clocks = <&emac1_clk>;
		471	clock-names = "stmmaceth";
477	status = "disabled";	472	status = "disabled";
478	ranges;
479
480	gmac1: gmac1@ff702000 {
481	device_type = "network";
482	compatible = "snps,dwmac-3.70a", "snps,dwmac";
483	reg = <0xff702000 0x2000>;
484	interrupts = <0 120 4>;
485	interrupt-names = "macirq";
486	mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */
487	clocks = <&emac1_clk>;
488	clock-names = "stmmaceth";
489	};
490	};	473	};
491		474
492	L2: l2-cache@fffef000 {	475	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 @@
37	*/	37	*/
38	ethernet0 = &gmac1;	38	ethernet0 = &gmac1;
39	};	39	};
40
41	aliases {
42	/* this allow the ethaddr uboot environmnet variable contents
43	* to be added to the gmac1 device tree blob.
44	*/
45	ethernet0 = &gmac1;
46	};
47	};
48
49	&ethernet1 {
50	status = "okay";
51	};
52
53	&gmac1 {
54	phy-mode = "rgmii";
55
56	rxd0-skew-ps = <0>;
57	rxd1-skew-ps = <0>;
58	rxd2-skew-ps = <0>;
59	rxd3-skew-ps = <0>;
60	txen-skew-ps = <0>;
61	txc-skew-ps = <2600>;
62	rxdv-skew-ps = <0>;
63	rxc-skew-ps = <2000>;
64	};	40	};


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 @@
38	ethernet0 = &gmac1;	38	ethernet0 = &gmac1;
39	};	39	};
40	};	40	};
41
42	&ethernet1 {
43	status = "okay";
44	};
45
46	&gmac1 {
47	phy-mode = "rgmii";
48
49	rxd0-skew-ps = <0>;
50	rxd1-skew-ps = <0>;
51	rxd2-skew-ps = <0>;
52	rxd3-skew-ps = <0>;
53	txen-skew-ps = <0>;
54	txc-skew-ps = <2600>;
55	rxdv-skew-ps = <0>;
56	rxc-skew-ps = <2000>;
57	};


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 @@
30	device_type = "memory";	30	device_type = "memory";
31	reg = <0x0 0x40000000>; /* 1GB */	31	reg = <0x0 0x40000000>; /* 1GB */
32	};	32	};
33
34	aliases {
35	/* this allow the ethaddr uboot environmnet variable contents
36	* to be added to the gmac1 device tree blob.
37	*/
38	ethernet0 = &gmac1;
39	};
40	};
41
42	&ethernet1 {
43	status = "okay";
44	};	33	};
45		34
46	&gmac1 {	35	&gmac1 {
47	phy-mode = "rgmii";	36	status = "okay";
48
49	rxd0-skew-ps = <0>;
50	rxd1-skew-ps = <0>;
51	rxd2-skew-ps = <0>;
52	rxd3-skew-ps = <0>;
53	txen-skew-ps = <0>;
54	txc-skew-ps = <2600>;
55	rxdv-skew-ps = <0>;
56	rxc-skew-ps = <2000>;
57	};	37	};


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 @@
86	};	86	};
87	};	87	};
88	};	88	};
89
90	&ethernet0 {
91	status = "okay";
92	};
93
94	&gmac0 {
95	phy-mode = "gmii";
96	};