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

Commit 1fa5094d authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge d0f3aa17 on remote branch 

Change-Id: I73279ccd5ae3e2abc65e36a4b715f65fc164e92c
parents 8a70628d d0f3aa17

bindings/sound/qcom-audio-dev.txt

+82 −31
Original line number Diff line number Diff line
@@ -1444,8 +1444,10 @@ Example: 
				"msm-pcm-routing", "msm-cpe-lsm",

				"msm-compr-dsp", "msm-pcm-dsp-noirq";

		asoc-cpu = <&dai_hdmi>, <&dai_dp>,

				<&dai_mi2s0>, <&dai_mi2s1>,

				<&dai_mi2s2>, <&dai_mi2s3>,

				<&dai_mi2s0_rx>, <&dai_mi2s0_tx>,

				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,

				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,

				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,

				<&dai_pri_auxpcm>, <&dai_sec_auxpcm>,

				<&dai_tert_auxpcm>, <&dai_quat_auxpcm>,

				<&sb_0_rx>, <&sb_0_tx>, <&sb_1_rx>, <&sb_1_tx>,
@@ -1468,6 +1470,8 @@ Example: 
		asoc-cpu-names = "msm-dai-q6-hdmi.8",  "msm-dai-q6-dp.24608",

				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",

				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",

				"msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2",

				"msm-dai-q6-auxpcm.3", "msm-dai-q6-auxpcm.4",

				"msm-dai-q6-dev.16384", "msm-dai-q6-dev.16385",
@@ -1578,9 +1582,12 @@ Example: 
				"msm-pcm-routing", "msm-compr-dsp",

				"msm-pcm-dsp-noirq";

		asoc-cpu = <&dai_dp>,

				<&dai_mi2s0>, <&dai_mi2s1>,

				<&dai_mi2s2>, <&dai_mi2s3>,

				<&dai_mi2s4>, <&dai_pri_auxpcm>,

				<&dai_mi2s0_rx>, <&dai_mi2s0_tx>,

				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,

				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,

				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,

				<&dai_mi2s4_rx>, <&dai_mi2s4_tx>,

				<&dai_pri_auxpcm>,

				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,

				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,

				<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,
@@ -1608,7 +1615,10 @@ Example: 
		asoc-cpu-names = "msm-dai-q6-dp.24608",

				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-auxpcm.1",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",

				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",

				"msm-dai-q6-mi2s.8", "msm-dai-q6-mi2s.9",

				"msm-dai-q6-auxpcm.1",

				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",

				"msm-dai-q6-auxpcm.4", "msm-dai-q6-auxpcm.5",

				"msm-dai-q6-dev.224",
@@ -1714,9 +1724,12 @@ Example: 
				"msm-pcm-dsp-noirq", "msm-pcm-loopback.1",

				"msm-pcm-dtmf";

		asoc-cpu = <&dai_hdmi>, <&dai_dp>,

				<&dai_mi2s0>, <&dai_mi2s1>,

				<&dai_mi2s2>, <&dai_mi2s3>,

				<&dai_mi2s4>, <&dai_pri_auxpcm>,

				<&dai_mi2s0_rx>, <&dai_mi2s0_tx>,

				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,

				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,

				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,

				<&dai_mi2s4_rx>, <&dai_mi2s4_tx>,

				<&dai_pri_auxpcm>,

				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,

				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,

				<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,
@@ -1748,7 +1761,10 @@ Example: 
		asoc-cpu-names = "msm-dai-q6-hdmi.8",  "msm-dai-q6-dp.24608",

				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-auxpcm.1",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",

				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",

				"msm-dai-q6-mi2s.8", "msm-dai-q6-mi2s.9",

				"msm-dai-q6-auxpcm.1",

				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",

				"msm-dai-q6-auxpcm.4", "msm-dai-q6-auxpcm.5",

				"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",
