diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2015-10-23 22:17:19 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-10-23 22:17:19 +0200 |
| commit | 8d1a327c7b88238fae6968aa0a5863c2146a36f4 (patch) | |
| tree | 37e5eeb8e63da1ff6669f5625d080173b2388e62 /arch/arm/boot/dts/Makefile | |
| parent | ARM: dts: uniphier: add ProXstream2 Vodka board support (diff) | |
| parent | ARM: dts: am335x-base0033: Use IOPAD pinmux macro (diff) | |
| download | linux-dev-8d1a327c7b88238fae6968aa0a5863c2146a36f4.tar.xz linux-dev-8d1a327c7b88238fae6968aa0a5863c2146a36f4.zip | |
Merge tag 'omap-for-v4.4/dt-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
Merge "omap dts changes for v4.4 merge window, part 2" from Tony Lindgren:
Few more omap dts changes for v4.4 merge window, mostly to fix and clean
up some omap5 issues to allow adding other omap5 boards. Also some other
fixes and clean-up:
- Fix SDIO WLAN for omap5 that's been broken for a while. As further
patches are still needed for wl18xx, no need for stable on this one.
- Move most of omap5 support into omap5-board-common.dtsi as most omap5
boards seem to share the same basic set of devices.
- Add minimal IGEPv5 support using based on omap5-board-common.dtsi
- Remove now unneedes gpio hogging for dra72-evm
- Update Javier Martinez Canillas email address
- Change earlier IGEP boards to use IOPAD pinmux macros
* tag 'omap-for-v4.4/dt-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: dts: am335x-base0033: Use IOPAD pinmux macro
ARM: dts: am335x-igep0033: Use IOPAD pinmux macro
ARM: dts: omap3-igep0020: Use IOPAD pinmux macro
ARM: dts: am437x-gp-evm: Add wakeup interrupt source for pixcir_i2c_ts
ARM: dts: Update Javier Martinez Canillas's email
ARM: dts: dra72-evm: remove cpsw gpio hogging and add mode-gpios
ARM: dts: Add basic support for isee igepv5
ARM: dts: Move most of omap5-uevm.dts to omap5-board-common.dtsi
ARM: dts: Fix WLAN regression on omap5-uevm
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 e6c76501c95c..b5e0ff97db15 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -481,6 +481,7 @@ dtb-$(CONFIG_SOC_AM43XX) += \ am437x-gp-evm.dtb dtb-$(CONFIG_SOC_OMAP5) += \ omap5-cm-t54.dtb \ + omap5-igep0050.dtb \ omap5-sbc-t54.dtb \ omap5-uevm.dtb dtb-$(CONFIG_SOC_DRA7XX) += \ |