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

Commit d24d5867 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: Add aux codec changes on 8996 platforms"

parents 8d3fdac8 803be282

arch/arm/boot/dts/qcom/msm8996-cdp.dtsi

+21 −0
Original line number Original line Diff line number Diff line
@@ -462,6 +462,26 @@ 
		qcom,cdc-micbias3-ext-cap;

		qcom,cdc-micbias3-ext-cap;

		qcom,cdc-micbias4-ext-cap;

		qcom,cdc-micbias4-ext-cap;

	};

	};



	tasha_codec {

		swr_master {

			compatible = "qcom,swr-wcd";

			#address-cells = <2>;

			#size-cells = <0>;



			wsa881x_1: wsa881x@20170212 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x20170212>;

				qcom,spkr-sd-n-gpio = <&pmi8994_gpios 3 0>;

			};



			wsa881x_2: wsa881x@20170211 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x20170211>;

				qcom,spkr-sd-n-gpio = <&pmi8994_gpios 2 0>;

			};

		};

	};

};

};





&pm8994_gpios {

&pm8994_gpios {
@@ -629,6 +649,7 @@ 
		asoc-codec = <&stub_codec>, <&hdmi_audio>;

		asoc-codec = <&stub_codec>, <&hdmi_audio>;

		asoc-codec-names = "msm-stub-codec.1", "msm-hdmi-audio-codec-rx";

		asoc-codec-names = "msm-stub-codec.1", "msm-hdmi-audio-codec-rx";

		qcom,us-euro-gpios = <&pm8994_mpps 2 0>;

		qcom,us-euro-gpios = <&pm8994_mpps 2 0>;

		qcom,aux-codec = <&wsa881x_1>, <&wsa881x_2>;

	};

	};

};

};

arch/arm/boot/dts/qcom/msm8996-fluid.dtsi

+18 −1
Original line number Original line Diff line number Diff line
@@ -440,11 +440,12 @@ 
	};

	};





	sound-9335 {

	sound-9335 {

		qcom,model = "msm8996-tasha-mtp-snd-card";

		qcom,model = "msm8996-tasha-fluid-snd-card";

		qcom,hdmi-audio-rx;

		qcom,hdmi-audio-rx;

		asoc-codec = <&stub_codec>, <&hdmi_audio>;

		asoc-codec = <&stub_codec>, <&hdmi_audio>;

		asoc-codec-names = "msm-stub-codec.1",

		asoc-codec-names = "msm-stub-codec.1",

				"msm-hdmi-audio-codec-rx";

				"msm-hdmi-audio-codec-rx";

		qcom,aux-codec = <&wsa881x_1>;

	};

	};





};

};
@@ -613,3 +614,19 @@ 
		status = "okay";

		status = "okay";

	};

	};

};

};



&slim_msm {

	tasha_codec {

		swr_master {

			compatible = "qcom,swr-wcd";

			#address-cells = <2>;

			#size-cells = <0>;



			wsa881x_1: wsa881x@20170211 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x20170211>;

				qcom,spkr-sd-n-gpio = <&pmi8994_gpios 2 0>;

			};

		};

	};

};

arch/arm/boot/dts/qcom/msm8996-liquid.dtsi

+21 −0
Original line number Original line Diff line number Diff line
@@ -482,6 +482,7 @@ 
		qcom,hdmi-audio-rx;

		qcom,hdmi-audio-rx;

		asoc-codec = <&stub_codec>, <&hdmi_audio>;

		asoc-codec = <&stub_codec>, <&hdmi_audio>;

		asoc-codec-names = "msm-stub-codec.1", "msm-hdmi-audio-codec-rx";

		asoc-codec-names = "msm-stub-codec.1", "msm-hdmi-audio-codec-rx";

		qcom,aux-codec = <&wsa881x_1>, <&wsa881x_2>;

	};

	};

};

};
@@ -655,4 +656,24 @@ 
		qcom,cdc-micbias3-ext-cap;

		qcom,cdc-micbias3-ext-cap;

		qcom,cdc-micbias4-ext-cap;

		qcom,cdc-micbias4-ext-cap;

	};

	};



	tasha_codec {

		swr_master {

			compatible = "qcom,swr-wcd";

			#address-cells = <2>;

			#size-cells = <0>;



			wsa881x_1: wsa881x@21170214 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x21170214>;

				qcom,spkr-sd-n-gpio = <&pmi8994_gpios 3 0>;

			};



			wsa881x_2: wsa881x@21170213 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x21170213>;

				qcom,spkr-sd-n-gpio = <&pmi8994_gpios 2 0>;

			};

		};

	};

};
 
};

