diff options
author | Olof Johansson <olof@lixom.net> | 2017-09-01 16:41:42 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2017-09-01 16:41:42 -0700 |
commit | ebc12a529bfd6589d271b736bcf32919f9d3328f (patch) | |
tree | f75810d71e3e63ecda0d63f2a95ac5e955737c35 /arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts | |
parent | Merge tag 'sunxi-dt-for-4.14-3' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt (diff) | |
parent | arm: dts: sunxi: Revert EMAC changes (diff) | |
download | linux-dev-ebc12a529bfd6589d271b736bcf32919f9d3328f.tar.xz linux-dev-ebc12a529bfd6589d271b736bcf32919f9d3328f.zip |
Merge tag 'sunxi-fixes-for-4.13-3' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt
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
arm64: allwinner: h5: fix pinctrl IRQs
arm64: allwinner: a64: sopine: add missing ethernet0 alias
arm64: allwinner: a64: pine64: add missing ethernet0 alias
arm64: allwinner: a64: bananapi-m64: add missing ethernet0 alias
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts')
-rw-r--r-- | arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts index 17eb1cc5bf6b..d891a1a27f6c 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts @@ -76,21 +76,6 @@ status = "okay"; }; -&emac { - pinctrl-names = "default"; - pinctrl-0 = <&rgmii_pins>; - phy-mode = "rgmii"; - phy-handle = <&ext_rgmii_phy>; - status = "okay"; -}; - -&mdio { - ext_rgmii_phy: ethernet-phy@1 { - compatible = "ethernet-phy-ieee802.3-c22"; - reg = <1>; - }; -}; - &mmc2 { pinctrl-names = "default"; pinctrl-0 = <&mmc2_pins>; |