hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qualcomm Device Tree Changes for v4.17 

* Add initial DTS file for Samsung Galaxy S5
 * Fixups for castor touchscreen node
 * Fixup QS600 at23 manufacturer
 * Add XOADC and IIO to APQ8064
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJasGyvAAoJEFKiBbHx2RXVsQEP/2feXsEhjA6zDVKoO5yL9gLn
 vHOTfopaUsTlnK0HTSU1vzf7CYLQ3LUjljNSWBOKoGOWgFDIY4/5miHIwttb/yWz
 tbkiNnQzotvJhHlZrMSgSbG7dq0XCEq0E2pGMim5hXifXekguNicLKtFWyyIFnwO
 z6pF0vj21wVfXMuFqK0YAFGYkpt5m1HLrhU7ePgP9ysty/qd/pdJJCP6QwUTZudk
 WO68aQuvv3UNZ1Z8SHka4H0HF1RxWjF7u1YFuwQNN7PNt3LsjxroBMhpoQOztmiw
 BXvMZyOtysuawYFUsGACKcg9oxL3S3v1qu8TUc0e1F5hqIxgEQjaDEYpra1cdxtB
 VFH8whVYscCkSWP+J98B5QW3TK/YXxjKijys4/Z+mW/G4XXY8MvKLqPiGA+xXJEv
 wL5Hac7xV2ON0w6F5kzY/lxHdcsjcf98+DpGd36WwXzwyMjUAGYesvp9JhmxzeQP
 uPkVlbw56vJn2xO1uNjLvgJdVFjQgsYWoS/8/XqDbtBUT6qkWxevm5CyQ7FaSi4f
 wRhnzOWuFxpVG53LFjUFYcozDV98nGWYSyDHd7oG4sfKTwk7i3fgUKfiiAxZ/4RC
 /2yYoMvRzfFaE+8pFWbY1f/btOHrXAG7Q9U2/G5NFl4u2TcATc1ltTHZbndkwomE
 cG+TXvNzb+GsG/O4s8KT
 =1Thf
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Arnd Bergmann 2018-03-27 14:32:03 +02:00
parent 2430bcda36 84d9bba076
commit aeb700861a
5 changed files with 92 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/boot/dts/Makefile
View File

@ -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

2
arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts
View File

@ -133,7 +133,7 @@
clock-frequency = <200000>;
eeprom@50 {
compatible = "24c02";
compatible = "atmel,24c02";
reg = <0x50>;
pagesize = <32>;
};

63
arch/arm/boot/dts/qcom-apq8064.dtsi
View File

@ -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>;
};
};
};
};

24
arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts Normal file
View File

@ -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";
};
};

4
arch/arm/boot/dts/qcom-msm8974-sony-xperia-castor.dts
View File

@ -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>;