diff options
| author | Tom Rini <trini@konsulko.com> | 2016-05-27 15:48:53 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-05-27 15:48:53 -0400 |
| commit | 378f9134eba4665ea94a63653393d25418665fda (patch) | |
| tree | e273a03c52e8261c0f6c401914d44a9eff442684 /arch/arm/dts | |
| parent | 9b77b19178446393fce2e74554815c17454f8da8 (diff) | |
| parent | 2ed6dc83380ea2f49ec09556c14c6eddd3f5c27a (diff) | |
| download | blackbird-obmc-uboot-378f9134eba4665ea94a63653393d25418665fda.tar.gz blackbird-obmc-uboot-378f9134eba4665ea94a63653393d25418665fda.zip | |
Merge git://git.denx.de/u-boot-rockchip
Diffstat (limited to 'arch/arm/dts')
| -rw-r--r-- | arch/arm/dts/rk3288-firefly.dtsi | 16 | ||||
| -rw-r--r-- | arch/arm/dts/rk3288-rock2-square.dts | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/arch/arm/dts/rk3288-firefly.dtsi b/arch/arm/dts/rk3288-firefly.dtsi index 5aec1b82bd..072eaa6116 100644 --- a/arch/arm/dts/rk3288-firefly.dtsi +++ b/arch/arm/dts/rk3288-firefly.dtsi @@ -146,6 +146,22 @@ status = "okay"; }; +&gmac { + assigned-clocks = <&cru SCLK_MAC>; + assigned-clock-parents = <&ext_gmac>; + clock_in_out = "input"; + pinctrl-names = "default"; + pinctrl-0 = <&rgmii_pins>, <&phy_rst>, <&phy_pmeb>, <&phy_int>; + phy-supply = <&vcc_lan>; + phy-mode = "rgmii"; + snps,reset-active-low; + snps,reset-delays-us = <0 10000 1000000>; + snps,reset-gpio = <&gpio4 8 GPIO_ACTIVE_LOW>; + tx_delay = <0x30>; + rx_delay = <0x10>; + status = "okay"; +}; + &hdmi { ddc-i2c-bus = <&i2c5>; status = "okay"; diff --git a/arch/arm/dts/rk3288-rock2-square.dts b/arch/arm/dts/rk3288-rock2-square.dts index 8d7446fd5d..34073c9405 100644 --- a/arch/arm/dts/rk3288-rock2-square.dts +++ b/arch/arm/dts/rk3288-rock2-square.dts @@ -111,7 +111,7 @@ }; &gmac { - status = "ok"; + status = "okay"; }; &hdmi { |
