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

5 files changed, 92 insertions, 2 deletions

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index d8f49c3b9948..099eaffd986a 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -765,6 +765,7 @@ dtb-$(CONFIG_ARCH_QCOM) += \
         qcom-msm8960-cdp.dtb \
         qcom-msm8974-fairphone-fp2.dtb \
         qcom-msm8974-lge-nexus5-hammerhead.dtb \
+        qcom-msm8974-samsung-klte.dtb \
         qcom-msm8974-sony-xperia-castor.dtb \
         qcom-msm8974-sony-xperia-honami.dtb \
         qcom-mdm9615-wp8548-mangoh-green.dtb
diff --git a/arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts b/arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts
index b818ebce0978..209eb21cea00 100644
--- a/arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts
+++ b/arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts
@@ -133,7 +133,7 @@
                                 clock-frequency = <200000>;
 
                                 eeprom@50 {
-                                        compatible = "24c02";
+                                        compatible = "atmel,24c02";
                                         reg = <0x50>;
                                         pagesize = <32>;
                                 };
diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
index 3ca96e361878..5341a39c0392 100644
--- a/arch/arm/boot/dts/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
@@ -316,6 +316,23 @@
                 };
         };
 
+
+        /*
+         * These channels from the ADC are simply hardware monitors.
+         * That is why the ADC is referred to as "HKADC" - HouseKeeping
+         * ADC.
+         */
+        iio-hwmon {
+                compatible = "iio-hwmon";
+                io-channels = <&xoadc 0x00 0x01>, /* Battery */
+                            <&xoadc 0x00 0x02>, /* DC in (charger) */
+                            <&xoadc 0x00 0x04>, /* VPH the main system voltage */
+                            <&xoadc 0x00 0x0b>, /* Die temperature */
+                            <&xoadc 0x00 0x0c>, /* Reference voltage 1.25V */
+                            <&xoadc 0x00 0x0d>, /* Reference voltage 0.625V */
+                            <&xoadc 0x00 0x0e>; /* Charger temperature */
+        };
+
         soc: soc {
                 #address-cells = <1>;
                 #size-cells = <1>;
@@ -770,6 +787,52 @@
                                         debounce = <15625>;
                                         pull-up;
                                 };
+
+                                xoadc: xoadc@197 {
+                                        compatible = "qcom,pm8921-adc";
+                                        reg = <197>;
+                                        interrupts-extended = <&pmicintc 78 IRQ_TYPE_EDGE_RISING>;
+                                        #address-cells = <2>;
+                                        #size-cells = <0>;
+                                        #io-channel-cells = <2>;
+
+                                        vcoin: adc-channel@00 {
+                                                reg = <0x00 0x00>;
+                                        };
+                                        vbat: adc-channel@01 {
+                                                reg = <0x00 0x01>;
+                                        };
+                                        dcin: adc-channel@02 {
+                                                reg = <0x00 0x02>;
+                                        };
+                                        vph_pwr: adc-channel@04 {
+                                                reg = <0x00 0x04>;
+                                        };
+                                        batt_therm: adc-channel@08 {
+                                                reg = <0x00 0x08>;
+                                        };
+                                        batt_id: adc-channel@09 {
+                                                reg = <0x00 0x09>;
+                                        };
+                                        usb_vbus: adc-channel@0a {
+                                                reg = <0x00 0x0a>;
+                                        };
+                                        die_temp: adc-channel@0b {
+                                                reg = <0x00 0x0b>;
+                                        };
+                                        ref_625mv: adc-channel@0c {
+                                                reg = <0x00 0x0c>;
+                                        };
+                                        ref_1250mv: adc-channel@0d {
+                                                reg = <0x00 0x0d>;
+                                        };
+                                        chg_temp: adc-channel@0e {
+                                                reg = <0x00 0x0e>;
+                                        };
+                                        ref_muxoff: adc-channel@0f {
+                                                reg = <0x00 0x0f>;
+                                        };
+                                };
                         };
                 };
 
diff --git a/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts b/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts
new file mode 100644
index 000000000000..eaa1001d0a46
--- /dev/null
+++ b/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: GPL-2.0
+#include "qcom-msm8974pro.dtsi"
+#include "qcom-pm8841.dtsi"
+#include "qcom-pm8941.dtsi"
+
+/ {
+        model = "Samsung Galaxy S5";
+        compatible = "samsung,klte", "qcom,msm8974";
+
+        aliases {
+                serial0 = &blsp1_uart1;
+        };
+
+        chosen {
+                stdout-path = "serial0:115200n8";
+        };
+};
+
+&soc {
+        serial@f991e000 {
+                status = "ok";
+        };
+
+};
diff --git a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-castor.dts b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-castor.dts
index e87f2c99060d..701b396719c7 100644
--- a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-castor.dts
+++ b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-castor.dts
@@ -491,7 +491,7 @@
                 pinctrl-0 = <&i2c8_pins>;
 
                 synaptics@2c {
-                        compatible = "syna,rmi-i2c";
+                        compatible = "syna,rmi4-i2c";
                         reg = <0x2c>;
 
                         interrupt-parent = <&msmgpio>;
@@ -506,6 +506,8 @@
                         pinctrl-names = "default";
                         pinctrl-0 = <&ts_int_pin>;
 
+                        syna,startup-delay-ms = <10>;
+
                         rmi-f01@1 {
                                 reg = <0x1>;
                                 syna,nosleep = <1>;