diff options
| author | Olof Johansson <olof@lixom.net> | 2016-07-05 07:38:25 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-07-05 07:38:25 +0200 |
| commit | 24cf731637faee2c4c0fe02bbf55e0aa80c41af5 (patch) | |
| tree | 57e2c076ba50b97dd8105c41e43cd27ef5a2dd8f /arch/arm/boot/dts/Makefile | |
| parent | Merge tag 'omap-for-v4.8/dt-part1-signed-v2' of git://git.kernel.org/pub/scm/... (diff) | |
| parent | dts: ipq4019: support ARMv7 PMU (diff) | |
| download | linux-24cf731637faee2c4c0fe02bbf55e0aa80c41af5.tar.xz linux-24cf731637faee2c4c0fe02bbf55e0aa80c41af5.zip | |
Merge tag 'qcom-dt-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/dt
Qualcomm Device Tree Changes for v4.8
* Reverse BAM dma node reverts
* Add BAM remote control options for affected platforms
* Enable peripherals on APQ8074 dragonboard
* Enable PMA8084 pwrky
* Fix PMIC reg entries by removing unnecessary size element
* Add SCM binding and support for all currently supported boards
* Add Qualcomm WCNSS binding documentation
* Rename db600c to SD_600eval and add peripheral nodes
* Remove gpio key entry from Nexus7
* Add APQ8060 based dragonboard and associated peripherals
* Add ARMv7 PMU for IPQ4019
* Update smem state cells to match documentation
* tag 'qcom-dt-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux: (26 commits)
dts: ipq4019: support ARMv7 PMU
ARM: dts: add Qualcomm APQ8060-based Dragonboard
ARM: dts: move the fixed MMC regulator to SURF board
ARM: dts: fix the MSM8660 RTC base address
ARM: dts: add I2C block in GSBI12
ARM: dts: add L2CC and RPM with regulators for MSM8660
ARM: dts: add SDCC5 to Qualcomm MSM8660
ARM: dts: add GPIO and MPP to MSM8660 PMIC
device-tree: nexus7: Remove power gpio key entry and use pmic8xxx-pwrkey
arm: dts: qcom: Update smem state cells usage
ARM: dts: qcom: msm8974-honami: Set DMA as remotely controlled
ARM: dts: sd_600eval: Fix eMMC lockup issue
ARM: dts: apq8064: rename db600c to SD_600eval
ARM: dts: apq8064: move sdcc3 pinctrls out of baord file
ARM: dts: apq8064: move sdcc1 pinctrl nodes to soc file
dt: binding: Add Qualcomm WCNSS control binding
dts: qcom: apq8064: Add SCM firmware node
dts: qcom: msm8974: Add SCM firmware node
dts: qcom: apq8084: Add SCM firmware node
dt/bindings: firmware: Add Qualcomm SCM binding
...
Signed-off-by: Olof Johansson <olof@lixom.net>
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 6dfefa36e7de..1739959502c2 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -578,7 +578,8 @@ dtb-$(CONFIG_ARCH_PRIMA2) += \ dtb-$(CONFIG_ARCH_OXNAS) += \ wd-mbwe.dtb dtb-$(CONFIG_ARCH_QCOM) += \ - qcom-apq8064-arrow-db600c.dtb \ + qcom-apq8060-dragonboard.dtb \ + qcom-apq8064-arrow-sd-600eval.dtb \ qcom-apq8064-cm-qs600.dtb \ qcom-apq8064-ifc6410.dtb \ qcom-apq8064-sony-xperia-yuga.dtb \ |