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

Commit 71a04d42 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: include mdmcalifornium v1.1 files in sdxhedgehog headers"

parents 2060180d 8ab03e80

arch/arm/boot/dts/qcom/sdxhedgehog-cdp.dtsi

+1 −83
Original line number Diff line number Diff line
@@ -11,88 +11,6 @@ 
 */



#include <dt-bindings/interrupt-controller/irq.h>

#include "mdmcalifornium-v1.1-cdp.dtsi"

#include "sdxhedgehog.dtsi"

#include "sdxhedgehog-pinctrl.dtsi"
 


&blsp1_uart3 {

	status = "ok";

	pinctrl-names = "default";

	pinctrl-0 = <&uart3_console_active>;

};



&blsp1_uart2_hs {

	status = "ok";

};



&pmdcalifornium_vadc {

	chan@83 {

		label = "vph_pwr";

		reg = <0x83>;

		qcom,decimation = <2>;

		qcom,pre-div-channel-scaling = <1>;

		qcom,calibration-type = "absolute";

		qcom,scale-function = <0>;

		qcom,hw-settle-time = <0>;

		qcom,fast-avg-setup = <0>;

	};



	chan@4c {

		label = "xo_therm_buf";

		reg = <0x4c>;

		qcom,decimation = <2>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <4>;

		qcom,hw-settle-time = <2>;

		qcom,fast-avg-setup = <0>;

		qcom,vadc-thermal-node;

	};



	chan@53 {

		label = "ambient_therm";

		reg = <0x53>;

		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@4d {

		label = "mdm_case_therm";

		reg = <0x4d>;

		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@4e {

		label = "pa_therm1";

		reg = <0x4e>;

		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@4f {

		label = "pa_therm2";

		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;

	};

};

arch/arm/boot/dts/qcom/sdxhedgehog-mtp.dtsi

+1 −83
Original line number Diff line number Diff line
@@ -11,88 +11,6 @@ 
 */



#include <dt-bindings/interrupt-controller/irq.h>

#include "mdmcalifornium-v1.1-mtp.dtsi"

#include "sdxhedgehog.dtsi"

#include "sdxhedgehog-pinctrl.dtsi"
 


&blsp1_uart3 {

	status = "ok";

	pinctrl-names = "default";

	pinctrl-0 = <&uart3_console_active>;

};



&blsp1_uart2_hs {

	status = "ok";

};



&pmdcalifornium_vadc {

	chan@83 {

		label = "vph_pwr";

		reg = <0x83>;

		qcom,decimation = <2>;

		qcom,pre-div-channel-scaling = <1>;

		qcom,calibration-type = "absolute";

		qcom,scale-function = <0>;

		qcom,hw-settle-time = <0>;

		qcom,fast-avg-setup = <0>;

	};



	chan@4c {

		label = "xo_therm_buf";

		reg = <0x4c>;

		qcom,decimation = <2>;

		qcom,pre-div-channel-scaling = <0>;

		qcom,calibration-type = "ratiometric";

		qcom,scale-function = <4>;

		qcom,hw-settle-time = <2>;

		qcom,fast-avg-setup = <0>;

		qcom,vadc-thermal-node;

	};



	chan@53 {

		label = "ambient_therm";

		reg = <0x53>;

		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@4d {

		label = "mdm_case_therm";

		reg = <0x4d>;

		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@4e {

		label = "pa_therm1";

		reg = <0x4e>;

		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@4f {

		label = "pa_therm2";

		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;

	};

};

arch/arm/boot/dts/qcom/sdxhedgehog.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ 
 * GNU General Public License for more details.

 */



#include "mdmcalifornium.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDX HEDGEHOG";

	compatible = "qcom,sdxhedgehog";