diff options
author | Arnd Bergmann <arnd@arndb.de> | 2018-03-27 15:32:03 +0300 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2018-03-27 15:32:03 +0300 |
commit | aeb700861aad363ffcd93f98747582c82e286640 (patch) | |
tree | 9fa20ed7e66343ef5df760f9080330538ff1c39a /arch/arm/mach-u300 | |
parent | 2430bcda3678dc031e442b700f8a694b093a9851 (diff) | |
parent | 84d9bba0762e0a8e5dc66d25826a306e26177e6f (diff) | |
download | linux-aeb700861aad363ffcd93f98747582c82e286640.tar.xz |
Merge tag 'qcom-dts-for-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/dt
Pull "Qualcomm Device Tree Changes for v4.17" from Andy Gross:
* Add initial DTS file for Samsung Galaxy S5
* Fixups for castor touchscreen node
* Fixup QS600 at23 manufacturer
* Add XOADC and IIO to APQ8064
* tag 'qcom-dts-for-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/agross/linux:
ARM: dts: msm8974: castor: Fix typo and add startup delay in touchscreen node
ARM: dts: add XOADC and IIO HWMON to APQ8064
ARM: dts: use 'atmel' as at24 manufacturer for qcom-apq8064-cm-qs600
ARM: dts: qcom: Add initial DTS file for Samsung Galaxy S5 phone
Diffstat (limited to 'arch/arm/mach-u300')
0 files changed, 0 insertions, 0 deletions