diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-10-04 16:13:04 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-10-04 16:14:05 +0200 |
| commit | f84c933015fffb11847118c78b44502e371085e6 (patch) | |
| tree | e90794c50aee1f27d62a51f40efc692c8dc0b6a5 /arch/arm/boot/dts/Makefile | |
| parent | Merge tag 'omap-for-v4.20/dt-signed-v2' of git://git.kernel.org/pub/scm/linux... (diff) | |
| parent | ARM: dts: am335x: Replace remaining legacy phy_id with phy-handle (diff) | |
| download | linux-f84c933015fffb11847118c78b44502e371085e6.tar.xz linux-f84c933015fffb11847118c78b44502e371085e6.zip | |
Merge tag 'omap-for-v4.20/dt-signed-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
More devicetree changes for omap variants
There's a patch for previously merged dts changes to remove the last
remaining use of legacy phy_id property.
For dra7, we have a non-urgent PCIe dts fix, enable a PCIe errata for
unaligned access.
For omap5, we enable omap5 USB OTG mode for DWC3 controller.
And we add support for am335x based Moxa UC-2100 series of industrial
computers.
* tag 'omap-for-v4.20/dt-signed-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: dts: am335x: Replace remaining legacy phy_id with phy-handle
ARM: dts: am335x: add support for Moxa UC-2101 open platform
ARM: dts: am335x: add common file for UC-2100 series
ARM: dts: omap5: enable OTG role for DWC3 controller
ARM: dts: dra7: Enable workaround for errata i870 in PCIe host mode
ARM: dts: dra7: Fix up unaligned access setting for PCIe EP
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 1c6da63b6bd7..058a09e08a56 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -711,6 +711,7 @@ dtb-$(CONFIG_SOC_AM33XX) += \ am335x-evmsk.dtb \ am335x-icev2.dtb \ am335x-lxm.dtb \ + am335x-moxa-uc-2101.dtb \ am335x-moxa-uc-8100-me-t.dtb \ am335x-nano.dtb \ am335x-pdu001.dtb \ |