Merge "ARM: dts: msm: Add IDP and QRD support for ADC on trinket" (790720ac) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/arm64/boot/dts/qcom/trinket-idp.dtsi

+40 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@
		* GNU General Public License for more details.
		*/
		#include <dt-bindings/gpio/gpio.h>

		#include <dt-bindings/iio/qcom,spmi-vadc.h>
		#include "trinket-thermal-overlay.dtsi"
		#include "trinket-sde-display.dtsi"

		@@ -28,6 +28,45 @@
		};
		};

		&pm6125_vadc {
		rf_pa1_therm {
		reg = <ADC_GPIO4_PU2>;
		label = "rf_pa1_therm";
		qcom,ratiometric;
		qcom,hw-settle-time = <200>;
		qcom,pre-scaling = <1 1>;
		};
		};

		&pm6125_adc_tm {
		io-channels = <&pm6125_vadc ADC_AMUX_THM1_PU2>,
		<&pm6125_vadc ADC_AMUX_THM2_PU2>,
		<&pm6125_vadc ADC_XO_THERM_PU2>,
		<&pm6125_vadc ADC_GPIO4_PU2>;

		rf_pa1_therm {
		reg = <ADC_GPIO4_PU2>;
		qcom,ratiometric;
		qcom,hw-settle-time = <200>;
		};
		};

		&thermal_zones {
		rf-pa1-therm-adc {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "user_space";
		thermal-sensors = <&pm6125_adc_tm ADC_GPIO4_PU2>;
		trips {
		active-config0 {
		temperature = <125000>;
		hysteresis = <1000>;
		type = "passive";
		};
		};
		};
		};

		&sdhc_1 {
		vdd-supply = <&pm6125_l24>;
		qcom,vdd-voltage-level = <2950000 2950000>;

+15 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@
		* GNU General Public License for more details.
		*/
		#include <dt-bindings/gpio/gpio.h>
		#include <dt-bindings/iio/qcom,spmi-vadc.h>

		&qupv3_se1_i2c {
		status = "ok";
		@@ -173,6 +174,20 @@
		status = "ok";
		};

		&pmi632_vadc {
		bat_therm {
		qcom,lut-index = <0>;
		};

		bat_therm_30k {
		qcom,lut-index = <0>;
		};

		bat_therm_400k {
		qcom,lut-index = <0>;
		};
		};

		&usb0 {
		extcon = <&pmi632_charger>;
		};

+0 −14

Original line number	Diff line number	Diff line
		@@ -130,20 +130,6 @@
		};
		};

		rf-pa1-therm-adc {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "user_space";
		thermal-sensors = <&pm6125_adc_tm ADC_GPIO4_PU2>;
		trips {
		active-config0 {
		temperature = <125000>;
		hysteresis = <1000>;
		type = "passive";
		};
		};
		};

		conn-therm-adc {
		polling-delay-passive = <0>;
		polling-delay = <0>;

+1 −17

Original line number	Diff line number	Diff line
		@@ -2376,15 +2376,6 @@
		qcom,hw-settle-time = <200>;
		qcom,pre-scaling = <1 1>;
		};

		rf_pa1_therm {
		reg = <ADC_GPIO4_PU2>;
		label = "rf_pa1_therm";
		qcom,ratiometric;
		qcom,hw-settle-time = <200>;
		qcom,pre-scaling = <1 1>;
		};

		};

		&pm6125_gpios {
		@@ -2431,8 +2422,7 @@
		&pm6125_adc_tm {
		io-channels = <&pm6125_vadc ADC_AMUX_THM1_PU2>,
		<&pm6125_vadc ADC_AMUX_THM2_PU2>,
		<&pm6125_vadc ADC_XO_THERM_PU2>,
		<&pm6125_vadc ADC_GPIO4_PU2>;
		<&pm6125_vadc ADC_XO_THERM_PU2>;

		/* Channel nodes */
		rf_pa0_therm {
		@@ -2452,12 +2442,6 @@
		qcom,ratiometric;
		qcom,hw-settle-time = <200>;
		};

		rf_pa1_therm {
		reg = <ADC_GPIO4_PU2>;
		qcom,ratiometric;
		qcom,hw-settle-time = <200>;
		};
		};

		&pmi632_vadc {