diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-11-26 02:27:56 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-11-26 02:27:56 +0300 |
| commit | 112525b147d967c01f127996ab02c029e15534fe (patch) | |
| tree | 450519de08a86fd193c961c9393f24910926da71 /arch/arm/boot/dts/Makefile | |
| parent | 2ad5c1a5fcf2529a96c6abd724b0cd53e2d3cc8b (diff) | |
| parent | 4c52ffc708c90b2985f941db5490145530e4df69 (diff) | |
| download | linux-112525b147d967c01f127996ab02c029e15534fe.tar.xz | |
Merge tag 'qcom-dts-for-4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/dt
Pull "Qualcomm Device Tree Changes for v4.10 - v2" from Andy Gross:
* Add EBI2 support to MSM8660
* Add SMSC ethernet support to APQ8060
* Add support for display, pstore, iommu, and hdmi to APQ8064
* Add SDHCI node to MSM8974 Hammerhead
* Add WP8548 MangOH board support (MDM9615)
* tag 'qcom-dts-for-4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
ARM: dts: add SMSC ethernet on the APQ8060 Dragonboard
ARM: dts: add EBI2 to the Qualcomm MSM8660 DTSI
arm: dts: qcom: apq8064-nexus7: Add pstore support to nexus7
arm: dts: qcom: apq8064-nexus7: Add DSI and panel nodes
arm: dts: qcom: apq8064: Add dsi, gpu and iommu nodes
arm: dts: qcom: apq8064-ifc6410: Add HDMI support
arm: dts: qcom: apq8064: Add display DT nodes
ARM: dts: qcom: msm8974-hammerhead: Add sdhci1 node
dt-bindings: arm: Add Sierra Wireless modules bindings
ARM: dts: Add WP8548 based MangOH Green board DTS
ARM: dts: Add Sierra Wireless WP8548 dtsi
dt-bindings: qcom: Add MDM9615 bindings
ARM: dts: Add MDM9615 dtsi
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index befa3141fafb..5a9fb0ea6566 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -633,7 +633,8 @@ dtb-$(CONFIG_ARCH_QCOM) += \ qcom-msm8660-surf.dtb \ qcom-msm8960-cdp.dtb \ qcom-msm8974-lge-nexus5-hammerhead.dtb \ - qcom-msm8974-sony-xperia-honami.dtb + qcom-msm8974-sony-xperia-honami.dtb \ + qcom-mdm9615-wp8548-mangoh-green.dtb dtb-$(CONFIG_ARCH_REALVIEW) += \ arm-realview-pb1176.dtb \ arm-realview-pb11mp.dtb \ |