Merge tag 'qcom-dts-for-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git...

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

diff --cc arch/arm/boot/dts/Makefile
Simple merge