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

Commit 4b264260 authored by Karthikeyan Mani's avatar Karthikeyan Mani
Browse files

ARM: dts: msm: fix soundcard enumeration for kona 



Add all AMIC nodes, update aliases and lpi nodes.

Change-Id: I216778ca55a0a350a23d68ee69fed1168ed18030
Signed-off-by: default avatarKarthikeyan Mani <kmani@codeaurora.org>
parent 9a53233a

arch/arm64/boot/dts/qcom/kona-audio-overlay.dtsi

+22 −2
Original line number Diff line number Diff line
@@ -181,8 +181,16 @@ 
	qcom,model = "kona-mtp-snd-card";

	qcom,msm-mi2s-master = <1>, <1>, <1>;

	qcom,audio-routing =

		"AMIC1", "MIC BIAS1",

		"MIC BIAS1", "Analog Mic1",

		"AMIC2", "MIC BIAS2",

		"MIC BIAS2", "Analog Mic2",

		"AMIC3", "MIC BIAS3",

		"MIC BIAS3", "Analog Mic3",

		"AMIC4", "MIC BIAS3",

		"MIC BIAS3", "Analog Mic4",

		"AMIC5", "MIC BIAS4",

		"MIC BIAS4", "Analog Mic5",

		"TX DMIC0", "MIC BIAS3",

		"MIC BIAS3", "Digital Mic0",

		"TX DMIC1", "MIC BIAS3",
@@ -193,11 +201,15 @@ 
		"MIC BIAS1", "Digital Mic3",

		"TX DMIC4", "MIC BIAS4",

		"MIC BIAS4", "Digital Mic4",

		"TX DMIC5", "MIC BIAS4",

		"MIC BIAS4", "Digital Mic5",

		"IN1_HPHL", "HPHL_OUT",

		"IN2_HPHR", "HPHR_OUT",

		"IN3_AUX", "AUX_OUT",

		"TX SWR_ADC0", "ADC1_OUTPUT",

		"TX SWR_ADC2", "ADC2_OUTPUT",

		"TX SWR_ADC3", "ADC3_OUTPUT",

		"TX SWR_ADC4", "ADC4_OUTPUT",

		"TX SWR_DMIC0", "DMIC1_OUTPUT",

		"TX SWR_DMIC1", "DMIC2_OUTPUT",

		"TX SWR_DMIC2", "DMIC3_OUTPUT",
