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/arm/boot/dts/sun8i-h3-nanopi-neo.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/arm/boot/dts/sun8i-h3-nanopi-neo.dts')
-rw-r--r-- | arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts index 78f6c24952dd..8d2cc6e9a03f 100644 --- a/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts +++ b/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts @@ -46,10 +46,3 @@ model = "FriendlyARM NanoPi NEO"; compatible = "friendlyarm,nanopi-neo", "allwinner,sun8i-h3"; }; - -&emac { - phy-handle = <&int_mii_phy>; - phy-mode = "mii"; - allwinner,leds-active-low; - status = "okay"; -}; |