diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-08-18 22:55:20 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-08-18 22:55:20 +0200 |
| commit | fe7a70db482daf139b1ada805747c9f8615df91d (patch) | |
| tree | 3560e41e36bb53f2a55dbeed550aed8c5f77dfda /arch/arm/boot/dts/Makefile | |
| parent | f042bdd6e6d6343930d7caefb0b7647f4dd57670 (diff) | |
| parent | b7ace5ed8867ca54503727988adec6b20af54eeb (diff) | |
Merge tag 'omap-for-v4.14/dt-v3-pt2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
Pull "device tree changes for omaps for v4.14, part2" from Tony Lindgren:
Second set of device tree changes for omaps for v4.14 merge window.
These got delayed a bit because the iodelay changes had to be
reworked for a missing Signed-off-by. And the beagleboard-x15
wants to use iodelay too for mmc:
- A series of changes to add dra7 iodelay data used for mmc
- Add support for new beagleBoard-x15 revision c
- Fix logicpd-torpedo-37xx-devkit mmc card detect direction
* tag 'omap-for-v4.14/dt-v3-pt2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: dts: omap3: logicpd-torpedo-37xx-devkit: Fix MMC1 cd-gpio
ARM: dts: am57xx-beagle-x15: Add support for rev C
ARM: dts: dra71-evm: Add pinmux configuration for MMC
ARM: dts: dra72-evm-revc: Add pinmux configuration for MMC
ARM: dts: dra72-evm: Add pinmux configuration for MMC
ARM: dts: am572x-idk: Add pinmux configuration for MMC
ARM: dts: am571x-idk: Add pinmux configuration for MMC
ARM: dts: am57xx-idk: Move common MMC/SD properties to common file
ARM: dts: am57xx-beagle-x15: Add pinmux configuration for MMC
ARM: dts: dra7-evm: Add pinmux configuration for MMC
ARM: dts: dra74x: Create a common file with MMC/SD IOdelay data
ARM: dts: dra72x: Create a common file with MMC/SD IOdelay data
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 03995aa0559f..944f94f61eb6 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -652,6 +652,7 @@ dtb-$(CONFIG_SOC_OMAP5) += \ dtb-$(CONFIG_SOC_DRA7XX) += \ am57xx-beagle-x15.dtb \ am57xx-beagle-x15-revb1.dtb \ + am57xx-beagle-x15-revc.dtb \ am57xx-cl-som-am57x.dtb \ am57xx-sbc-am57x.dtb \ am572x-idk.dtb \ |