From: Olof Johansson Date: Mon, 19 Jun 2017 03:45:17 +0000 (-0700) Subject: Merge tag 'sunxi-dt-h5-for-4.13' of https://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b69cfb5abfb271e7d7aa872b2dd0921089ae7349;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge tag 'sunxi-dt-h5-for-4.13' of https://git./linux/kernel/git/sunxi/linux into next/dt64 Allwinner H5 DT changes for 4.13 Just like the H3, this is mostly about enabling the EMAC on the H5, and also has a new board, the Orange Pi Zero Plus 2 * tag 'sunxi-dt-h5-for-4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: arm64: allwinner: h5: Add initial Orangepi Zero Plus 2 support arm64: allwinner: h5: enable dwmac-sun8i for Nano Pi NEO2 arm64: allwinner: h5: enable dwmac-sun8i for Orange Pi Prime arm64: allwinner: h5: sort the device nodes in / part for some boards arm64: allwinner: h5: add support for NanoPi NEO2 board arm64: allwinner: h5: add support for Orange Pi Prime board arm64: allwinner: orangepi-pc2: Enable dwmac-sun8i arm: sun8i: sunxi-h3-h5: add dwmac-sun8i ethernet driver arm: sun8i: sunxi-h3-h5: Add dt node for the syscon control module ARM: sunxi: h3-h5: Convert R_CCU raw numbers to macros Signed-off-by: Olof Johansson --- b69cfb5abfb271e7d7aa872b2dd0921089ae7349 diff --cc arch/arm64/boot/dts/allwinner/Makefile index 2c9f63743002,df907e811ff7..108f12ce6d1d --- a/arch/arm64/boot/dts/allwinner/Makefile +++ b/arch/arm64/boot/dts/allwinner/Makefile @@@ -1,8 -1,9 +1,11 @@@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-bananapi-m64.dtb +dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-orangepi-win.dtb dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pine64-plus.dtb sun50i-a64-pine64.dtb +dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-sopine-baseboard.dtb dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-pc2.dtb + dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-prime.dtb + dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus2.dtb + dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo2.dtb always := $(dtb-y) subdir-y := $(dts-dirs)