Merge "ARM: dts: msm: Add thermistor support for PM660" (c3cad444) · Commits · e / devices / android_kernel_xiaomi_markw

arch/arm/boot/dts/qcom/msm-pm660.dtsi

+12 −0

Original line number	Diff line number	Diff line
		@@ -288,6 +288,18 @@
		qcom,vadc-thermal-node;
		};

		chan@4f {
		label = "pa_therm0";
		reg = <0x4f>;
		qcom,decimation = <2>;
		qcom,pre-div-channel-scaling = <0>;
		qcom,calibration-type = "ratiometric";
		qcom,scale-function = <2>;
		qcom,hw-settle-time = <2>;
		qcom,fast-avg-setup = <0>;
		qcom,vadc-thermal-node;
		};

		chan@1d {
		label = "drax_temp";
		reg = <0x1d>;

+4 −5

Original line number	Diff line number	Diff line
		@@ -66,11 +66,6 @@
		/delete-property/ vdd-dig-supply;
		};

		vadc@3400 {
		/delete-property/ qcom,adc_tm-vadc;
		/delete-property/ qcom,pmic-revid;
		};

		msm8x16_wcd_codec@f000 {
		/delete-property/ cdc-vdda-cp-supply;
		/delete-property/ cdc-vdda-h-supply;
		@@ -182,6 +177,10 @@
		qcom,actuator-type = "erm";
		};

		&pm660_vadc {
		/delete-node/ chan@1d;
		};

		&dsi_auo_390p_cmd {
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs";
		qcom,panel-supply-entries = <&dsi_pm660_panel_pwr_supply>;