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

Commit 14d3afb2 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: update SMB1355 device node inclusion policy"

parents c8b9e5ed cc0c4237

arch/arm64/boot/dts/qcom/sda450-pmi632-mtp-s3.dts

+1 −1
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
/dts-v1/;



#include "sda450.dtsi"

#include "sdm450-pmi632-mtp-s3.dtsi"

#include "sdm450-pmi632.dtsi"

#include "sdm450-pmi632-mtp-s3.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDA450 + PMI632 MTP S3";

arch/arm64/boot/dts/qcom/sda845-svr.dtsi

+4 −1
Original line number Diff line number Diff line
@@ -14,9 +14,12 @@ 
#include "sdm845-pinctrl-overlay.dtsi"

#include "sda845-svr-pinctrl-overlay.dtsi"

#include "sdm845-camera-sensor-svr.dtsi"

#include "smb1355.dtsi"

#include <dt-bindings/clock/mdss-10nm-pll-clk.h>



&qupv3_se10_i2c {

#include "smb1355.dtsi"

};



&vendor {

	bluetooth: bt_wcn3990 {

		compatible = "qca,wcn3990";

arch/arm64/boot/dts/qcom/sdm439-mtp.dtsi

+57 −0
Original line number Diff line number Diff line
@@ -215,3 +215,60 @@ 
	qcom,mdss-dsi-bl-pmic-bank-select = <0>;

	qcom,mdss-dsi-pwm-gpio = <&pm8953_gpios 8 0>;

};



&i2c_2 {

#include "smb1355.dtsi"

};



&pmi632_gpios {

	smb_en {

		smb_en_default: smb_en_default {

			pins = "gpio2";

			function = "func1";

			output-enable;

		};

	};

};



&tlmm {

	smb_int_default: smb_int_default {

		mux {

			pins = "gpio59";

			function = "gpio";

		};

		config {

			pins = "gpio59";

			drive-strength = <2>;

			bias-pull-up;

			input-enable;

		};

	};

};



&smb1355_0 {

	pinctrl-names = "default";

	pinctrl-0 = <&smb_int_default

			&smb_en_default>;

	interrupt-parent = <&tlmm>;

	interrupts = <59 IRQ_TYPE_LEVEL_LOW>;

	smb1355_charger_0: qcom,smb1355-charger@1000 {

		status ="ok";

		/delete-property/ io-channels;

		/delete-property/ io-channels-names;

		qcom,parallel-mode = <1>;

	};

};



&smb1355_1 {

	pinctrl-names = "default";

	pinctrl-0 = <&smb_int_default

			&smb_en_default>;

	interrupt-parent = <&tlmm>;

	interrupts = <59 IRQ_TYPE_LEVEL_LOW>;

	smb1355_charger_1: qcom,smb1355-charger@1000 {

		status ="ok";

		/delete-property/ io-channels;

		/delete-property/ io-channels-names;

		qcom,parallel-mode = <1>;

	};

};

arch/arm64/boot/dts/qcom/sdm439-qrd.dtsi

+57 −0
Original line number Diff line number Diff line
@@ -312,3 +312,60 @@ 
	qcom,mdss-dsi-bl-pmic-bank-select = <0>;

	qcom,mdss-dsi-pwm-gpio = <&pm8953_gpios 8 0>;

};



&i2c_2 {

#include "smb1355.dtsi"

};



&pmi632_gpios {

	smb_en {

		smb_en_default: smb_en_default {

			pins = "gpio2";

			function = "func1";

			output-enable;

		};

	};

};



&tlmm {

	smb_int_default: smb_int_default {

		mux {

			pins = "gpio59";

			function = "gpio";

		};

		config {

			pins = "gpio59";

			drive-strength = <2>;

			bias-pull-up;

			input-enable;

		};

	};

};



&smb1355_0 {

	pinctrl-names = "default";

	pinctrl-0 = <&smb_int_default

			&smb_en_default>;

	interrupt-parent = <&tlmm>;

	interrupts = <59 IRQ_TYPE_LEVEL_LOW>;

	smb1355_charger_0: qcom,smb1355-charger@1000 {

		status ="ok";

		/delete-property/ io-channels;

		/delete-property/ io-channels-names;

		qcom,parallel-mode = <1>;

	};

};



&smb1355_1 {

	pinctrl-names = "default";

	pinctrl-0 = <&smb_int_default

			&smb_en_default>;

	interrupt-parent = <&tlmm>;

	interrupts = <59 IRQ_TYPE_LEVEL_LOW>;

	smb1355_charger_1: qcom,smb1355-charger@1000 {

		status ="ok";

		/delete-property/ io-channels;

		/delete-property/ io-channels-names;

		qcom,parallel-mode = <1>;

	};

};

arch/arm64/boot/dts/qcom/sdm450-pmi632-mtp-s3.dts

+1 −1
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
/dts-v1/;



#include "sdm450.dtsi"

#include "sdm450-pmi632-mtp-s3.dtsi"

#include "sdm450-pmi632.dtsi"

#include "sdm450-pmi632-mtp-s3.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM450 + PMI632 MTP S3";