Merge "arch: arm: Add dt change to enable secondary AUXPCM for mdmcalifornium" (8e81e72f) · Commits · e / devices / android_kernel_xiaomi_markw

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

+111 −0

Original line number	Diff line number	Diff line
		@@ -780,6 +780,117 @@
		};
		};

		pmx_sec_mi2s_dout {
		sec_mi2s_ws_sleep: sec_mi2s_ws_sleep {
		mux {
		pins = "gpio16";
		function = "sec_mi2s_ws_a";
		};

		config {
		pins = "gpio16";
		drive-strength = <2>; /* 2 mA */
		bias-pull-down; /* PULL DOWN */
		};
		};

		sec_mi2s_sck_sleep: sec_mi2s_sck_sleep {
		mux {
		pins = "gpio19";
		function = "sec_mi2s_sck_a";
		};

		config {
		pins = "gpio19";
		drive-strength = <2>; /* 2 mA */
		bias-pull-down; /* PULL DOWN */
		};
		};

		sec_mi2s_dout_sleep: sec_mi2s_dout_sleep {
		mux {
		pins = "gpio18";
		function = "sec_mi2s_data1_a";
		};

		config {
		pins = "gpio18";
		drive-strength = <2>; /* 2 mA */
		bias-pull-down; /* PULL DOWN */
		};
		};

		sec_mi2s_ws_active: sec_mi2s_ws_active {
		mux {
		pins = "gpio16";
		function = "sec_mi2s_ws_a";
		};

		config {
		pins = "gpio16";
		drive-strength = <8>; /* 8 mA */
		bias-disable; /* NO PULL*/
		output-high;
		};
		};

		sec_mi2s_sck_active: sec_mi2s_sck_active {
		mux {
		pins = "gpio19";
		function = "sec_mi2s_sck_a";
		};

		config {
		pins = "gpio19";
		drive-strength = <8>; /* 8 mA */
		bias-disable; /* NO PULL*/
		output-high;
		};
		};

		sec_mi2s_dout_active: sec_mi2s_dout_active {
		mux {
		pins = "gpio18";
		function = "sec_mi2s_data1_a";
		};

		config {
		pins = "gpio18";
		drive-strength = <8>; /* 8 mA */
		bias-disable; /* NO PULL*/
		output-high;
		};
		};
		};

		pmx_sec_mi2s_din {
		sec_mi2s_din_sleep: sec_mi2s_din_sleep {
		mux {
		pins = "gpio17";
		function = "sec_mi2s_data0_a";
		};

		config {
		pins = "gpio17";
		drive-strength = <2>; /* 2 mA */
		bias-pull-down; /* PULL DOWN */
		};
		};

		sec_mi2s_din_active: sec_mi2s_din_active {
		mux {
		pins = "gpio17";
		function = "sec_mi2s_data0_a";
		};

		config {
		pins = "gpio17";
		drive-strength = <8>; /* 8 mA */
		bias-disable; /* NO PULL */
		};
		};
		};

		sdc1_clk_on: sdc1_clk_on {
		config {
		pins = "sdc1_clk";

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

+22 −2

Original line number	Diff line number	Diff line
		@@ -1036,14 +1036,16 @@
		<&tx_capture_tx>, <&tx_playback_rx>,
		<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,
		<&afe_proxy_tx>, <&incall_record_rx>,
		<&incall_record_tx>, <&incall_music_rx>;
		<&incall_record_tx>, <&incall_music_rx>,
		<&dai_sec_auxpcm>;
		asoc-cpu-names = "msm-dai-q6-auxpcm.1", "msm-dai-q6-mi2s.0",
		"msm-dai-stub-dev.4", "msm-dai-stub-dev.5",
		"msm-dai-stub-dev.6", "msm-dai-stub-dev.7",
		"msm-dai-stub-dev.8", "msm-dai-q6-dev.224",
		"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.32772", "msm-dai-q6-dev.32773",
		"msm-dai-q6-auxpcm.2";
		asoc-codec = <&stub_codec>;
		asoc-codec-names = "msm-stub-codec.1";
		qcom,aux-codec = <&stub_codec>;
		@@ -1195,6 +1197,24 @@
		qcom,msm-auxpcm-interface = "primary";
		};

		dai_sec_auxpcm: qcom,msm-sec-auxpcm {
		compatible = "qcom,msm-auxpcm-dev";
		qcom,msm-cpudai-auxpcm-mode = <0>, <0>;
		qcom,msm-cpudai-auxpcm-sync = <1>, <1>;
		qcom,msm-cpudai-auxpcm-frame = <5>, <4>;
		qcom,msm-cpudai-auxpcm-quant = <2>, <2>;
		qcom,msm-cpudai-auxpcm-num-slots = <1>, <1>;
		qcom,msm-cpudai-auxpcm-slot-mapping = <1>, <1>;
		qcom,msm-cpudai-auxpcm-data = <0>, <0>;
		qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;
		qcom,msm-auxpcm-interface = "secondary";
		pinctrl-names = "default", "sleep";
		pinctrl-0 = <&sec_mi2s_ws_active &sec_mi2s_sck_active
		&sec_mi2s_dout_active &sec_mi2s_din_active>;
		pinctrl-1 = <&sec_mi2s_ws_sleep &sec_mi2s_sck_sleep
		&sec_mi2s_dout_sleep &sec_mi2s_din_sleep>;
		};

		qcom,msm-dai-mi2s {
		compatible = "qcom,msm-dai-mi2s";
		mi2s_prim: qcom,msm-dai-q6-mi2s-prim {