arch/arm/boot/dts/qcom/msm8996-mtp.dtsi

+21 −0
Original line number Original line Diff line number Diff line
@@ -679,6 +679,7 @@ 
		qcom,hph-en1-gpio = <&pmi8994_gpios 10 0>;

		qcom,hph-en1-gpio = <&pmi8994_gpios 10 0>;

		qcom,hph-en0-gpio = <&pm8994_gpios 13 0>;

		qcom,hph-en0-gpio = <&pm8994_gpios 13 0>;

		qcom,us-euro-gpios = <&pm8994_mpps 2 0>;

		qcom,us-euro-gpios = <&pm8994_mpps 2 0>;

		qcom,aux-codec = <&wsa881x_1>, <&wsa881x_2>;

	};

	};

};

};
@@ -825,4 +826,24 @@ 
		qcom,cdc-micbias3-ext-cap;

		qcom,cdc-micbias3-ext-cap;

		qcom,cdc-micbias4-ext-cap;

		qcom,cdc-micbias4-ext-cap;

	};

	};



	tasha_codec {

		swr_master {

			compatible = "qcom,swr-wcd";

			#address-cells = <2>;

			#size-cells = <0>;



			wsa881x_1: wsa881x@20170212 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x20170212>;

				qcom,spkr-sd-n-gpio = <&pmi8994_gpios 3 0>;

			};



			wsa881x_2: wsa881x@20170211 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x20170211>;

				qcom,spkr-sd-n-gpio = <&pmi8994_gpios 2 0>;

			};

		};

	};

};
 
};

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

+0 −19
Original line number Original line Diff line number Diff line
@@ -1077,24 +1077,6 @@ 
			qcom,cdc-slim-ifd-elemental-addr = [00 00 A0 01 17 02];

			qcom,cdc-slim-ifd-elemental-addr = [00 00 A0 01 17 02];

			qcom,cdc-dmic-sample-rate = <4800000>;

			qcom,cdc-dmic-sample-rate = <4800000>;

			qcom,cdc-mad-dmic-rate = <600000>;

			qcom,cdc-mad-dmic-rate = <600000>;



			swr_master {

				compatible = "qcom,swr-wcd";

				#address-cells = <2>;

				#size-cells = <0>;



				wsa881x_1: wsa881x@20170212 {

					compatible = "qcom,wsa881x";

					reg = <0x00 0x20170212>;

					qcom,spkr-sd-n-gpio = <&pmi8994_gpios 3 0>;

				};



				wsa881x_2: wsa881x@20170211 {

					compatible = "qcom,wsa881x";

					reg = <0x00 0x20170211>;

					qcom,spkr-sd-n-gpio = <&pmi8994_gpios 2 0>;

				};

			};

		};

		};

	};

	};
@@ -3032,7 +3014,6 @@ 
				"msm-dai-q6-dev.32770", "msm-dai-q6-dev.16394";

				"msm-dai-q6-dev.32770", "msm-dai-q6-dev.16394";

		asoc-codec = <&stub_codec>;

		asoc-codec = <&stub_codec>;

		asoc-codec-names = "msm-stub-codec.1";

		asoc-codec-names = "msm-stub-codec.1";

		qcom,aux-codec = <&wsa881x_1>, <&wsa881x_2>;

	};

	};





	qcom,msm-adsp-loader {

	qcom,msm-adsp-loader {