• Olof Johansson's avatar
    Merge tag 'sunxi-fixes-for-4.13-3' of... · ed09f6d0
    Olof Johansson authored
    Merge tag 'sunxi-fixes-for-4.13-3' of https://git.kernel.org/pub/scm/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: default avatarOlof 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
    ed09f6d0
sun50i-a64-pine64.dts 5.83 KB