@@ -1857,9 +1873,12 @@ Example: 
				"msm-pcm-afe", "msm-lsm-client",

				"msm-pcm-routing", "msm-compr-dsp",

				"msm-pcm-dsp-noirq";

		asoc-cpu = <&dai_mi2s0>, <&dai_mi2s1>,

				<&dai_mi2s2>, <&dai_mi2s3>,

				<&dai_mi2s4>, <&dai_pri_auxpcm>,

		asoc-cpu = <&dai_mi2s0_rx>, <&dai_mi2s0_tx>,

				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,

				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,

				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,

				<&dai_mi2s4_rx>, <&dai_mi2s4_tx>,

				<&dai_pri_auxpcm>,

				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,

				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,

				<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,
@@ -1885,7 +1904,10 @@ Example: 
				<&tx_cdc_dma_6_tx>, <&tx_cdc_dma_7_tx>;

		asoc-cpu-names = "msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-auxpcm.1",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",

				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",

				"msm-dai-q6-mi2s.8", "msm-dai-q6-mi2s.9",

				"msm-dai-q6-auxpcm.1",

				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",

				"msm-dai-q6-auxpcm.4", "msm-dai-q6-auxpcm.5",

				"msm-dai-q6-dev.224",
@@ -2147,9 +2169,12 @@ Example: 
				"msm-pcm-routing", "msm-compr-dsp",

				"msm-pcm-dsp-noirq";

		asoc-cpu = <&dai_dp>,

				<&dai_mi2s0>, <&dai_mi2s1>,

				<&dai_mi2s2>, <&dai_mi2s3>,

				<&dai_mi2s4>, <&dai_pri_auxpcm>,

				<&dai_mi2s0_rx>, <&dai_mi2s0_rx>,

				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,

				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,

				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,

				<&dai_mi2s4_rx>, <&dai_mi2s4_tx>,

				<&dai_pri_auxpcm>,

				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,

				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,

				<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,
@@ -2176,7 +2201,10 @@ Example: 
		asoc-cpu-names = "msm-dai-q6-dp.24608",

				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-auxpcm.1",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",

				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",

				"msm-dai-q6-mi2s.8", "msm-dai-q6-mi2s.9",

				"msm-dai-q6-auxpcm.1",

				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",

				"msm-dai-q6-auxpcm.4", "msm-dai-q6-auxpcm.5",

				"msm-dai-q6-dev.224",
@@ -2300,9 +2328,12 @@ Example: 
				"msm-pcm-dsp-noirq", "msm-pcm-loopback.1",

				"msm-pcm-dtmf";

		asoc-cpu = <&dai_hdmi>, <&dai_dp>,

				<&dai_mi2s0>, <&dai_mi2s1>,

				<&dai_mi2s2>, <&dai_mi2s3>,

				<&dai_mi2s4>, <&dai_pri_auxpcm>,

				<&dai_mi2s0_rx>, <&dai_mi2s0_rx>,

				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,

				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,

				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,

				<&dai_mi2s4_rx>, <&dai_mi2s4_tx>,

				<&dai_pri_auxpcm>,

				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,

				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,

				<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,
@@ -2334,7 +2365,10 @@ Example: 
		asoc-cpu-names = "msm-dai-q6-hdmi.8",  "msm-dai-q6-dp.24608",

				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-auxpcm.1",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",

				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",

				"msm-dai-q6-mi2s.8", "msm-dai-q6-mi2s.9",

				"msm-dai-q6-auxpcm.1",

				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",

				"msm-dai-q6-auxpcm.4", "msm-dai-q6-auxpcm.5",

				"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",
@@ -2444,9 +2478,13 @@ Example: 
				"msm-pcm-routing", "msm-compr-dsp",

				"msm-pcm-dsp-noirq";

		asoc-cpu = <&dai_dp>, <&dai_dp1>,

				<&dai_mi2s0>, <&dai_mi2s1>,

				<&dai_mi2s2>, <&dai_mi2s3>,

				<&dai_mi2s4>, <&dai_mi2s5>, <&dai_pri_auxpcm>,

				<&dai_mi2s0_rx>, <&dai_mi2s0_tx>,

				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,

				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,

				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,

				<&dai_mi2s4_rx>, <&dai_mi2s4_tx>,

				<&dai_mi2s5_rx>, <&dai_mi2s5_tx>,

				<&dai_pri_auxpcm>,

				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,

				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,

				<&dai_sen_auxpcm>,
