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

Commit 6cd7ffb1 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Enable bluetooth for sdxprairie variants"

parents cb64e87b 0f679d22

Documentation/devicetree/bindings/bluetooth/bluetooth_power.txt

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Required properties: 
	- compatible: Should be set to one of the following:

		qca,ar3002

		qca,qca6174

		qca,qca6390

		qca,wcn3990

	- qca,bt-reset-gpio: GPIO pin to bring BT Controller out of reset

arch/arm64/boot/dts/qcom/sdxprairie-cdp-256.dts

+4 −0
Original line number Diff line number Diff line
@@ -25,3 +25,7 @@ 
&qnand_1 {

	status = "ok";

};



&blsp1_uart2b_hs {

	status = "okay";

};

arch/arm64/boot/dts/qcom/sdxprairie-cdp-256.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -173,3 +173,10 @@ 
		thermal-governor = "user_space";

	};

};



&soc {

	bluetooth: bt_qca6390 {

		compatible = "qca,qca6390";

		qca,bt-reset-gpio = <&pmxprairie_gpios 6 0>;

	};

};

arch/arm64/boot/dts/qcom/sdxprairie-cdp.dts

+4 −0
Original line number Diff line number Diff line
@@ -25,3 +25,7 @@ 
&qnand_1 {

	status = "ok";

};



&blsp1_uart2b_hs {

	status = "okay";

};

arch/arm64/boot/dts/qcom/sdxprairie-cdp.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -174,6 +174,13 @@ 
	};

};



&soc {

	bluetooth: bt_qca6390 {

		compatible = "qca,qca6390";

		qca,bt-reset-gpio = <&pmxprairie_gpios 6 0>;

	};

};



&pm8150b_charger {

	qcom,batteryless-platform;

	io-channels = <&pm8150b_vadc ADC_USB_IN_V_16>,