@@ -238,6 +250,7 @@ 
		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&cdc_dmic01_clk_active &cdc_dmic01_data_active>;

		pinctrl-1 = <&cdc_dmic01_clk_sleep &cdc_dmic01_data_sleep>;

		qcom,lpi-gpios;

	};



	cdc_dmic23_gpios: cdc_dmic23_pinctrl {
@@ -245,6 +258,7 @@ 
		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&cdc_dmic23_clk_active &cdc_dmic23_data_active>;

		pinctrl-1 = <&cdc_dmic23_clk_sleep &cdc_dmic23_data_sleep>;

		qcom,lpi-gpios;

	};



	cdc_dmic45_gpios: cdc_dmic45_pinctrl {
@@ -252,6 +266,7 @@ 
		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&cdc_dmic45_clk_active &cdc_dmic45_data_active>;

		pinctrl-1 = <&cdc_dmic45_clk_sleep &cdc_dmic45_data_sleep>;

		qcom,lpi-gpios;

	};



	wsa_swr_gpios: wsa_swr_clk_data_pinctrl {
@@ -259,13 +274,17 @@ 
		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&wsa_swr_clk_active &wsa_swr_data_active>;

		pinctrl-1 = <&wsa_swr_clk_sleep &wsa_swr_data_sleep>;

		qcom,lpi-gpios;

	};



	rx_swr_gpios: rx_swr_clk_data_pinctrl {

		compatible = "qcom,msm-cdc-pinctrl";

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&rx_swr_clk_active &rx_swr_data_active>;

		pinctrl-1 = <&rx_swr_clk_sleep &rx_swr_data_sleep>;

		pinctrl-0 = <&rx_swr_clk_active &rx_swr_data_active

				&rx_swr_data1_active>;

		pinctrl-1 = <&rx_swr_clk_sleep &rx_swr_data_sleep

				&rx_swr_data1_sleep>;

		qcom,lpi-gpios;

	};



	tx_swr_gpios: tx_swr_clk_data_pinctrl {
@@ -275,6 +294,7 @@ 
			    &tx_swr_data2_active>;

		pinctrl-1 = <&tx_swr_clk_sleep &tx_swr_data1_sleep

			    &tx_swr_data2_sleep>;

		qcom,lpi-gpios;

	};



	wsa_spkr_en1: wsa_spkr_en1_pinctrl {

arch/arm64/boot/dts/qcom/kona-audio.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ 
				<&incall_record_tx>, <&incall_music_rx>,

				<&incall_music_2_rx>,

				<&usb_audio_rx>, <&usb_audio_tx>,

				<&sb_7_rx>, <&sb_7_tx>,

				<&dai_pri_tdm_rx_0>, <&dai_pri_tdm_tx_0>,

				<&dai_sec_tdm_rx_0>, <&dai_sec_tdm_tx_0>,

				<&dai_tert_tdm_rx_0>, <&dai_tert_tdm_tx_0>,
@@ -108,10 +109,9 @@ 
				"msm-dai-q6-dev.225", "msm-dai-q6-dev.241",

				"msm-dai-q6-dev.240", "msm-dai-q6-dev.32771",

				"msm-dai-q6-dev.32772", "msm-dai-q6-dev.32773",

				"msm-dai-q6-dev.32770", "msm-dai-q6-dev.16398",

				"msm-dai-q6-dev.16399", "msm-dai-q6-dev.16401",

				"msm-dai-q6-dev.16400",

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

				"msm-dai-q6-dev.28672", "msm-dai-q6-dev.28673",

				"msm-dai-q6-dev.16398", "msm-dai-q6-dev.16399",

				"msm-dai-q6-tdm.36864", "msm-dai-q6-tdm.36865",

				"msm-dai-q6-tdm.36880", "msm-dai-q6-tdm.36881",

				"msm-dai-q6-tdm.36896", "msm-dai-q6-tdm.36897",

arch/arm64/boot/dts/qcom/kona-cdp.dtsi

+12 −12
Original line number Diff line number Diff line
@@ -296,18 +296,18 @@ 
		"MIC BIAS3", "Analog Mic4",

		"AMIC5", "MIC BIAS4",

		"MIC BIAS4", "Analog Mic5",

		"TX DMIC0", "MIC BIAS1",

		"MIC BIAS1", "Digital Mic0",

		"TX DMIC1", "MIC BIAS1",

		"MIC BIAS1", "Digital Mic1",

		"TX DMIC2", "MIC BIAS3",

		"MIC BIAS3", "Digital Mic2",

		"TX DMIC3", "MIC BIAS3",

		"MIC BIAS3", "Digital Mic3",

		"TX DMIC4", "MIC BIAS3",

		"MIC BIAS3", "Digital Mic4",

		"TX DMIC5", "MIC BIAS3",

		"MIC BIAS3", "Digital Mic5",

		"TX DMIC0", "MIC BIAS3",

		"MIC BIAS3", "Digital Mic0",

		"TX DMIC1", "MIC BIAS3",

		"MIC BIAS3", "Digital Mic1",

		"TX DMIC2", "MIC BIAS1",

		"MIC BIAS1", "Digital Mic2",

		"TX DMIC3", "MIC BIAS1",

		"MIC BIAS1", "Digital Mic3",

		"TX DMIC4", "MIC BIAS4",

		"MIC BIAS4", "Digital Mic4",

		"TX DMIC5", "MIC BIAS4",

		"MIC BIAS4", "Digital Mic5",

		"IN1_HPHL", "HPHL_OUT",

		"IN2_HPHR", "HPHR_OUT",

		"IN3_AUX", "AUX_OUT",

arch/arm64/boot/dts/qcom/kona-lpi.dtsi

+374 −0
Original line number Diff line number Diff line
@@ -1277,5 +1277,379 @@ 
				};

			};

		};



		wsa_swr_clk_pin {

			wsa_swr_clk_sleep: wsa_swr_clk_sleep {

				mux {

					pins = "gpio10";

					function = "func2";

				};



				config {

					pins = "gpio10";

					drive-strength = <2>;

					bias-pull-down;

				};

			};



			wsa_swr_clk_active: wsa_swr_clk_active {

				mux {

					pins = "gpio10";

					function = "func2";

				};



				config {

					pins = "gpio10";

					drive-strength = <2>;

					bias-no-pull;

				};

			};

		};



		wsa_swr_data_pin {

			wsa_swr_data_sleep: wsa_swr_data_sleep {

				mux {

					pins = "gpio11";

					function = "func2";

				};



				config {

					pins = "gpio11";

					drive-strength = <4>;

					bias-pull-down;

				};

			};



			wsa_swr_data_active: wsa_swr_data_active {

				mux {

					pins = "gpio11";

					function = "func2";

				};



				config {

					pins = "gpio11";

					drive-strength = <4>;

					bias-no-pull;

				};

			};

		};



		tx_swr_clk_sleep: tx_swr_clk_sleep {

			mux {

				pins = "gpio0";

				function = "func1";

			};



			config {

				pins = "gpio0";

				drive-strength = <2>;

				bias-pull-down;

			};

		};



		tx_swr_clk_active: tx_swr_clk_active {

			mux {

				pins = "gpio0";

				function = "func1";

			};



			config {

				pins = "gpio0";

				drive-strength = <8>;

				bias-no-pull;

			};

		};



		tx_swr_data1_sleep: tx_swr_data1_sleep {

			mux {

				pins = "gpio1";

				function = "func1";

			};



			config {

				pins = "gpio1";

				drive-strength = <2>;

				bias-pull-down;

			};

		};



		tx_swr_data1_active: tx_swr_data1_active {

			mux {

				pins = "gpio1";

				function = "func1";

			};



			config {

				pins = "gpio1";

				drive-strength = <8>;

				bias-no-pull;

			};

		};



		tx_swr_data2_sleep: tx_swr_data2_sleep {

			mux {

				pins = "gpio2";

				function = "func1";

			};



			config {

				pins = "gpio2";

				drive-strength = <2>;

				bias-pull-down;

			};

		};



		tx_swr_data2_active: tx_swr_data2_active {

			mux {

				pins = "gpio2";

				function = "func1";

			};



			config {

				pins = "gpio2";

				drive-strength = <8>;

				bias-no-pull;

			};

		};



		rx_swr_clk_sleep: rx_swr_clk_sleep {

			mux {

				pins = "gpio3";

				function = "func1";

			};



			config {

				pins = "gpio3";

				drive-strength = <2>;

				bias-pull-down;

			};

		};



		rx_swr_clk_active: rx_swr_clk_active {

			mux {

				pins = "gpio3";

				function = "func1";

			};



			config {

				pins = "gpio3";

				drive-strength = <8>;

				bias-no-pull;

			};

		};



		rx_swr_data_sleep: rx_swr_data_sleep {

			mux {

				pins = "gpio4";

				function = "func1";

			};



			config {

				pins = "gpio4";

				drive-strength = <2>;

				bias-pull-down;

			};

		};



		rx_swr_data_active: rx_swr_data_active {

			mux {

				pins = "gpio4";

				function = "func1";

			};



			config {

				pins = "gpio4";

				drive-strength = <8>;

				bias-no-pull;

			};

		};



		rx_swr_data1_sleep: rx_swr_data1_sleep {

			mux {

				pins = "gpio5";

				function = "func2";

			};



			config {

				pins = "gpio5";

				drive-strength = <2>;

				bias-pull-down;

			};

		};



		rx_swr_data1_active: rx_swr_data1_active {

			mux {

				pins = "gpio5";

				function = "func2";

			};



			config {

				pins = "gpio5";

				drive-strength = <8>;

				bias-no-pull;

			};

		};



		cdc_dmic01_clk_active: dmic01_clk_active {

			mux {

				pins = "gpio6";

				function = "func1";

			};



			config {

				pins = "gpio6";

				drive-strength = <8>;

				output-high;

			};

		};



		cdc_dmic01_clk_sleep: dmic01_clk_sleep {

			mux {

				pins = "gpio6";

				function = "func1";

			};



			config {

				pins = "gpio6";

				drive-strength = <2>;

				bias-disable;

				output-low;

			};

		};



		cdc_dmic01_data_active: dmic01_data_active {

			mux {

				pins = "gpio7";

				function = "func1";

			};



			config {

				pins = "gpio7";

				drive-strength = <8>;

				input-enable;

			};

		};



		cdc_dmic01_data_sleep: dmic01_data_sleep {

			mux {

				pins = "gpio7";

				function = "func1";

			};



			config {

				pins = "gpio7";

				drive-strength = <2>;

				pull-down;

				input-enable;

			};

		};



		cdc_dmic23_clk_active: dmic23_clk_active {

			mux {

				pins = "gpio8";

				function = "func1";

			};



			config {

				pins = "gpio8";

				drive-strength = <8>;

				output-high;

			};

		};



		cdc_dmic23_clk_sleep: dmic23_clk_sleep {

			mux {

				pins = "gpio8";

				function = "func1";

			};



			config {

				pins = "gpio8";

				drive-strength = <2>;

				bias-disable;

				output-low;

			};

		};



		cdc_dmic23_data_active: dmic23_data_active {

			mux {

				pins = "gpio9";

				function = "func1";

			};



			config {

				pins = "gpio9";

				drive-strength = <8>;

				input-enable;

			};

		};



		cdc_dmic23_data_sleep: dmic23_data_sleep {

			mux {

				pins = "gpio9";

				function = "func1";

			};



			config {

				pins = "gpio9";

				drive-strength = <2>;

				pull-down;

				input-enable;

			};

		};



		cdc_dmic45_clk_active: dmic45_clk_active {

			mux {

				pins = "gpio12";

				function = "func1";

			};



			config {

				pins = "gpio12";

				drive-strength = <8>;

				output-high;

			};

		};



		cdc_dmic45_clk_sleep: dmic45_clk_sleep {

			mux {

				pins = "gpio12";

				function = "func1";

			};



			config {

				pins = "gpio12";

				drive-strength = <2>;

				bias-disable;

				output-low;

			};

		};



		cdc_dmic45_data_active: dmic45_data_active {

			mux {

				pins = "gpio13";

				function = "func1";

			};



			config {

				pins = "gpio13";

				drive-strength = <8>;

				input-enable;

			};

		};



		cdc_dmic45_data_sleep: dmic45_data_sleep {

			mux {

				pins = "gpio13";

				function = "func1";

			};



			config {

				pins = "gpio13";

				drive-strength = <2>;

				pull-down;

				input-enable;

			};

		};

	};

};

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