@@ -2479,6 +2517,9 @@ Example: 
				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",

				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",

				"msm-dai-q6-mi2s.8", "msm-dai-q6-mi2s.9",

				"msm-dai-q6-mi2s.10", "msm-dai-q6-mi2s.11",

				"msm-dai-q6-auxpcm.1",

				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",

				"msm-dai-q6-auxpcm.4", "msm-dai-q6-auxpcm.5",
@@ -2595,8 +2636,10 @@ Example: 
				"msm-pcm-afe", "msm-lsm-client",

				"msm-pcm-routing", "msm-compr-dsp",

				"msm-pcm-dsp-noirq";

		asoc-cpu = <&dai_mi2s0>, <&dai_mi2s1>,

				<&dai_mi2s2>, <&dai_mi2s3>,

		asoc-cpu = <&dai_mi2s0_rx>, <&dai_mi2s0_tx>,

				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,

				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,

				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,

				<&dai_pri_auxpcm>,

				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,

				<&dai_quat_auxpcm>,
@@ -2623,6 +2666,8 @@ Example: 
				<&rx_cdc_dma_7_rx>,<&afe_loopback_tx>;

		asoc-cpu-names = "msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",

				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",

				"msm-dai-q6-auxpcm.1",

				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",

				"msm-dai-q6-auxpcm.4",
@@ -2802,9 +2847,12 @@ Example: 
				"msm-pcm-dsp-noirq", "msm-pcm-loopback.1",

				"msm-pcm-dtmf";

		asoc-cpu = <&dai_hdmi>, <&dai_dp>,

				<&dai_mi2s0>, <&dai_mi2s1>,

				<&dai_mi2s2>, <&dai_mi2s3>,

				<&dai_mi2s4>, <&dai_pri_auxpcm>,

				<&dai_mi2s0_rx>, <&dai_mi2s0_tx>,

				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,

				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,

				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,

				<&dai_mi2s4_rx>, <&dai_mi2s4_tx>,

				<&dai_pri_auxpcm>,

				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,

				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,

				<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,
@@ -2836,7 +2884,10 @@ Example: 
		asoc-cpu-names = "msm-dai-q6-hdmi.8",  "msm-dai-q6-dp.24608",

				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-auxpcm.1",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",

				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",

				"msm-dai-q6-mi2s.8", "msm-dai-q6-mi2s.9",

				"msm-dai-q6-auxpcm.1",

				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",

				"msm-dai-q6-auxpcm.4", "msm-dai-q6-auxpcm.5",

				"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",

qcom/Makefile

+10 −1
Original line number Diff line number Diff line
@@ -445,7 +445,16 @@ dtb-$(CONFIG_ARCH_SDXLEMUR) += sdxlemur-rumi.dtb \ 
	sdxlemur-v2-mtp-mbb-pcie-ep-ipq.dtb \

	sdxlemur-v2-mtp-mbb-pcie-rc-ep.dtb \

	sdxlemur-v2-rcm-pcie-ep.dtb \

	sdxlemur-v2-rcm-rc.dtb

	sdxlemur-v2-rcm-rc.dtb \

	sdxlemur-v2-atp.dtb \

	sdxlemur-v2-mtp-cpe-pine1x.dtb \

	sdxlemur-v2-mtp-cpe-pine2x.dtb \

	sdxlemur-v2-mtp-mbb-emmc-512mb.dtb \

	sdxlemur-v2-mtp-mbb-m2-ep-usb.dtb \

	sdxlemur-v2-mtp-mbb-m2-ep.dtb \

	sdxlemur-v2-rcm-rc-pine1x.dtb \

	sdxlemur-v2-rcm-rc-pine2x.dtb







