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

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

Merge "ARM: dts: msm: Add bluetooth node of wcnw3990 for sdm6150"

parents e3815b7c dd95001f

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

+3 −3
Original line number Diff line number Diff line
@@ -519,7 +519,7 @@ 
		qcom,supported-modes =

				<RPMH_REGULATOR_MODE_LPM

				RPMH_REGULATOR_MODE_HPM>;

		qcom,mode-threshold-currents = <0 1>;

		qcom,mode-threshold-currents = <0 10000>;

		L1C: pm6150l_l1: regulator-pm6150l-l1 {

			regulator-name = "pm6150l_l1";

			qcom,set = <RPMH_REGULATOR_SET_ALL>;
@@ -538,7 +538,7 @@ 
		qcom,supported-modes =

				<RPMH_REGULATOR_MODE_LPM

				RPMH_REGULATOR_MODE_HPM>;

		qcom,mode-threshold-currents = <0 1>;

		qcom,mode-threshold-currents = <0 10000>;

		L2C: pm6150l_l2: regulator-pm6150l-l2 {

			regulator-name = "pm6150l_l2";

			qcom,set = <RPMH_REGULATOR_SET_ALL>;
@@ -690,7 +690,7 @@ 
		qcom,supported-modes =

				<RPMH_REGULATOR_MODE_LPM

				RPMH_REGULATOR_MODE_HPM>;

		qcom,mode-threshold-currents = <0 1>;

		qcom,mode-threshold-currents = <0 10000>;

		L10C: pm6150l_l10: regulator-pm6150l-l10 {

			regulator-name = "pm6150l_l10";

			qcom,set = <RPMH_REGULATOR_SET_ALL>;

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

+24 −1
Original line number Diff line number Diff line
@@ -1351,6 +1351,21 @@ 
		cell-index = <0>;

	};



	bluetooth: bt_wcn3990 {

		compatible = "qca,wcn3990";

		qca,bt-vdd-core-supply = <&pm6150l_l1>;

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

		qca,bt-vdd-ldo-supply = <&pm6150l_l10>;



		qca,bt-vdd-core-voltage-level = <1800000 1900000>;

		qca,bt-vdd-pa-voltage-level = <1304000 1370000>;

		qca,bt-vdd-ldo-voltage-level = <3312000 3400000>;



		qca,bt-vdd-core-current-level = <1>; /* LPM/PFM */

		qca,bt-vdd-pa-current-level = <1>; /* LPM/PFM */

		qca,bt-vdd-ldo-current-level = <1>; /* LPM/PFM */

	};



	slim_aud: slim@62dc0000 {

		cell-index = <1>;

		compatible = "qcom,slim-ngd";
@@ -1382,13 +1397,21 @@ 
		reg-names = "slimbus_physical", "slimbus_bam_physical";

		interrupts = <0 291 0>, <0 292 0>;

		interrupt-names = "slimbus_irq", "slimbus_bam_irq";

		status = "disabled";

		status = "ok";

		qcom,iommu-s1-bypass;



		iommu_slim_qca_ctrl_cb: qcom,iommu_slim_ctrl_cb {

			compatible = "qcom,iommu-slim-ctrl-cb";

			iommus = <&apps_smmu 0x17f3 0x0>;

		};



		/* Slimbus Slave DT for WCN3990 */

		btfmslim_codec: wcn3990 {

			compatible = "qcom,btfmslim_slave";

			elemental-addr = [00 01 20 02 17 02];

			qcom,btfm-slim-ifd = "btfmslim_slave_ifd";

			qcom,btfm-slim-ifd-elemental-addr = [00 00 20 02 17 02];

		};

	};



	tcsr_mutex_block: syscon@1f40000 {