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

Commit 9981b637 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: specify audio codec configuration for SDXHEDGEHOG"

parents 170b2694 3affaf11

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

+4 −4
Original line number Diff line number Diff line
@@ -668,12 +668,12 @@ 
		i2s_mclk {

			i2s_mclk_sleep: i2s_mclk_sleep {

				mux {

					pins = "gpio71";

					pins = "gpio63";

					function = "i2s_mclk";

				};



				config {

					pins = "gpio71";

					pins = "gpio63";

					drive-strength = <2>;	/* 2 mA */

					bias-pull-down;		/* PULL DOWN */

				};
@@ -681,12 +681,12 @@ 


			i2s_mclk_active: i2s_mclk_active {

				mux {

					pins = "gpio71";

					pins = "gpio63";

					function = "i2s_mclk";

				};



				config {

					pins = "gpio71";

					pins = "gpio63";

					drive-strength = <8>;	/* 8 mA */

					bias-disable;		/* NO PULL*/

					output-high;

arch/arm/boot/dts/qcom/sdxhedgehog.dtsi

+43 −0
Original line number Diff line number Diff line
@@ -45,6 +45,41 @@ 
		gpio = <&tlmm_pinmux 80 0>;

	};



	i2c_3: i2c@78B7000 { /* BLSP1 QUP3 */

		wcd9xxx_codec@d{

			qcom,cdc-reset-gpio = <&tlmm_pinmux 72 0>;

			swr_master {

				compatible = "qcom,swr-wcd";

				#address-cells = <2>;

				#size-cells = <0>;

				wsa881x_211: wsa881x@20170211 {

					compatible = "qcom,wsa881x";

					reg = <0x00 0x20170211>;

					qcom,spkr-sd-n-gpio =

						<&tlmm_pinmux 76 0>;

				};

				wsa881x_212: wsa881x@20170212 {

					compatible = "qcom,wsa881x";

					reg = <0x00 0x20170212>;

					qcom,spkr-sd-n-gpio =

						<&tlmm_pinmux 76 0>;

				};

				wsa881x_213: wsa881x@20170213 {

					compatible = "qcom,wsa881x";

					reg = <0x00 0x20170213>;

					qcom,spkr-sd-n-gpio =

						<&tlmm_pinmux 76 0>;

				};

				wsa881x_214: wsa881x@20170214 {

					compatible = "qcom,wsa881x";

					reg = <0x00 0x20170214>;

					qcom,spkr-sd-n-gpio =

						<&tlmm_pinmux 76 0>;

				};

			};

		};

	};



	ipa_hw: qcom,ipa@07B00000 {

		qcom,ipa-hw-ver = <12>; /* IPA core version = IPAv3.5 */

		/delete-property/qcom,use-rg10-limitation-mitigation;
@@ -75,6 +110,14 @@ 
		qcom,is-antenna-shared;

		status = "disabled";

	};



	wcd9xxx_intc: wcd9xxx-irq {

		compatible = "qcom,wcd9xxx-irq";

		interrupt-controller;

		#interrupt-cells = <1>;

		interrupt-parent = <&tlmm_pinmux>;

		qcom,gpio-connect = <&tlmm_pinmux 73 0>;

	};

};



&clock_gcc {