diff options
| author | Xing Zheng <zhengxing@rock-chips.com> | 2016-03-14 16:02:00 +0800 |
|---|---|---|
| committer | Caesar Wang <wxt@rock-chips.com> | 2016-03-17 16:01:02 +0800 |
| commit | 3a819698b25c67982f134c8d6934ce6e263546c9 (patch) | |
| tree | dc5b812349206525b6f47806fb3eef676a8c6f94 | |
| parent | 2abf87d12eaeb584278767c5669c558a38355310 (diff) | |
| download | v4.1-3a819698b25c67982f134c8d6934ce6e263546c9.tar.gz | |
BACKPORT: ARM: dts: rockchip: add to support emac for rk3036 SoCs
This patch adds the emac device node for rk3036 SoCs.
We need to let mac clock under the DPLL which is able to provide
the accurate 50MHz what mac_ref need, since that will cause some
unstable things if the cpufreq is working.
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Cc: linux-rockchip@lists.infradead.org
Cc: Xing Zheng <zhengxing@rock-chips.com>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: David S. Miller <davem@davemloft.net>
Bug: 27311701
Patchset: Add the emac phy reset for dts
(Fixes the conflict and sync to upstream)
(cherry picked from git.kernel.org davem/net-next.git master
commit af671e7bd96bc9bde623b0e6f75bfa4269c2c57f)
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: Ie9dcd545eb562fdbf610163d3d5ecdfe7e91d402
| -rw-r--r-- | arch/arm/boot/dts/rk3036-evb.dts | 25 | ||||
| -rw-r--r-- | arch/arm/boot/dts/rk3036-kylin.dts | 15 |
2 files changed, 12 insertions, 28 deletions
diff --git a/arch/arm/boot/dts/rk3036-evb.dts b/arch/arm/boot/dts/rk3036-evb.dts index ec1101e249a..05797898b7b 100644 --- a/arch/arm/boot/dts/rk3036-evb.dts +++ b/arch/arm/boot/dts/rk3036-evb.dts @@ -47,14 +47,13 @@ compatible = "rockchip,rk3036-evb", "rockchip,rk3036"; }; -&emmc { - status = "okay"; -}; - &emac { pinctrl-names = "default"; - pinctrl-0 = <&emac_xfer>, <&emac_mdio>, <&rmii_rst>; + pinctrl-0 = <&emac_xfer>, <&emac_mdio>; phy = <&phy0>; + phy-reset-gpios = <&gpio2 22 GPIO_ACTIVE_LOW>; /* PHY_RST */ + phy-reset-duration = <10>; /* millisecond */ + status = "okay"; phy0: ethernet-phy@0 { @@ -62,6 +61,10 @@ }; }; +&emmc { + status = "okay"; +}; + &i2c1 { status = "okay"; @@ -77,15 +80,3 @@ &uart2 { status = "okay"; }; - -&pinctrl { - pcfg_output_high: pcfg-output-high { - output-high; - }; - - emac { - rmii_rst: rmii-rst { - rockchip,pins = <2 22 RK_FUNC_GPIO &pcfg_output_high>; - }; - }; -}; diff --git a/arch/arm/boot/dts/rk3036-kylin.dts b/arch/arm/boot/dts/rk3036-kylin.dts index ab3209c3911..4fdc37ba71e 100644 --- a/arch/arm/boot/dts/rk3036-kylin.dts +++ b/arch/arm/boot/dts/rk3036-kylin.dts @@ -127,8 +127,11 @@ &emac { pinctrl-names = "default"; - pinctrl-0 = <&emac_xfer>, <&emac_mdio>, <&rmii_rst>; + pinctrl-0 = <&emac_xfer>, <&emac_mdio>; phy = <&phy0>; + phy-reset-gpios = <&gpio2 22 GPIO_ACTIVE_LOW>; /* PHY_RST */ + phy-reset-duration = <10>; /* millisecond */ + status = "okay"; phy0: ethernet-phy@0 { @@ -414,16 +417,6 @@ }; &pinctrl { - pcfg_output_high: pcfg-output-high { - output-high; - }; - - emac { - rmii_rst: rmii-rst { - rockchip,pins = <2 22 RK_FUNC_GPIO &pcfg_output_high>; - }; - }; - leds { led_ctl: led-ctl { rockchip,pins = <2 30 RK_FUNC_GPIO &pcfg_pull_none>; |