Skip to content

Commit 7984ced

Browse files
commodoTravis CI User
authored andcommitted
Revert "dts: fmcmotcon2: Switch from Cadence to Xilinx Ethernet driver"
This reverts commit aeaf4db. Which was done via PR #117 For Talise SOM we have a similar situation, where GEM0 has 2 PHYs on the same MDIO bus. And GEM1 needs to use one of the PHYs which are attached to GEM0. The situation was resolved for that board. We just need to test that the same solution works for this board + setup. Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com> (cherry picked from commit eadedb6)
1 parent 71472a7 commit 7984ced

File tree

1 file changed

+12
-69
lines changed

1 file changed

+12
-69
lines changed

arch/arm/boot/dts/zynq-zed-adv7511-fmcmotcon2.dts

Lines changed: 12 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -3,80 +3,23 @@
33
#include "zynq-zed.dtsi"
44
#include "zynq-zed-adv7511.dtsi"
55

6-
/delete-node/ &gem0;
7-
/delete-node/ &gem1;
8-
96
&aliases {
10-
ethernet0 = &eth0;
11-
ethernet1 = &eth1;
7+
ethernet1 = &gem1;
128
};
139

14-
&amba {
15-
eth0: eth0@e000b000 {
16-
compatible = "xlnx,ps7-ethernet-1.00.a";
17-
reg = <0xe000b000 0x1000>;
18-
interrupts = <0 22 IRQ_TYPE_LEVEL_HIGH>;
19-
interrupt-parent = <&intc>;
20-
#address-cells = <0x1>;
21-
#size-cells = <0x0>;
22-
23-
clock-names = "ref_clk", "aper_clk";
24-
clocks = <&clkc 13>, <&clkc 30>;
25-
26-
xlnx,enet-clk-freq-hz = <0x17d7840>;
27-
xlnx,enet-reset = "MIO 11";
28-
xlnx,enet-slcr-1000mbps-div0 = <0x8>;
29-
xlnx,enet-slcr-1000mbps-div1 = <0x1>;
30-
xlnx,enet-slcr-100mbps-div0 = <0x8>;
31-
xlnx,enet-slcr-100mbps-div1 = <0x5>;
32-
xlnx,enet-slcr-10mbps-div0 = <0x8>;
33-
xlnx,enet-slcr-10mbps-div1 = <0x32>;
34-
xlnx,eth-mode = <0x1>;
35-
xlnx,has-mdio = <0x1>;
36-
xlnx,ptp-enet-clock = <111111115>;
37-
38-
phy-handle = <&phy0>;
39-
phy-mode = "rgmii-id";
40-
41-
phy0: phy@0 {
42-
device_type = "ethernet-phy";
43-
reg = <0x0>;
44-
marvell,reg-init = <3 16 0xff00 0x1e 3 17 0xfff0 0x0a>;
45-
};
46-
47-
phy1: phy@1 {
48-
device_type = "ethernet-phy";
49-
reg = <0x1>;
50-
marvell,reg-init = <3 16 0xff00 0x1e 3 17 0xfff0 0x0a>;
51-
};
10+
&gem0 {
11+
phy1: phy@1 {
12+
device_type = "ethernet-phy";
13+
reg = <0x1>;
14+
marvell,reg-init = <3 16 0xff00 0x1e 3 17 0xfff0 0x0a>;
5215
};
16+
};
5317

54-
eth1: eth1@e000c000 {
55-
compatible = "xlnx,ps7-ethernet-1.00.a";
56-
reg = <0xe000c000 0x1000>;
57-
interrupts = <0 45 IRQ_TYPE_LEVEL_HIGH>;
58-
interrupt-parent = <&intc>;
59-
#address-cells = <0x1>;
60-
#size-cells = <0x0>;
61-
62-
clock-names = "ref_clk", "aper_clk";
63-
clocks = <&clkc 14>, <&clkc 31>;
64-
65-
xlnx,enet-clk-freq-hz = <0xbebc20>;
66-
xlnx,enet-slcr-1000mbps-div0 = <0x1>;
67-
xlnx,enet-slcr-1000mbps-div1 = <0x1>;
68-
xlnx,enet-slcr-100mbps-div0 = <0x1>;
69-
xlnx,enet-slcr-100mbps-div1 = <0x5>;
70-
xlnx,enet-slcr-10mbps-div0 = <0x1>;
71-
xlnx,enet-slcr-10mbps-div1 = <0x32>;
72-
xlnx,eth-mode = <0x1>;
73-
xlnx,has-mdio = <0x0>;
74-
xlnx,ptp-enet-clock = <111111115>;
75-
local-mac-address = [00 49 76 a2 b2 f5];
76-
77-
phy-handle = <&phy1>;
78-
phy-mode = "rgmii-id";
79-
};
18+
&gem1 {
19+
status = "okay";
20+
21+
phy-handle = <&phy1>;
22+
phy-mode = "rgmii-id";
8023
};
8124

8225
&fpga_axi {

0 commit comments

Comments
 (0)