diff options
| author | Olof Johansson <olof@lixom.net> | 2017-01-30 02:05:23 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-01-30 02:05:23 +0100 |
| commit | 2e33f29400c38b70729c916da65b44294d956a03 (patch) | |
| tree | 2bd14a45a326ae666b003734fa0ad957d7b770a9 /arch/arm/boot/dts/Makefile | |
| parent | Merge tag 'qcom-dts-for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | ARM: dts: Add LEGO MINDSTORMS EV3 dts (diff) | |
| download | linux-2e33f29400c38b70729c916da65b44294d956a03.tar.xz linux-2e33f29400c38b70729c916da65b44294d956a03.zip | |
Merge tag 'davinci-for-v4.11/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/dt
Device tree updates for DaVinci DA850
* GPIO keys on DA850 LCDK
* LCDC display on DA850 LCDK
* USB OHCI on DA850 LCDK
* VPIF (video input) on DA850 LCDK
* Add a DA8xx specific compatible for UARTs
* Introduce support for Lego Mindstorms EV3
* tag 'davinci-for-v4.11/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: dts: Add LEGO MINDSTORMS EV3 dts
dt-bindings: add "microchip,24c128" compatible string
dt-bindings: Add LEGO MINDSTORMS EV3 compatible specification
dt-bindings: Add vendor prefix for LEGO
ARM: dts: da850: Add ti,da830-uart compatible for serial ports
ARM: dts: davinci: da850-lcdk: enable VPIF
ARM: dts: davinci: da850-evm: enable VPIF
ARM: dts: davinci: da850: VPIF: add node and muxing
ARM: dts: da850-lcdk: Enable ohci for omapl138 lcdk
ARM: dts: da850: Add usb device node
ARM: dts: da850: specify the maximum pixel clock rate for tilcdc
ARM: dts: da850-lcdk: add the vga-bridge node
ARM: dts: da850: rename the display node label
ARM: dts: da850-lcdk: add gpio-keys
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index fe5f8a964257..c3079a518199 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -132,7 +132,8 @@ dtb-$(CONFIG_ARCH_CLPS711X) += \ dtb-$(CONFIG_ARCH_DAVINCI) += \ da850-lcdk.dtb \ da850-enbw-cmc.dtb \ - da850-evm.dtb + da850-evm.dtb \ + da850-lego-ev3.dtb dtb-$(CONFIG_ARCH_DIGICOLOR) += \ cx92755_equinox.dtb dtb-$(CONFIG_ARCH_EFM32) += \ |