diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-10-14 18:34:59 -0400 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-10-14 18:35:21 -0400 |
| commit | fd781337b6f8d558dd1af2aafb3b5ce784e580dc (patch) | |
| tree | 60a4bb909596ea8fee2703e87767d1c1562df37c /arch/arm/boot/dts/Makefile | |
| parent | 7587b5965f57c1c4d6fd1377432a8473f5cd449a (diff) | |
| parent | c49f4984fd45be36502e903e7a5a6a4faff42931 (diff) | |
Merge tag 'omap-for-v3.13/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
From Tony Lindgren:
omap device tree related changes via Benoit Cousson <bcousson@baylibre.com>:
Add the minimal DTS support for DRA7xx based SoC core.
Add the initial support for N900 and gta04 phones.
Enable USB3 on OMAP5 evm board.
Add support for cryto accelerators
Add new IGEP AQUILA board
Add AM33XX EDMA support
Update HSUSB node to use the reset-gpios fmwk
* tag 'omap-for-v3.13/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (58 commits)
ARM: dts: dra7-evm: Add mmc2 node for eMMC support
ARM: dts: dra7-evm: Add mmc1 node for micro-sd support
ARM: dts: omap5-uevm: mark TWL6037 as system-power-controller
ARM: dts: omap3-igep0020: use standard constant for IRQ flags
ARM: dts: omap3-igep0020: Add HS USB Host support
ARM: dts: omap3-igep: Add USB OTG support
ARM: dts: AM33XX beagle black: add pinmux and hdmi node to enable display
ARM: dts: AM33XX: Add LCDC info into am335x-evm
ARM: dts: AM437X: Add DES node
ARM: dts: AM437X: Add AES node
ARM: dts: AM33XX: Fix AES interrupt number
ARM: dts: AM33XX: Add AES data and documentation
ARM: dts: AM33XX: Add SHAM data and documentation
ARM: dts: OMAP4: Add DES3DES node
ARM: dts: OMAP4: Add AES node
ARM: dts: am335x-evm[sdk]: switch mmc1 to 4-bit mode
ARM: dts: am335x-bone-common: correct mux mode for cmd line
ARM: dts: AM33XX: Add support for IGEP AQUILA EXPANSION board.
ARM: dts: AM33XX: Add support for IGEP COM AQUILA
ARM: dts: am335x-boneblack: move fixed regulator to board level
...
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index abff43883c9b..56c7d82e5b8d 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile | |||
| @@ -174,7 +174,9 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ | |||
| 174 | omap3-devkit8000.dtb \ | 174 | omap3-devkit8000.dtb \ |
| 175 | omap3-beagle-xm.dtb \ | 175 | omap3-beagle-xm.dtb \ |
| 176 | omap3-evm.dtb \ | 176 | omap3-evm.dtb \ |
| 177 | omap3-n900.dtb \ | ||
| 177 | omap3-tobi.dtb \ | 178 | omap3-tobi.dtb \ |
| 179 | omap3-gta04.dtb \ | ||
| 178 | omap3-igep0020.dtb \ | 180 | omap3-igep0020.dtb \ |
| 179 | omap3-igep0030.dtb \ | 181 | omap3-igep0030.dtb \ |
| 180 | omap4-panda.dtb \ | 182 | omap4-panda.dtb \ |
| @@ -188,9 +190,11 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ | |||
| 188 | am335x-evmsk.dtb \ | 190 | am335x-evmsk.dtb \ |
| 189 | am335x-bone.dtb \ | 191 | am335x-bone.dtb \ |
| 190 | am335x-boneblack.dtb \ | 192 | am335x-boneblack.dtb \ |
| 193 | am335x-base0033.dtb \ | ||
| 191 | am3517-evm.dtb \ | 194 | am3517-evm.dtb \ |
| 192 | am3517_mt_ventoux.dtb \ | 195 | am3517_mt_ventoux.dtb \ |
| 193 | am43x-epos-evm.dtb | 196 | am43x-epos-evm.dtb \ |
| 197 | dra7-evm.dtb | ||
| 194 | dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb | 198 | dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb |
| 195 | dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb | 199 | dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb |
| 196 | dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \ | 200 | dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \ |