Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7f223f5 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add node to enable adc-tm for VBAT channel"

parents 955a37e2 277f402e

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

+40 −36
Original line number Diff line number Diff line
@@ -890,42 +890,6 @@ 
		#clock-cells = <1>;

	};



	icnss: qcom,icnss@C800000 {

		compatible = "qcom,icnss";

		reg = <0xC800000 0x800000>,

		      <0xa0000000 0x10000000>,

		      <0xb0000000 0x10000>;

		reg-names = "membase", "smmu_iova_base", "smmu_iova_ipa";

		iommus = <&apps_smmu 0x80 0x1>;

		interrupts = <0 358 0 /* CE0 */ >,

			     <0 359 0 /* CE1 */ >,

			     <0 360 0 /* CE2 */ >,

			     <0 361 0 /* CE3 */ >,

			     <0 362 0 /* CE4 */ >,

			     <0 363 0 /* CE5 */ >,

			     <0 364 0 /* CE6 */ >,

			     <0 365 0 /* CE7 */ >,

			     <0 366 0 /* CE8 */ >,

			     <0 367 0 /* CE9 */ >,

			     <0 368 0 /* CE10 */ >,

			     <0 369 0 /* CE11 */ >;

		qcom,smmu-s1-bypass;

		qcom,wlan-msa-memory = <0x100000>;

		qcom,wlan-msa-fixed-region = <&wlan_msa_mem>;

		vdd-cx-mx-supply = <&L8A>;

		vdd-1.8-xo-supply = <&L16A>;

		vdd-1.3-rfa-supply = <&L17A>;

		vdd-3.3-ch0-supply = <&L23A>;

		qcom,vdd-cx-mx-config = <640000 640000>;

		qcom,smp2p_map_wlan_1_in {

			interrupts-extended = <&smp2p_wlan_1_in 0 0>,

					      <&smp2p_wlan_1_in 1 0>;

			interrupt-names = "qcom,smp2p-force-fatal-error",

					  "qcom,smp2p-early-crash-ind";

		};



	};



	arm64-cpu-erp {

		compatible = "arm,arm64-cpu-erp";

		interrupts = <0 43 4>,
@@ -2849,6 +2813,46 @@ 
#include "trinket-audio.dtsi"

#include "trinket-thermal.dtsi"



&soc {

	icnss: qcom,icnss@C800000 {

		compatible = "qcom,icnss";

		reg = <0xC800000 0x800000>,

		      <0xa0000000 0x10000000>,

		      <0xb0000000 0x10000>;

		reg-names = "membase", "smmu_iova_base", "smmu_iova_ipa";

		iommus = <&apps_smmu 0x80 0x1>;

		interrupts = <0 358 0 /* CE0 */ >,

			     <0 359 0 /* CE1 */ >,

			     <0 360 0 /* CE2 */ >,

			     <0 361 0 /* CE3 */ >,

			     <0 362 0 /* CE4 */ >,

			     <0 363 0 /* CE5 */ >,

			     <0 364 0 /* CE6 */ >,

			     <0 365 0 /* CE7 */ >,

			     <0 366 0 /* CE8 */ >,

			     <0 367 0 /* CE9 */ >,

			     <0 368 0 /* CE10 */ >,

			     <0 369 0 /* CE11 */ >;

		qcom,smmu-s1-bypass;

		qcom,wlan-msa-memory = <0x100000>;

		qcom,wlan-msa-fixed-region = <&wlan_msa_mem>;

		vdd-cx-mx-supply = <&L8A>;

		vdd-1.8-xo-supply = <&L16A>;

		vdd-1.3-rfa-supply = <&L17A>;

		vdd-3.3-ch0-supply = <&L23A>;

		qcom,vdd-cx-mx-config = <640000 640000>;

		qcom,icnss-adc_tm = <&pmi632_adc_tm>;

		io-channels = <&pmi632_vadc ADC_VBAT_SNS>;

		io-channel-names = "icnss";

		qcom,smp2p_map_wlan_1_in {

		interrupts-extended = <&smp2p_wlan_1_in 0 0>,

					      <&smp2p_wlan_1_in 1 0>;

			interrupt-names = "qcom,smp2p-force-fatal-error",

					  "qcom,smp2p-early-crash-ind";

		};

	};

};



&qupv3_se1_i2c {

	status="ok";

	#include "pm8008.dtsi"