diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-13 18:29:08 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-13 18:29:08 +0300 |
| commit | 9992f21333c1514d41a6cae50928c4c466b8465c (patch) | |
| tree | 7034db9c9ae43ae17b5aaaa7b7e6e907a3644510 /arch/arm/boot/dts/Makefile | |
| parent | 9c0da3cc61f1233c2782e2d3d91e3d0707dd4ba5 (diff) | |
| parent | 73bae19c3a3fde589b4508f3bfcc68d2f4b06f39 (diff) | |
| download | linux-9992f21333c1514d41a6cae50928c4c466b8465c.tar.xz | |
Merge tag 'qcom-dts-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/dt
Pull "Qualcomm Device Tree Changes for v4.9" from Andy Gross:
* Rework dr_mode on APQ8064 and Nexus7
* Add MSM8974 BLSP1 UART1 port
* Add AP148 SATA mapping
* Add support for LG Nexus 5 (Hammerhead)
* Fixup MSM8660/MSM8064 SPMI/MPP IRQs
* Add Nexus7 IMEM/reboot reason
* Add Honami touchscreen support
* Add TSENS support on MSM8974, APQ8064, and APQ8084
* Add APQ8060 Dragonboard PM8058 LEDs
* Rework VPH PWR REG for MSM8974
* tag 'qcom-dts-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
ARM: dts: msm8974: Move vreg_boost node from the honami to msm8974
ARM: dts: qcom: msm8974: Add fixed regulator node for vph-pwr-reg
ARM: dts: add PM8058 LEDs to the APQ8060 Dragonboard
arm: dts: apq8084: Add thermal zones, tsens and qfprom nodes
arm: dts: apq8064: Add thermal zones, tsens and qfprom nodes
arm: dts: msm8974: Add thermal zones, tsens and qfprom nodes
ARM: dts: msm8974: honami: Add touchscreen
device-tree: nexus7: Add IMEM syscon and reboot reason support
ARM: dts: MSM8660 remove flags from SPMI/MPP IRQs
ARM: dts: MSM8064 remove flags from SPMI/MPP IRQs
ARM: dts: msm8974-hammerhead: Introduce gpio-keys nodes
ARM: dts: msm8974-hammerhead: Add regulator nodes for hammerhead
ARM: dts: qcom: Add initial DTS for LG Nexus 5 Phone
ipq8064: dts: force AP148 SATA port mapping
ARM: dts: msm8974: Add nodes for blsp1_uart1 serial port
device-tree: aqp8064.dtsi: Remove usb phy dr_mode = "host"
device-tree: nexus7: Set phy mode to otg instead of host
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 690001bc82a8..9deb07810043 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -603,6 +603,7 @@ dtb-$(CONFIG_ARCH_QCOM) += \ qcom-ipq8064-ap148.dtb \ qcom-msm8660-surf.dtb \ qcom-msm8960-cdp.dtb \ + qcom-msm8974-lge-nexus5-hammerhead.dtb \ qcom-msm8974-sony-xperia-honami.dtb dtb-$(CONFIG_ARCH_REALVIEW) += \ arm-realview-pb1176.dtb \ |