diff options
| author | Olof Johansson <olof@lixom.net> | 2017-08-30 09:58:03 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-08-30 09:58:03 -0700 |
| commit | 1595de0e7f00908f344ef7bbf26da94a8263cf78 (patch) | |
| tree | 726c590fc25970cf280d48d03978b0f289a5cb57 /arch/arm/boot/dts/Makefile | |
| parent | 983d7c4570dfd08990fbb8fe9ad6686214173af1 (diff) | |
| parent | 6b0e06df5cadba8471524266cc472dbbda55146b (diff) | |
| download | linux-stable-1595de0e7f00908f344ef7bbf26da94a8263cf78.tar.gz linux-stable-1595de0e7f00908f344ef7bbf26da94a8263cf78.tar.bz2 linux-stable-1595de0e7f00908f344ef7bbf26da94a8263cf78.zip | |
Merge tag 'sunxi-dt-for-4.14-3' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt
Allwinner DT changes for 4.14, take 3
One new board, and a revert of a patch relying on a binding not stable
enough so that we can commit to it.
* tag 'sunxi-dt-for-4.14-3' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
Revert "ARM: dts: sun8i: h3: Enable dwmac-sun8i on the Beelink X2"
ARM: sun8i: a83t: Add device tree for Sinovoip Bananapi BPI-M3
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 481c3eabaa97..0ef4e4fc8a04 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -912,6 +912,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \ sun8i-a33-q8-tablet.dtb \ sun8i-a33-sinlinx-sina33.dtb \ sun8i-a83t-allwinner-h8homlet-v2.dtb \ + sun8i-a83t-bananapi-m3.dtb \ sun8i-a83t-cubietruck-plus.dtb \ sun8i-h2-plus-orangepi-zero.dtb \ sun8i-h3-bananapi-m2-plus.dtb \ |