diff options
-rw-r--r-- | arch/arm/boot/dts/socfpga.dtsi | 18 | ||||
-rw-r--r-- | arch/arm/boot/dts/socfpga_cyclone5.dts | 13 | ||||
-rw-r--r-- | arch/arm/boot/dts/socfpga_vt.dts | 5 |
3 files changed, 34 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi index 16a6e13e08b4..02bb425719be 100644 --- a/arch/arm/boot/dts/socfpga.dtsi +++ b/arch/arm/boot/dts/socfpga.dtsi | |||
@@ -23,6 +23,7 @@ | |||
23 | 23 | ||
24 | aliases { | 24 | aliases { |
25 | ethernet0 = &gmac0; | 25 | ethernet0 = &gmac0; |
26 | ethernet1 = &gmac1; | ||
26 | serial0 = &uart0; | 27 | serial0 = &uart0; |
27 | serial1 = &uart1; | 28 | serial1 = &uart1; |
28 | timer0 = &timer0; | 29 | timer0 = &timer0; |
@@ -238,13 +239,26 @@ | |||
238 | }; | 239 | }; |
239 | }; | 240 | }; |
240 | 241 | ||
241 | gmac0: stmmac@ff700000 { | 242 | gmac0: ethernet@ff700000 { |
242 | compatible = "altr,socfpga-stmmac", "snps,dwmac-3.70a", "snps,dwmac"; | 243 | compatible = "altr,socfpga-stmmac", "snps,dwmac-3.70a", "snps,dwmac"; |
243 | reg = <0xff700000 0x2000>; | 244 | reg = <0xff700000 0x2000>; |
244 | interrupts = <0 115 4>; | 245 | interrupts = <0 115 4>; |
245 | interrupt-names = "macirq"; | 246 | interrupt-names = "macirq"; |
246 | mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */ | 247 | mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */ |
247 | phy-mode = "gmii"; | 248 | clocks = <&emac0_clk>; |
249 | clock-names = "stmmaceth"; | ||
250 | status = "disabled"; | ||
251 | }; | ||
252 | |||
253 | gmac1: ethernet@ff702000 { | ||
254 | compatible = "altr,socfpga-stmmac", "snps,dwmac-3.70a", "snps,dwmac"; | ||
255 | reg = <0xff702000 0x2000>; | ||
256 | interrupts = <0 120 4>; | ||
257 | interrupt-names = "macirq"; | ||
258 | mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */ | ||
259 | clocks = <&emac1_clk>; | ||
260 | clock-names = "stmmaceth"; | ||
261 | status = "disabled"; | ||
248 | }; | 262 | }; |
249 | 263 | ||
250 | L2: l2-cache@fffef000 { | 264 | L2: l2-cache@fffef000 { |
diff --git a/arch/arm/boot/dts/socfpga_cyclone5.dts b/arch/arm/boot/dts/socfpga_cyclone5.dts index 2495958f1016..973999d2c697 100644 --- a/arch/arm/boot/dts/socfpga_cyclone5.dts +++ b/arch/arm/boot/dts/socfpga_cyclone5.dts | |||
@@ -32,6 +32,13 @@ | |||
32 | reg = <0x0 0x40000000>; /* 1GB */ | 32 | reg = <0x0 0x40000000>; /* 1GB */ |
33 | }; | 33 | }; |
34 | 34 | ||
35 | aliases { | ||
36 | /* this allow the ethaddr uboot environmnet variable contents | ||
37 | * to be added to the gmac1 device tree blob. | ||
38 | */ | ||
39 | ethernet0 = &gmac1; | ||
40 | }; | ||
41 | |||
35 | soc { | 42 | soc { |
36 | clkmgr@ffd04000 { | 43 | clkmgr@ffd04000 { |
37 | clocks { | 44 | clocks { |
@@ -41,6 +48,12 @@ | |||
41 | }; | 48 | }; |
42 | }; | 49 | }; |
43 | 50 | ||
51 | ethernet@ff702000 { | ||
52 | phy-mode = "rgmii"; | ||
53 | phy-addr = <0xffffffff>; /* probe for phy addr */ | ||
54 | status = "okay"; | ||
55 | }; | ||
56 | |||
44 | timer0@ffc08000 { | 57 | timer0@ffc08000 { |
45 | clock-frequency = <100000000>; | 58 | clock-frequency = <100000000>; |
46 | }; | 59 | }; |
diff --git a/arch/arm/boot/dts/socfpga_vt.dts b/arch/arm/boot/dts/socfpga_vt.dts index 0bf035d607f0..d1ec0cab2dee 100644 --- a/arch/arm/boot/dts/socfpga_vt.dts +++ b/arch/arm/boot/dts/socfpga_vt.dts | |||
@@ -41,6 +41,11 @@ | |||
41 | }; | 41 | }; |
42 | }; | 42 | }; |
43 | 43 | ||
44 | ethernet@ff700000 { | ||
45 | phy-mode = "gmii"; | ||
46 | status = "okay"; | ||
47 | }; | ||
48 | |||
44 | timer0@ffc08000 { | 49 | timer0@ffc08000 { |
45 | clock-frequency = <7000000>; | 50 | clock-frequency = <7000000>; |
46 | }; | 51 | }; |