diff options
author | Olof Johansson <olof@lixom.net> | 2018-07-21 14:25:39 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2018-07-21 14:25:39 -0700 |
commit | 3f0213de1170943be5bc5113a9e7b6e6d6affba1 (patch) | |
tree | 435d6bde23931f91e9796b5be9c443b4e3d060e4 /arch/arm/boot/dts/Makefile | |
parent | Merge tag 'gemini-dts-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/dt (diff) | |
parent | ARM: dts: am335x: add am335x-sancloud-bbe board support (diff) | |
download | linux-dev-3f0213de1170943be5bc5113a9e7b6e6d6affba1.tar.xz linux-dev-3f0213de1170943be5bc5113a9e7b6e6d6affba1.zip |
Merge tag 'omap-for-v4.19/dt-pt2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
Few more beaglebone variants for v4.19 merge window
This adds dts files for two new beaglebone variants for
Octavo Systems OSD3358-SM-RED and Sancloud am335x-sancloud-bbe.
* tag 'omap-for-v4.19/dt-pt2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: dts: am335x: add am335x-sancloud-bbe board support
dt-bindings: Add vendor prefix for Sancloud
ARM: dts: Add DT support for Octavo Systems OSD3358-SM-RED based on TI AM335x
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
-rw-r--r-- | arch/arm/boot/dts/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index ed4bab8be2f6..6daa25a91e39 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -697,10 +697,12 @@ dtb-$(CONFIG_SOC_AM33XX) += \ am335x-pepper.dtb \ am335x-phycore-rdk.dtb \ am335x-pocketbeagle.dtb \ + am335x-sancloud-bbe.dtb \ am335x-shc.dtb \ am335x-sbc-t335.dtb \ am335x-sl50.dtb \ - am335x-wega-rdk.dtb + am335x-wega-rdk.dtb \ + am335x-osd3358-sm-red.dtb dtb-$(CONFIG_ARCH_OMAP4) += \ omap4-droid4-xt894.dtb \ omap4-duovero-parlor.dtb \ |