diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-10-23 22:04:49 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2015-10-23 22:04:49 +0200 |
commit | a3de778b1faecdb4a8709d96ac0ab3a61b40e898 (patch) | |
tree | bc132491ddbbda9ce54f10dcb36ca95de849c040 /arch/arm/boot/dts/stih418-b2199.dts | |
parent | 7007c60c28b2f1572b488513d94472046a79fa20 (diff) | |
parent | 848dd6a87a10bd24b5a4c8b84eaba3cdd0ec7a19 (diff) | |
download | blackbird-obmc-linux-a3de778b1faecdb4a8709d96ac0ab3a61b40e898.tar.gz blackbird-obmc-linux-a3de778b1faecdb4a8709d96ac0ab3a61b40e898.zip |
Merge tag 'sti-dt-for-v4.4-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/sti into next/dt
Merge "STi DT changes for v4.4, round 2" from Maxime Coquelin:
- Use STiH418's A9 PLL
- Add Ethernet support to STiH407 family
* tag 'sti-dt-for-v4.4-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/sti:
ARM: STi: DT: Add support for stih418 A9 pll
ARM: dts: Enable Ethernet on STi's B2199 board
ARM: dts: Enable Ethernet on STi's B2120 boards
ARM: dts: Add Ethernet node to STiH407 family
ARM: dts: Fix RGMII pinctrl timings
Diffstat (limited to 'arch/arm/boot/dts/stih418-b2199.dts')
-rw-r--r-- | arch/arm/boot/dts/stih418-b2199.dts | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/stih418-b2199.dts b/arch/arm/boot/dts/stih418-b2199.dts index 82eee39ccb31..772d2bb07e5f 100644 --- a/arch/arm/boot/dts/stih418-b2199.dts +++ b/arch/arm/boot/dts/stih418-b2199.dts @@ -24,6 +24,7 @@ aliases { ttyAS0 = &sbc_serial0; + ethernet0 = ðernet0; }; soc { @@ -101,5 +102,12 @@ st_dwc3: dwc3@8f94000 { status = "okay"; }; + + ethernet0: dwmac@9630000 { + st,tx-retime-src = "clkgen"; + status = "okay"; + phy-mode = "rgmii"; + fixed-link = <0 1 1000 0 0>; + }; }; }; |