diff options
author | Arnd Bergmann <arnd@arndb.de> | 2019-02-15 18:20:46 +0300 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2019-02-15 18:21:13 +0300 |
commit | a882bd15c256418386a9f6fda69807b47667119d (patch) | |
tree | 4d4153d02695feee0832bcb3d94aec4e9f163466 /arch/arm/boot/dts/Makefile | |
parent | 87503c012a7d0003a423b0f557ecd3ff55f2c0cc (diff) | |
parent | 947b7802597106dcbef2ddca23d386f9339ba334 (diff) | |
download | linux-a882bd15c256418386a9f6fda69807b47667119d.tar.xz |
Merge tag 'omap-for-v5.1/dt-pt2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/dt
More dts changes for omaps
We add support for Bosch Guardian am335x device, and configure more
devices like GNSS and LCD backlight for omap3-gta04. And we replace
the wlcore binding documentation URL with a local file that we have.
* tag 'omap-for-v5.1/dt-pt2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: dts: omap3-gta04: declare backlight in lcd node
ARM: dts: am335x: Add support for Bosch Guardian
ARM: dts: gta04: add gps support
ARM: dts: gta04: add ldo 3v3 regulator
ARM: dts: gta04: add pinctrl settings for wkup domain
ARM: dts: omap3-gta04a5: Replace LXR reference with a local one
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
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 8a7e1cf28b79..ebe409a3f0e6 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -728,6 +728,7 @@ dtb-$(CONFIG_SOC_AM33XX) += \ am335x-cm-t335.dtb \ am335x-evm.dtb \ am335x-evmsk.dtb \ + am335x-guardian.dtb \ am335x-icev2.dtb \ am335x-lxm.dtb \ am335x-moxa-uc-2101.dtb \ |