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

Commit f619a21e 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: Add QCA6174 bluetooth device for apq8017 CDP"

parents 706a1e5e b5c14f91

arch/arm/boot/dts/qcom/apq8017-no-pmi-cdp.dtsi

+5 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,11 @@ 
		qcom,torch-source = <&pmi8937_torch0 &pmi8937_torch1>;

		qcom,torch-source = <&pmi8937_torch0 &pmi8937_torch1>;

		qcom,switch-source = <&pmi8937_switch>;

		qcom,switch-source = <&pmi8937_switch>;

	};

	};



	bluetooth: bt_qca6174 {

		compatible = "qca,qca6174";

		qca,bt-reset-gpio = <&tlmm 129 0>; /* BT_EN */

	};

};

};





/* delete all PMI nodes */

/* delete all PMI nodes */

arch/arm/boot/dts/qcom/msm8917-pmi8937-cdp.dtsi

+5 −0
Original line number Original line Diff line number Diff line
@@ -24,4 +24,9 @@ 
		qcom,torch-source = <&pmi8937_torch0 &pmi8937_torch1>;

		qcom,torch-source = <&pmi8937_torch0 &pmi8937_torch1>;

		qcom,switch-source = <&pmi8937_switch>;

		qcom,switch-source = <&pmi8937_switch>;

	};

	};



	bluetooth: bt_qca6174 {

		compatible = "qca,qca6174";

		qca,bt-reset-gpio = <&tlmm 129 0>; /* BT_EN */

	};

};
 
};

arch/arm/boot/dts/qcom/msm8917-pmi8950-cdp.dtsi

+5 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,11 @@ 
		qcom,torch-source = <&pmi8950_torch0 &pmi8950_torch1>;

		qcom,torch-source = <&pmi8950_torch0 &pmi8950_torch1>;

		qcom,switch-source = <&pmi8950_switch>;

		qcom,switch-source = <&pmi8950_switch>;

	};

	};



	bluetooth: bt_qca6174 {

		compatible = "qca,qca6174";

		qca,bt-reset-gpio = <&tlmm 129 0>; /* BT_EN */

	};

};

};





&pm8937_gpios {

&pm8937_gpios {