From: Olof Johansson <olof@lixom.net>
Date: Fri, 1 Sep 2017 23:42:51 +0000 (-0700)
Subject: Merge tag 'sunxi-fixes-for-4.13-3' of https://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.14-rc1~66^2^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ed09f6d05c1839ee658c664419a9ad0c58168216;p=platform%2Fkernel%2Flinux-exynos.git

Merge tag 'sunxi-fixes-for-4.13-3' of https://git./linux/kernel/git/sunxi/linux into next/dt64

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>

Conflicts:
	arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
	arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
	arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
---

ed09f6d05c1839ee658c664419a9ad0c58168216
diff --cc arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
index 8f07d1b,6872135..d347f52
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
@@@ -65,19 -67,6 +65,10 @@@
  	};
  };
  
 +&ehci1 {
 +	status = "okay";
 +};
 +
- &emac {
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&rgmii_pins>;
- 	phy-mode = "rgmii";
- 	phy-handle = <&ext_rgmii_phy>;
- 	phy-supply = <&reg_dc1sw>;
- 	status = "okay";
- };
- 
  &i2c1 {
  	pinctrl-names = "default";
  	pinctrl-0 = <&i2c1_pins>;