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

Commit ca8caf1a 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 WSA for sdm660 internal codec"

parents 5a96c0ea 2a9d6a80

arch/arm/boot/dts/qcom/msm-audio.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -790,7 +790,6 @@ 
		status = "disabled";

		compatible = "qcom,sdm660-asoc-snd";

		qcom,model = "sdm660-snd-card";

		qcom,wsa-disable;

		qcom,wcn-btfm;

		qcom,mi2s-audio-intf;

		qcom,auxpcm-audio-intf;
@@ -804,7 +803,6 @@ 
		qcom,cdc-pdm-gpios = <&cdc_pdm_gpios>;

		qcom,cdc-comp-gpios = <&cdc_comp_gpios>;

		qcom,cdc-dmic-gpios = <&cdc_dmic_gpios>;

		qcom,cdc-sdw-gpios = <&cdc_sdw_gpios>;

		qcom,audio-routing =

			"RX_BIAS", "INT_MCLK0",

			"SPK_RX_BIAS", "INT_MCLK0",

arch/arm/boot/dts/qcom/sdm660-audio.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ 
		reg = <0x152c1000 0x0>;

		interrupts = <0 161 0>;

		interrupt-names = "swr_master_irq";

		qcom,cdc-sdw-gpios = <&cdc_sdw_gpios>;



		swr_master {

			compatible = "qcom,swr-wcd";

arch/arm/boot/dts/qcom/sdm660-pinctrl.dtsi

+7 −7
Original line number Diff line number Diff line
@@ -754,7 +754,7 @@ 
				config {

					pins = "gpio24";

					drive-strength = <2>;

					bias-pull-down;

					bias-bus-hold;

				};

			};
@@ -766,8 +766,8 @@ 


				config {

					pins = "gpio24";

					drive-strength = <16>;

					bias-disable;

					drive-strength = <2>;

					bias-bus-hold;

				};

			};

		};
@@ -781,8 +781,8 @@ 


				config {

					pins = "gpio25";

					drive-strength = <2>;

					bias-pull-down;

					drive-strength = <4>;

					bias-bus-hold;

				};

			};
@@ -794,8 +794,8 @@ 


				config {

					pins = "gpio25";

					drive-strength = <16>;

					bias-disable;

					drive-strength = <4>;

					bias-bus-hold;

				};

			};

		};