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

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

Merge "ARM: dts: msm: add bluetooth chip device node for SA6155p"

parents eeaf0c98 cfbfe7bd

arch/arm64/boot/dts/qcom/sa6155-adp-star.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -120,6 +120,10 @@ 
			qcom,iova-mapping = <0x80000000 0x40000000>;

		};

	};



	bluetooth_ext: bt_qca6174 {

		status = "ok";

	};

};



&ufsphy_mem {

arch/arm64/boot/dts/qcom/sa6155-regulator.dtsi

+18 −0
Original line number Diff line number Diff line
@@ -501,5 +501,23 @@ 
			qcom,init-mode = <RPMH_REGULATOR_MODE_LPM>;

		};

	};



	/* PWR_CTR1_VDD_1P8 supply */

	vreg_conn_1p8: vreg_conn_1p8 {

		compatible = "regulator-fixed";

		regulator-name = "vreg_conn_1p8";

		startup-delay-us = <4000>;

		enable-active-high;

		gpio = <&pm6155_1_gpios 1 0>;

	};



	/* PWR_CTR2_VDD_PA supply */

	vreg_conn_pa: vreg_conn_pa {

		compatible = "regulator-fixed";

		regulator-name = "vreg_conn_pa";

		startup-delay-us = <4000>;

		enable-active-high;

		gpio = <&pm6155_1_gpios 6 0>;

	};

};

arch/arm64/boot/dts/qcom/sa6155p.dtsi

+13 −0
Original line number Diff line number Diff line
@@ -41,6 +41,19 @@ 
	/delete-node/ rpmh-regulator-ldoc16;

	/delete-node/ rpmh-regulator-ldoc17;

	/delete-node/ rpmh-regulator-ldoc18;

	/delete-node/ bt_wcn3990;



	bluetooth_ext: bt_qca6174 {

		compatible = "qca,qca6174";

		/* BT_EN */

		pinctrl-names = "default";

		pinctrl-0 = <&bt_en_active>;

		qca,bt-reset-gpio = <&tlmm 85 0>;

		/* PWR_CTR1_VDD_PA */

		qca,bt-vdd-pa-supply = <&vreg_conn_pa>;

		qca,bt-chip-pwd-supply = <&vreg_conn_1p8>;

		status = "disabled";

	};

};



&pil_modem {

arch/arm64/boot/dts/qcom/sm6150-pinctrl.dtsi

+13 −0
Original line number Diff line number Diff line
@@ -1696,6 +1696,19 @@ 
				};

			};

		};



		bt_en_active: bt_en_active {

			mux {

				pins = "gpio85";

				function = "gpio";

			};



			config {

				pins = "gpio85";

				drive-strength = <2>;

				bias-pull-down;

			};

		};

	};

};