Merge tag 'sunxi-fixes-for-4.13-3' of https://git.kernel.org/pub/scm/linux/kernel...

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

diff --cc arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
index 8f07d1b10ca70df33ec9c4531bdef967ae410240,6872135d7f849b1df7e0529b9b95d2b0d9c86478..d347f52e27f6070ebf79a5f6fe890feecee2a94b
--- 1/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
--- 2/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 @@@
        };
  };
  
- &emac {
-       pinctrl-names = "default";
-       pinctrl-0 = <&rgmii_pins>;
-       phy-mode = "rgmii";
-       phy-handle = <&ext_rgmii_phy>;
-       phy-supply = <&reg_dc1sw>;
-       status = "okay";
- };
- 
 +&ehci1 {
 +      status = "okay";
 +};
 +
  &i2c1 {
        pinctrl-names = "default";
        pinctrl-0 = <&i2c1_pins>;

diff --cc arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
Simple merge

diff --cc arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
Simple merge

diff --cc arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
Simple merge