diff options
| author | Olof Johansson <olof@lixom.net> | 2014-03-09 08:19:06 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-03-09 08:19:21 +0100 |
| commit | 20bb4685983732b669f4c827022cccfba16a2aed (patch) | |
| tree | 44b88211b7c2ec6a21c90bd4dff60ae8605409b1 /arch/arm/boot/dts/Makefile | |
| parent | Merge tag 'qcom-dt-for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | Merge tag 'for_3.15/dts_signed' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| download | linux-20bb4685983732b669f4c827022cccfba16a2aed.tar.xz linux-20bb4685983732b669f4c827022cccfba16a2aed.zip | |
Merge tag 'omap-for-v3.15/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
OMAP device tree changes from Tony Lindgren:
Device tree related changes for omaps with minor code
changes also to platform data quirks that are still needed
for some features.
* tag 'omap-for-v3.15/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (60 commits)
ARM: dts: omap4+: Add DMM bindings
ARM: dts: am43x-gp-evm: Add matrix gpio keys.
ARM: dts: am43xx: add support for parallel NAND flash
ARM: dts: AM33xx: updated default ECC scheme in nand-ecc-opt
ARM: dts: am335x-evm: NAND: update MTD partition table
ARM: OMAP2+: gpmc: update gpmc_hwecc_bch_capable() for new platforms and ECC schemes
ARM: dts: omap3-gta04: Add bma180 accelerometer
ARM: dts: omap3-gta04: Enable mmc2 for wifi
ARM: dts: omap3-gta04: Add basic sound support
ARM: dts: omap3-gta04: Add twl4030 charger
ARM: dts: omap3-gta04: Add touchscreen properties
ARM: dts: omap3-gta04: Add support for magnetometer
ARM: dts: am437x-gp-evm: Enable gpio.
ARM: dts: am437x-gp-evm: Add pwm backlight support.
ARM: dts: am437x-gp-evm: Add gp dts.
ARM: dts: am43x-epos-evm: Add SPI data.
ARM: dts: am43x-epos-evm: Add I2C2 data.
pinctrl: am43xx: dt-bindings: add MUX_MODE8
ARM: dts: am43x-epos-evm: Add pwm backlight support.
ARM: dts: am4372: Add pwm-cells property for ecap device.
...
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index ec2340238436..0ae79496752c 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -228,6 +228,10 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ omap2420-n810-wimax.dtb \ omap3430-sdp.dtb \ omap3-beagle.dtb \ + omap3-cm-t3517.dtb \ + omap3-sbc-t3517.dtb \ + omap3-cm-t3530.dtb \ + omap3-sbc-t3530.dtb \ omap3-cm-t3730.dtb \ omap3-sbc-t3730.dtb \ omap3-devkit8000.dtb \ @@ -242,6 +246,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ omap3-gta04.dtb \ omap3-igep0020.dtb \ omap3-igep0030.dtb \ + omap3-lilly-dbb056.dtb \ omap3-zoom3.dtb \ omap4-panda.dtb \ omap4-panda-a4.dtb \ @@ -256,9 +261,11 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ am335x-boneblack.dtb \ am335x-nano.dtb \ am335x-base0033.dtb \ + am3517-craneboard.dtb \ am3517-evm.dtb \ am3517_mt_ventoux.dtb \ am43x-epos-evm.dtb \ + am437x-gp-evm.dtb \ dra7-evm.dtb dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb |