diff options
| author | Caesar Wang <wxt@rock-chips.com> | 2016-01-25 21:18:55 +0800 |
|---|---|---|
| committer | Leo Wang <leozwang@google.com> | 2016-01-27 06:10:28 +0000 |
| commit | 656a5945a47f1dd80199f0e89a883cb922f5f731 (patch) | |
| tree | f4a39cbfba9f91b01122aa12f62da23bcab18ea0 | |
| parent | 608f1d58d603ad1c76306c3856b8e43f355c9a05 (diff) | |
| download | v4.1-656a5945a47f1dd80199f0e89a883cb922f5f731.tar.gz | |
Revert "FROMLIST: ARM: dts: rockchip: Add support emac for RK3036"
This reverts commit 659692874d00a2d31f6fef5905770c4f50da4659.
Update the new version from LKML to fix the emac hack way to work,
As the previous the emac need work on the 600M frequency.
| -rw-r--r-- | arch/arm/boot/dts/rk3036-evb.dts | 23 | ||||
| -rw-r--r-- | arch/arm/boot/dts/rk3036-kylin.dts | 22 | ||||
| -rw-r--r-- | arch/arm/boot/dts/rk3036.dtsi | 32 |
3 files changed, 0 insertions, 77 deletions
diff --git a/arch/arm/boot/dts/rk3036-evb.dts b/arch/arm/boot/dts/rk3036-evb.dts index eed88b85b30..8483e363d09 100644 --- a/arch/arm/boot/dts/rk3036-evb.dts +++ b/arch/arm/boot/dts/rk3036-evb.dts @@ -47,17 +47,6 @@ compatible = "rockchip,rk3036-evb", "rockchip,rk3036"; }; -&emac { - pinctrl-names = "default"; - pinctrl-0 = <&emac_xfer>, <&emac_mdio>, <&rmii_rst>; - phy = <&phy0>; - status = "okay"; - - phy0: ethernet-phy@0 { - reg = <0>; - }; -}; - &emmc { status = "okay"; }; @@ -77,15 +66,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 ecf664d3d3e..1d70f46414c 100644 --- a/arch/arm/boot/dts/rk3036-kylin.dts +++ b/arch/arm/boot/dts/rk3036-kylin.dts @@ -114,17 +114,6 @@ status = "okay"; }; -&emac { - pinctrl-names = "default"; - pinctrl-0 = <&emac_xfer>, <&emac_mdio>, <&rmii_rst>; - phy = <&phy0>; - status = "okay"; - - phy0: ethernet-phy@0 { - reg = <0>; - }; -}; - &emmc { status = "okay"; }; @@ -410,17 +399,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>; - }; - }; - pmic { pmic_int: pmic-int { rockchip,pins = <2 2 RK_FUNC_GPIO &pcfg_pull_default>; diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi index bcd9f650f94..975580b4dcf 100644 --- a/arch/arm/boot/dts/rk3036.dtsi +++ b/arch/arm/boot/dts/rk3036.dtsi @@ -257,20 +257,6 @@ status = "disabled"; }; - emac: ethernet@10200000 { - compatible = "rockchip,rk3036-emac", "snps,arc-emac"; - reg = <0x10200000 0x4000>; - interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; - #address-cells = <1>; - #size-cells = <0>; - rockchip,grf = <&grf>; - clocks = <&cru HCLK_MAC>, <&cru SCLK_MACREF>, <&cru SCLK_MAC>; - clock-names = "hclk", "macref", "macclk"; - max-speed = <100>; - phy-mode = "rmii"; - status = "disabled"; - }; - sdmmc: dwmmc@10214000 { compatible = "rockchip,rk3036-dw-mshc", "rockchip,rk3288-dw-mshc"; clock-frequency = <37500000>; @@ -692,24 +678,6 @@ }; }; - emac { - emac_xfer: emac-xfer { - rockchip,pins = <2 10 RK_FUNC_1 &pcfg_pull_none>, /* crs_dvalid */ - <2 13 RK_FUNC_1 &pcfg_pull_none>, /* tx_en */ - <2 14 RK_FUNC_1 &pcfg_pull_none>, /* mac_clk */ - <2 15 RK_FUNC_1 &pcfg_pull_none>, /* rx_err */ - <2 16 RK_FUNC_1 &pcfg_pull_none>, /* rxd1 */ - <2 17 RK_FUNC_1 &pcfg_pull_none>, /* rxd0 */ - <2 18 RK_FUNC_1 &pcfg_pull_none>, /* txd1 */ - <2 19 RK_FUNC_1 &pcfg_pull_none>; /* txd0 */ - }; - - emac_mdio: emac-mdio { - rockchip,pins = <2 12 RK_FUNC_1 &pcfg_pull_none>, /* mac_md */ - <2 25 RK_FUNC_1 &pcfg_pull_none>; /* mac_mdclk */ - }; - }; - i2c0 { i2c0_xfer: i2c0-xfer { rockchip,pins = <0 0 RK_FUNC_1 &pcfg_pull_none>, |