diff options
| author | Olof Johansson <olof@lixom.net> | 2019-10-24 23:25:30 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-10-24 23:25:31 +0300 |
| commit | fcf371fd7db5085d670aea8a5e4501f29ee74a2b (patch) | |
| tree | 7338896e3b54a834f95cb30fbbf058390d01b758 /arch/arm/boot/dts/Makefile | |
| parent | 71dd33b90119ff4b1e611ee8b9166cf4d2efbe7d (diff) | |
| parent | fedc8844d5004ffa69d3e320081bfd59979e1937 (diff) | |
| download | linux-fcf371fd7db5085d670aea8a5e4501f29ee74a2b.tar.xz | |
Merge tag 'omap-for-v5.5/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/dt
Device tree changes for omaps for v5.5
This series of changes adds support for few new boards, moves
remaining ti wilink bluetooth users to use the serdev driver,
and improves support for existing devices:
- Add support for NetCAN Plus devices
- Configure wilink bluetooth for logicpd-torpedo and omap3-igep
- Switch to using generic LCD panel for logicpd-torpedo and
increase camera pixel clock
- Configure droid4 for 300mA USB host mode and move to a common file
to start adding support for droid bionic
- Rename ocmcram node to sram
* tag 'omap-for-v5.5/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: dts: add DTS for NetCom Plus 4xx and 8xx device series
ARM: dts: add DTS for NetCom Plus 1xx and 2xx device series
ARM: dts: add DTS for NetCAN Plus devices
ARM: dts: omap: Rename "ocmcram" node to "sram"
ARM: dts: logicpd-torpedo-37xx-devkit: Increase camera pixel clock
ARM: dts: am: Rename "ocmcram" node to "sram"
ARM: dts: logicpd-torpedo: Disable Bluetooth Serial DMA
ARM: dts: IGEP: Add WiLink UART node
ARM: dts: LogicPD Torpedo: Add WiLink UART node
ARM: dts: logicpd-torpedo-37xx-devkit-28: Reference new DRM panel
ARM: dts: logicpd-torpedo-baseboard: Reduce video regulator chatter
ARM: dts: Add minimal support for Droid Bionic xt875
ARM: dts: omap4-droid4: Allow 300mA current for USB peripherals
ARM: dts: Use level interrupt for omap4 & 5 wlcore
Link: https://lore.kernel.org/r/pull-1571934890-285615@atomide.com-2
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, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index fdcccdea63c0..4790cf384a44 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -756,6 +756,9 @@ dtb-$(CONFIG_SOC_AM33XX) += \ am335x-moxa-uc-2101.dtb \ am335x-moxa-uc-8100-me-t.dtb \ am335x-nano.dtb \ + am335x-netcan-plus-1xx.dtb \ + am335x-netcom-plus-2xx.dtb \ + am335x-netcom-plus-8xx.dtb \ am335x-pdu001.dtb \ am335x-pepper.dtb \ am335x-phycore-rdk.dtb \ @@ -768,6 +771,7 @@ dtb-$(CONFIG_SOC_AM33XX) += \ am335x-wega-rdk.dtb \ am335x-osd3358-sm-red.dtb dtb-$(CONFIG_ARCH_OMAP4) += \ + omap4-droid-bionic-xt875.dtb \ omap4-droid4-xt894.dtb \ omap4-duovero-parlor.dtb \ omap4-kc1.dtb \ |