diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-03-02 22:11:21 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-03-02 22:11:21 +0300 |
| commit | 953a400ac2b10ead2049c352abd39efcf3146637 (patch) | |
| tree | 62b5256d1221e5598f3babc28a813cb305bcea47 /arch/arm/boot/dts/Makefile | |
| parent | 53b28f1c642b92ad356a0766924ac04e53987b84 (diff) | |
| parent | 90bd6e8fea27c4a199d017134bbcb9f8a045a152 (diff) | |
| download | linux-953a400ac2b10ead2049c352abd39efcf3146637.tar.xz | |
Merge tag 'qcom-dt-for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/dt
Merge "Qualcomm ARM Based Device Tree Updates for v4.6" from Andy Gross:
* Add documentation for Kryo
* Add RPMCC node for APQ8064
* Updates for MSM8974
* Add board clocks
* Add support for Nexus7 device
* Fixup pmic reg properties
* Various updates/cleanups for APQ8064 based boards
* tag 'qcom-dt-for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux: (23 commits)
ARM: dts: ifc6410: add correct aliases to the i2c and spi bus
ARM: dts: apq8064: add i2c6 device node.
ARM: dts: ifc6410: enable cam i2c device
ARM: dts: apq8064: add gsbi4 with i2c node.
ARM: dts: apq8064: add missing i2c2 pinctrl info
ARM: dts: ifc6410: enable spi device on expansion
ARM: dts: apq8064: add spi5 device node.
ARM: dts: apq8064: add i2c sleep pinctrl states.
ARM: dts: apq8064: add pci support in CM QS600
ARM: dts: apq8064: move pinctrls to dedicated dtsi
ARM: dts: qcom: fix i2c lables to be inline with others
dts: msm8974: Add dma channels for blsp2_i2c1 node
dts: msm8974: Add blsp2_bam dma node
ARM: dts: qcom: Remove size elements from pmic reg properties
devicetree: bindings: Document qcom board compatible format
devicetree: Add DTS file to support the Nexus7 2013 (flo) device.
devicetree: qcom-apq8064.dtsi: Add i2c3 address-cells and size-cells values
arm: dts: qcom: Add more board clocks
ARM: dts: qcom: msm8974: Add WCNSS SMP2P node
ARM: dts: qcom: msm8974: Add smsm node
...
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 be1d7c967e35..bfc877074086 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -533,6 +533,7 @@ dtb-$(CONFIG_ARCH_QCOM) += \ qcom-apq8064-cm-qs600.dtb \ qcom-apq8064-ifc6410.dtb \ qcom-apq8064-sony-xperia-yuga.dtb \ + qcom-apq8064-asus-nexus7-flo.dtb \ qcom-apq8074-dragonboard.dtb \ qcom-apq8084-ifc6540.dtb \ qcom-apq8084-mtp.dtb \ |