diff options
| author | Olof Johansson <olof@lixom.net> | 2017-08-30 08:39:18 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-08-30 08:39:18 +0300 |
| commit | fabed5ad230a5ff8320b2928ec20a52e59a9bf60 (patch) | |
| tree | fadeb37aad19748ebae3806f7b80277993ae10eb /arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | |
| parent | 93a4c8355e0e448d83f31801b4c72f66e4360975 (diff) | |
| parent | fe45174b72aead678da581bab9e9a37c9b26a070 (diff) | |
| download | linux-fabed5ad230a5ff8320b2928ec20a52e59a9bf60.tar.xz | |
Merge tag 'sunxi-fixes-for-4.13-3' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into fixes
Allwinner fixes for 4.13, take 3
This is a revert of the EMAC bindings. The discussion has not settled down
yet on a proper representation of the PHY, and therefore we cannot commit
to a binding yet
* tag 'sunxi-fixes-for-4.13-3' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
arm: dts: sunxi: Revert EMAC changes
arm64: dts: allwinner: Revert EMAC changes
dt-bindings: net: Revert sun8i dwmac binding
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts')
| -rw-r--r-- | arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts index 827168bc22ed..7c533b6d4ba9 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts @@ -51,7 +51,6 @@ compatible = "pine64,pine64", "allwinner,sun50i-a64"; aliases { - ethernet0 = &emac; serial0 = &uart0; serial1 = &uart1; serial2 = &uart2; @@ -79,15 +78,6 @@ status = "okay"; }; -&emac { - pinctrl-names = "default"; - pinctrl-0 = <&rmii_pins>; - phy-mode = "rmii"; - phy-handle = <&ext_rmii_phy1>; - status = "okay"; - -}; - &i2c1 { pinctrl-names = "default"; pinctrl-0 = <&i2c1_pins>; @@ -98,13 +88,6 @@ bias-pull-up; }; -&mdio { - ext_rmii_phy1: ethernet-phy@1 { - compatible = "ethernet-phy-ieee802.3-c22"; - reg = <1>; - }; -}; - &mmc0 { pinctrl-names = "default"; pinctrl-0 = <&mmc0_pins>; |