Merge "ARM: dts: msm: Add backend to support split A2DP for 8909" (c579792d) · Commits · e / devices / android_kernel_xiaomi_markw

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

+10 −7

Original line number	Diff line number	Diff line
		@@ -225,6 +225,7 @@
		qcom,msm-mbhc-gnd-swh = <0>;
		qcom,msm-hs-micbias-type = "internal";
		qcom,msm-micbias1-ext-cap;
		qcom,split-a2dp;
		qcom,audio-routing =
		"RX_BIAS", "MCLK",
		"SPK_RX_BIAS", "MCLK",
		@@ -273,8 +274,9 @@
		<&dai_mi2s0>, <&dai_mi2s1>, <&dai_mi2s2>, <&dai_mi2s3>,
		<&sb_0_rx>, <&sb_0_tx>, <&sb_1_rx>, <&sb_1_tx>,
		<&sb_3_rx>, <&sb_3_tx>, <&sb_4_rx>, <&sb_4_tx>,
		<&bt_sco_rx>, <&bt_sco_tx>, <&int_fm_rx>, <&int_fm_tx>,
		<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>, <&afe_proxy_tx>,
		<&bt_sco_rx>, <&bt_sco_tx>, <&bt_a2dp_rx>,
		<&int_fm_rx>, <&int_fm_tx>,<&afe_pcm_rx>,
		<&afe_pcm_tx>, <&afe_proxy_rx>, <&afe_proxy_tx>,
		<&incall_record_rx>, <&incall_record_tx>, <&incall_music_rx>,
		<&incall_music_2_rx>;
		asoc-cpu-names = "msm-dai-q6-auxpcm.1", "msm-dai-q6-hdmi.8",
		@@ -285,11 +287,12 @@
		"msm-dai-q6-dev.16390", "msm-dai-q6-dev.16391",
		"msm-dai-q6-dev.16392", "msm-dai-q6-dev.16393",
		"msm-dai-q6-dev.12288", "msm-dai-q6-dev.12289",
		"msm-dai-q6-dev.12292", "msm-dai-q6-dev.12293",
		"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.32770";
		"msm-dai-q6-dev.12290", "msm-dai-q6-dev.12292",
		"msm-dai-q6-dev.12293", "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.32770";
		asoc-codec = <&stub_codec>, <&pm8909_conga_dig>;
		asoc-codec-names = "msm-stub-codec.1", "tombak_codec";
		};

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

+10 −8

Original line number	Diff line number	Diff line
		@@ -197,6 +197,7 @@
		qcom,msm-mbhc-gnd-swh = <0>;
		qcom,msm-hs-micbias-type = "internal";
		qcom,msm-micbias1-ext-cap;
		qcom,split-a2dp;
		qcom,msm-afe-clk-ver = <1>;
		qcom,audio-routing =
		"RX_BIAS", "MCLK",
		@@ -244,9 +245,9 @@
		asoc-cpu = <&dai_pri_auxpcm>,
		<&dai_mi2s0>, <&dai_mi2s1>, <&dai_mi2s2>,
		<&dai_mi2s3>, <&dai_mi2s5>, <&dai_mi2s6>,
		<&bt_sco_rx>, <&bt_sco_tx>, <&int_fm_rx>,
		<&int_fm_tx>, <&afe_pcm_rx>, <&afe_pcm_tx>,
		<&afe_proxy_rx>, <&afe_proxy_tx>,
		<&bt_sco_rx>, <&bt_sco_tx>, <&bt_a2dp_rx>,
		<&int_fm_rx>, <&int_fm_tx>, <&afe_pcm_rx>,
		<&afe_pcm_tx>, <&afe_proxy_rx>, <&afe_proxy_tx>,
		<&incall_record_rx>, <&incall_record_tx>,
		<&incall_music_rx>, <&incall_music_2_rx>;
		asoc-cpu-names = "msm-dai-q6-auxpcm.1",
		@@ -254,11 +255,12 @@
		"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
		"msm-dai-q6-mi2s.5", "msm-dai-q6-mi2s.6",
		"msm-dai-q6-dev.12288", "msm-dai-q6-dev.12289",
		"msm-dai-q6-dev.12292", "msm-dai-q6-dev.12293",
		"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.32770";
		"msm-dai-q6-dev.12290", "msm-dai-q6-dev.12292",
		"msm-dai-q6-dev.12293", "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.32770";
		asoc-codec = <&stub_codec>, <&pm8909_conga_dig>;
		asoc-codec-names = "msm-stub-codec.1", "cajon_codec";
		};

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -1361,6 +1361,11 @@
		qcom,msm-dai-q6-dev-id = <12289>;
		};

		bt_a2dp_rx: qcom,msm-dai-q6-bt-a2dp-rx {
		compatible = "qcom,msm-dai-q6-dev";
		qcom,msm-dai-q6-dev-id = <12290>;
		};

		int_fm_rx: qcom,msm-dai-q6-int-fm-rx {
		compatible = "qcom,msm-dai-q6-dev";
		qcom,msm-dai-q6-dev-id = <12292>;