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

Commit ed86c7db 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: Enable QCA9379 bluetooth device for apq8009" into msm-4.9

parents dcd2c80d 6b649f5b

arch/arm64/boot/dts/qcom/apq8009-dragon.dts

+9 −0
Original line number Diff line number Diff line
@@ -66,6 +66,11 @@ 
	mdss_mdp: qcom,mdss_mdp@1a00000 {

		status = "disabled";

	};



	bluetooth: bt_qca9379 {

		compatible = "qca,qca9379";

		qca,bt-reset-gpio = <&msm_gpio 47 0>; /* BT_EN */

	};

};



&sdhc_2 {
@@ -133,3 +138,7 @@ 
&pm8916_bms {

	status = "ok";

};



&blsp1_uart2_hs {

	status = "ok";

};

arch/arm64/boot/dts/qcom/apq8009-robot-som-refboard.dts

+9 −0
Original line number Diff line number Diff line
@@ -66,6 +66,11 @@ 
	mdss_mdp: qcom,mdss_mdp@1a00000 {

		status = "disabled";

	};



	bluetooth: bt_qca9379 {

		compatible = "qca,qca9379";

		qca,bt-reset-gpio = <&msm_gpio 47 0>; /* BT_EN */

	};

};



&sdhc_2 {
@@ -100,3 +105,7 @@ 
&pm8916_bms {

	status = "ok";

};



&blsp1_uart2_hs {

	status = "ok";

};