diff options
| author |   Olof Johansson <olof@lixom.net> | 2017-09-01 16:42:51 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-09-01 16:42:51 -0700 |
| commit | ed09f6d05c1839ee658c664419a9ad0c58168216 (patch) | |
| tree | 317ae6d35e71f27bee7df018a6c90f86457fb793 /arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | |
| parent | Merge tag 'uniphier-dt64-v4.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into next/dt64 (diff) | |
| parent | arm: dts: sunxi: Revert EMAC changes (diff) | |
| download | linux-dev-ed09f6d05c1839ee658c664419a9ad0c58168216.tar.xz linux-dev-ed09f6d05c1839ee658c664419a9ad0c58168216.zip | |
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: 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
Diffstat (limited to 'arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts')
0 files changed, 0 insertions, 0 deletions