ifeq ($(CONFIG_ARCH_SHIMA), y)

qcom/direwolf-vm-audio.dtsi

+10 −4
Original line number Diff line number Diff line
@@ -1089,9 +1089,12 @@ 
				"msm-pcm-dsp-noirq", "msm-pcm-loopback.1",

				"msm-pcm-dtmf";

		asoc-cpu = <&dai_hdmi>, <&dai_dp>,

				<&dai_mi2s0>, <&dai_mi2s1>,

				<&dai_mi2s2>, <&dai_mi2s3>,

				<&dai_mi2s4>, <&dai_pri_auxpcm>,

				<&dai_mi2s0_rx>, <&dai_mi2s0_tx>,

				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,

				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,

				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,

				<&dai_mi2s4_rx>, <&dai_mi2s4_tx>,

				<&dai_pri_auxpcm>,

				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,

				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,

				<&afe_pcm_rx>, <&afe_pcm_tx>,
@@ -1167,7 +1170,10 @@ 
		asoc-cpu-names = "msm-dai-q6-hdmi.8",  "msm-dai-q6-dp.0",

				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-auxpcm.1",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",

				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",

				"msm-dai-q6-mi2s.8", "msm-dai-q6-mi2s.9",

				"msm-dai-q6-auxpcm.1",

				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",

				"msm-dai-q6-auxpcm.4", "msm-dai-q6-auxpcm.5",

				"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",

qcom/holi-audio.dtsi

+7 −3
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
					      <0x00008000>, <0x00009000>,

					      <0x0000A000>, <0x0000B000>,

					      <0x0000C000>, <0x0000D000>,

					      <0x0000E000>, <0x0000F0000>,

					      <0x0000E000>, <0x0000F000>,

					      <0x00010000>, <0x00011000>,

					      <0x00012000>;

			qcom,lpi-slew-offset-tbl = <0x00000000>, <0x00000002>,
@@ -153,8 +153,10 @@ 
				"msm-pcm-afe", "msm-lsm-client",

				"msm-pcm-routing", "msm-compr-dsp",

				"msm-pcm-dsp-noirq";

		asoc-cpu = <&dai_mi2s0>, <&dai_mi2s1>,

				<&dai_mi2s2>, <&dai_mi2s3>,

		asoc-cpu = <&dai_mi2s0_rx>, <&dai_mi2s0_tx>,

				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,

				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,

				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,

				<&dai_pri_auxpcm>,

				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,

				<&dai_quat_auxpcm>,
@@ -181,6 +183,8 @@ 
				<&rx_cdc_dma_7_rx>,<&afe_loopback_tx>;

		asoc-cpu-names = "msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",

				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",

				"msm-dai-q6-auxpcm.1",

				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",

				"msm-dai-q6-auxpcm.4",

qcom/lahaina-audio-overlay.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -377,9 +377,9 @@ 
	qcom,cps_reg_phy_addr = <0x3250300 0x3250304 0x3250318>;

	qcom,cps_wsa_vbatt_temp_reg_addr = <0x0003429 0x0003422>;

	qcom,cps_threshold_levels = <148 168>;

	qcom,cps_normal_values = <0x8E 0x8F 0x8F>;

	qcom,cps_lower1_values = <0x10 0xD0 0xD0>;

	qcom,cps_lower2_values = <0x0F 0x0F 0x18>;

	qcom,cps_normal_values = <0x8E003049 0x1000304A 0x0F003472>;

	qcom,cps_lower1_values = <0x8F003049 0xD000304A 0x0F003472>;

	qcom,cps_lower2_values = <0x8F003049 0xD000304A 0x18003472>;

	qcom,msm_audio_ssr_devs = <&audio_apr>, <&q6core>, <&lpi_tlmm>,

				  <&bolero>;

};