+0 −348
Original line number Diff line number Diff line
@@ -772,62 +772,6 @@ 
			};

		};



		wsa_swr_clk_pin {

			wsa_swr_clk_sleep: wsa_swr_clk_sleep {

				mux {

					pins = "gpio156";

					function = "WSA_CLK";

				};



				config {

					pins = "gpio156";

					drive-strength = <2>;

					bias-bus-hold;

				};

			};



			wsa_swr_clk_active: wsa_swr_clk_active {

				mux {

					pins = "gpio156";

					function = "WSA_CLK";

				};



				config {

					pins = "gpio156";

					drive-strength = <2>;

					bias-bus-hold;

				};

			};

		};



		wsa_swr_data_pin {

			wsa_swr_data_sleep: wsa_swr_data_sleep {

				mux {

					pins = "gpio157";

					function = "WSA_DATA";

				};



				config {

					pins = "gpio157";

					drive-strength = <4>;

					bias-bus-hold;

				};

			};



			wsa_swr_data_active: wsa_swr_data_active {

				mux {

					pins = "gpio157";

					function = "WSA_DATA";

				};



				config {

					pins = "gpio157";

					drive-strength = <4>;

					bias-bus-hold;

				};

			};

		};



		pri_aux_pcm_clk {

			pri_aux_pcm_clk_sleep: pri_aux_pcm_clk_sleep {

				mux {
@@ -2024,298 +1968,6 @@ 
			};

		};



		cdc_dmic01_clk_active: dmic01_clk_active {

			mux {

				pins = "gpio152";

				function = "func1";

			};



			config {

				pins = "gpio152";

				drive-strength = <8>;

				output-high;

			};

		};



		cdc_dmic01_clk_sleep: dmic01_clk_sleep {

			mux {

				pins = "gpio152";

				function = "func1";

			};



			config {

				pins = "gpio152";

				drive-strength = <2>;

				bias-disable;

				output-low;

			};

		};



		cdc_dmic01_data_active: dmic01_data_active {

			mux {

				pins = "gpio153";

				function = "func1";

			};



			config {

				pins = "gpio153";

				drive-strength = <8>;

				input-enable;

			};

		};



		cdc_dmic01_data_sleep: dmic01_data_sleep {

			mux {

				pins = "gpio153";

				function = "func1";

			};



			config {

				pins = "gpio153";

				drive-strength = <2>;

				pull-down;

				input-enable;

			};

		};



		cdc_dmic23_clk_active: dmic23_clk_active {

			mux {

				pins = "gpio154";

				function = "func1";

			};



			config {

				pins = "gpio154";

				drive-strength = <8>;

				output-high;

			};

		};



		cdc_dmic23_clk_sleep: dmic23_clk_sleep {

			mux {

				pins = "gpio154";

				function = "func1";

			};



			config {

				pins = "gpio154";

				drive-strength = <2>;

				bias-disable;

				output-low;

			};

		};



		cdc_dmic23_data_active: dmic23_data_active {

			mux {

				pins = "gpio155";

				function = "func1";

			};



			config {

				pins = "gpio155";

				drive-strength = <8>;

				input-enable;

			};

		};



		cdc_dmic23_data_sleep: dmic23_data_sleep {

			mux {

				pins = "gpio155";

				function = "func1";

			};



			config {

				pins = "gpio155";

				drive-strength = <2>;

				pull-down;

				input-enable;

			};

		};



		cdc_dmic45_clk_active: dmic45_clk_active {

			mux {

				pins = "gpio158";

				function = "func1";

			};



			config {

				pins = "gpio158";

				drive-strength = <8>;

				output-high;

			};

		};



		cdc_dmic45_clk_sleep: dmic45_clk_sleep {

			mux {

				pins = "gpio158";

				function = "func1";

			};



			config {

				pins = "gpio158";

				drive-strength = <2>;

				bias-disable;

				output-low;

			};

		};



		cdc_dmic45_data_active: dmic45_data_active {

			mux {

				pins = "gpio159";

				function = "func1";

			};



			config {

				pins = "gpio159";

				drive-strength = <8>;

				input-enable;

			};

		};



		cdc_dmic45_data_sleep: dmic45_data_sleep {

			mux {

				pins = "gpio159";

				function = "func1";

			};



			config {

				pins = "gpio159";

				drive-strength = <2>;

				pull-down;

				input-enable;

			};

		};



		tx_swr_clk_sleep: tx_swr_clk_sleep {

			mux {

				pins = "gpio146";

				function = "func2";

			};



			config {

				pins = "gpio146";

				drive-strength = <2>;

				bias-bus-hold;

			};

		};



		tx_swr_clk_active: tx_swr_clk_active {

			mux {

				pins = "gpio146";

				function = "func2";

			};



			config {

				pins = "gpio146";

				drive-strength = <8>;

				bias-bus-hold;

			};

		};



		tx_swr_data1_sleep: tx_swr_data1_sleep {

			mux {

				pins = "gpio147";

				function = "func3";

			};



			config {

				pins = "gpio147";

				drive-strength = <2>;

				bias-bus-hold;

			};

		};



		tx_swr_data1_active: tx_swr_data1_active {

			mux {

				pins = "gpio147";

				function = "func3";

			};



			config {

				pins = "gpio147";

				drive-strength = <8>;

				bias-bus-hold;

			};

		};



		tx_swr_data2_sleep: tx_swr_data2_sleep {

			mux {

				pins = "gpio148";

				function = "func2";

			};



			config {

				pins = "gpio148";

				drive-strength = <2>;

				bias-bus-hold;

			};

		};



		tx_swr_data2_active: tx_swr_data2_active {

			mux {

				pins = "gpio148";

				function = "func2";

			};



			config {

				pins = "gpio148";

				drive-strength = <8>;

				bias-bus-hold;

			};

		};



		rx_swr_clk_sleep: rx_swr_clk_sleep {

			mux {

				pins = "gpio149";

				function = "func2";

			};



			config {

				pins = "gpio149";

				drive-strength = <2>;

				bias-bus-hold;

			};

		};



		rx_swr_clk_active: rx_swr_clk_active {

			mux {

				pins = "gpio149";

				function = "func2";

			};



			config {

				pins = "gpio149";

				drive-strength = <8>;

				bias-bus-hold;

			};

		};



		rx_swr_data_sleep: rx_swr_data_sleep {

			mux {

				pins = "gpio150", "gpio151";

				function = "func2";

			};



			config {

				pins = "gpio150", "gpio151";

				drive-strength = <2>;

				bias-bus-hold;

			};

		};



		rx_swr_data_active: rx_swr_data_active {

			mux {

				pins = "gpio150", "gpio151";

				function = "func2";

			};



			config {

				pins = "gpio150", "gpio151";

				drive-strength = <8>;

				bias-bus-hold;

			};

		};



		cam_sensor_mclk0_active: cam_sensor_mclk0_active {

			/* MCLK0 */

			mux {