Sound with max98089 working

* sound2 * build as modules again * hack smp2p * many prints, seems to init * remove deps on codec * this bug is fixed * pcm shows up * power on the i2s * comment more * here * clk enable works * cleanup * small cleanup Co-authored-by: George Hotz <geohot@gmail.com> Co-authored-by: Robbe Derks <robbe.derks@gmail.com>
2026-06-08 11:24:51 +08:00 · 2020-07-30 15:44:02 +02:00
parent a5209bdded
commit fc74b5f71a
11 changed files with 209 additions and 59 deletions
--- a/arch/arm64/boot/dts/qcom/comma3.dtsi
+++ b/arch/arm64/boot/dts/qcom/comma3.dtsi
@@ -5,6 +5,7 @@

 #include "dsi-panel-ss-fhd-ea8074-cmd.dtsi"
 #include <dt-bindings/clock/mdss-10nm-pll-clk.h>
+#include <dt-bindings/clock/qcom,audio-ext-clk.h>

 /* disable the SPI */
 &qupv3_se5_spi {
@@ -19,6 +20,17 @@
  status = "disabled";
 };

+&soc {
+	clock_audio_lnbb: audio_ext_clk_lnbb {
+		status = "ok";
+		compatible = "qcom,audio-ref-clk";
+		clock-names = "osr_clk";
+		clocks = <&clock_rpmh RPMH_LN_BB_CLK2>;
+		qcom,node_has_rpm_clock;
+		#clock-cells = <1>;
+	};
+};
+
 /* audio and power monitor(ina230) I2C, /dev/i2c-0 */
 &qupv3_se10_i2c {
  status = "ok";
@@ -38,8 +50,8 @@
    reg = <0x10>;  /* slave address 0x20 for write, 0x21 for read */
    mic-left-digital;
    mic-right-digital;
-    mclk-pin = <2>;
-    status = "okay";
+		clock-names = "mclk";
+		clocks = <&clock_audio_lnbb AUDIO_PMIC_LNBB_CLK>;
  };
 };

@@ -563,13 +575,19 @@
 	/*qcom,usbc-analog-en1-gpio = <&wcd_usbc_analog_en1_gpio>;
 	qcom,usbc-analog-en2-gpio = <&tlmm 51 0>;*/

+	// mclk 79
+	// secondary i2s 81,80,83,82
+	// tert i2s 76,75,77,78
+
 	pinctrl-names = "aud_active", "aud_sleep",
 		"quat-mi2s-sleep", "quat-mi2s-active",
 		"quat-tdm-sleep", "quat-tdm-active";
 	pinctrl-0 = <&wcd_usbc_analog_en2_active>;
 	pinctrl-1 = <&wcd_usbc_analog_en2_idle>;
-	pinctrl-2 = <&quat_mi2s_sleep &quat_mi2s_sd0_sleep &quat_mi2s_sd1_sleep &quat_mi2s_sd2_sleep &quat_mi2s_sd3_sleep>;
-	pinctrl-3 = <&quat_mi2s_active &quat_mi2s_sd0_active &quat_mi2s_sd1_active &quat_mi2s_sd2_active &quat_mi2s_sd3_active>;
+	//pinctrl-2 = <&quat_mi2s_sleep &quat_mi2s_sd0_sleep &quat_mi2s_sd1_sleep &quat_mi2s_sd2_sleep &quat_mi2s_sd3_sleep>;
+	//pinctrl-3 = <&quat_mi2s_active &quat_mi2s_sd0_active &quat_mi2s_sd1_active &quat_mi2s_sd2_active &quat_mi2s_sd3_active>;
+	pinctrl-2 = <&sec_mi2s_sleep &sec_mi2s_mclk_sleep &sec_mi2s_sd0_sleep &sec_mi2s_sd1_sleep &tert_mi2s_sleep &tert_mi2s_sd0_sleep &tert_mi2s_sd1_sleep>;
+	pinctrl-3 = <&sec_mi2s_active &sec_mi2s_mclk_active &sec_mi2s_sd0_active &sec_mi2s_sd1_active &tert_mi2s_active &tert_mi2s_sd0_active &tert_mi2s_sd1_active>;
 	pinctrl-4 = <&quat_tdm_sleep &quat_tdm_din_sleep &quat_tdm_dout_sleep>;
 	pinctrl-5 = <&quat_tdm_active &quat_tdm_din_active &quat_tdm_din_active>;

--- a/arch/arm64/boot/dts/qcom/sdm845-audio.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-audio.dtsi
@@ -31,10 +31,10 @@
 	snd_934x: sound-tavil {
 		compatible = "qcom,sdm845-asoc-snd-tavil";
 		qcom,model = "sdm845-tavil-snd-card";
-		qcom,ext-disp-audio-rx;
-		qcom,wcn-btfm;
+		//qcom,ext-disp-audio-rx;
+		//qcom,wcn-btfm;
 		qcom,mi2s-audio-intf;
-		qcom,auxpcm-audio-intf;
+		//qcom,auxpcm-audio-intf;
 		qcom,msm-mi2s-master = <1>, <1>, <1>, <1>;

 		asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,
--- a/arch/arm64/boot/dts/qcom/sdm845-pinctrl.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-pinctrl.dtsi
@@ -1562,6 +1562,35 @@
 			};
 		};

+    tert_mi2s_sd1 {
+      tert_mi2s_sd1_sleep: tert_mi2s_sd1_sleep {
+        mux {
+          pins = "gpio78";
+          function = "gpio";
+        };   
+
+        config {
+          pins = "gpio78";
+          drive-strength = <2>;   /* 2 mA */
+          bias-pull-down;         /* PULL DOWN */
+          input-enable;
+        };   
+      };   
+
+      tert_mi2s_sd1_active: tert_mi2s_sd1_active {
+        mux {
+          pins = "gpio78";
+          function = "ter_mi2s";
+        };   
+
+        config {
+          pins = "gpio78";
+          drive-strength = <8>;   /* 8 mA */
+          bias-disable;           /* NO PULL */
+        };   
+      };   
+    };   
+
 		quat_mi2s_mclk {
 			quat_mi2s_mclk_sleep: quat_mi2s_mclk_sleep {
 				mux {
--- a/arch/arm64/configs/tici_defconfig
+++ b/arch/arm64/configs/tici_defconfig
@@ -295,7 +295,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 CONFIG_MODULE_SIG=y
-CONFIG_MODULE_SIG_FORCE=y
+CONFIG_MODULE_SIG_FORCE=n
 CONFIG_MODULE_SIG_ALL=y
 # CONFIG_MODULE_SIG_SHA1 is not set
 # CONFIG_MODULE_SIG_SHA224 is not set
@@ -4413,7 +4413,6 @@ CONFIG_QCOM_BUS_SCALING=y
 CONFIG_QCOM_BUS_CONFIG_RPMH=y
 CONFIG_QCOM_SECURE_BUFFER=y
 CONFIG_QCOM_EARLY_RANDOM=y
-CONFIG_MSM_SMEM=y
 # CONFIG_MSM_SMD is not set
 CONFIG_MSM_GLINK=y
 # CONFIG_MSM_TZ_SMMU is not set
@@ -4425,7 +4424,14 @@ CONFIG_MSM_SPSS_UTILS=y
 CONFIG_TRACER_PKT=y
 CONFIG_QTI_RPMH_API=y
 CONFIG_QTI_SYSTEM_PM=y
-# CONFIG_MSM_SMP2P is not set
+
+#CONFIG_QCOM_SMEM=y
+#CONFIG_QCOM_SMP2P=y
+#CONFIG_QCOM_SMSM=y
+
+CONFIG_MSM_SMEM=y
+CONFIG_MSM_SMP2P=y
+
 CONFIG_MSM_IPC_ROUTER_GLINK_XPRT=y
 CONFIG_MSM_QMI_INTERFACE=y
 CONFIG_MSM_GLINK_PKT=y
--- a/drivers/soc/qcom/msm_smp2p.c
+++ b/drivers/soc/qcom/msm_smp2p.c
@@ -372,8 +372,7 @@ static void *smp2p_get_local_smem_item(int remote_pid)

 			if (!item_ptr) {
 				size = sizeof(struct smp2p_smem_item);
-				item_ptr = smem_alloc(smem_id, size,
-								remote_pid, 0);
+				item_ptr = smem_alloc(smem_id, size, remote_pid, 0);
 			}
 		}
 	} else if (remote_pid == SMP2P_REMOTE_MOCK_PROC) {
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -331,7 +331,7 @@ cmd_cat = (cat $(filter-out FORCE,$^) > $@) || (rm -f $@; false)

 # Bzip2 and LZMA do not include size in file... so we have to fake that;
 # append the size as a 32-bit littleendian number as gzip does.
-size_append = printf $(shell						\
+size_append := printf $(shell						\
 dec_size=0;								\
 for F in $1; do								\
 	fsize=$$(stat -c "%s" $$F);					\
--- a/techpack/audio/asoc/codecs/audio-ext-clk.c
+++ b/techpack/audio/asoc/codecs/audio-ext-clk.c
@@ -276,6 +276,9 @@ static int audio_ref_clk_probe(struct platform_device *pdev)
 			}
 			audio_pmi_lnbb_clk.c.parent = audio_clk;
 			audio_pmi_lnbb_clk.gpio = -EINVAL;
+
+			// Comma hack to enable MCLK
+      		clk_prepare_enable(audio_clk);
 		}
 	}

--- a/techpack/audio/asoc/codecs/wcd9xxx-common-v2.c
+++ b/techpack/audio/asoc/codecs/wcd9xxx-common-v2.c
@@ -552,8 +552,10 @@ static void wcd_clsh_flyback_ctrl(struct snd_soc_codec *codec,
 			bulk_reg[1].bytes = 1;
 			/* 500usec delay is needed as per HW requirement */
 			usleep_range(500, 510);
-			wcd9xxx_slim_bulk_write(wcd9xxx, bulk_reg, 2,
-						false);
+
+			// Comma hack: breaks stuff, not needed
+			/*wcd9xxx_slim_bulk_write(wcd9xxx, bulk_reg, 2,
+						false);*/
 			snd_soc_update_bits(codec, WCD9XXX_FLYBACK_EN,
 					    0x10, 0x00);
 			wcd_clsh_set_flyback_mode(codec, mode);
--- a/techpack/audio/asoc/codecs/wcd9xxx-soc-init.c
+++ b/techpack/audio/asoc/codecs/wcd9xxx-soc-init.c
@@ -19,16 +19,17 @@ static int __init wcd9xxx_soc_init(void)
 {
 	int ret = 0;

-	ret = wcd_dsp_mgr_init();
-	if (!ret) {
+	// Commma hack: alternative init
  	ret = audio_ref_clk_platform_init();
+	/*ret = wcd_dsp_mgr_init();
+	if (!ret) {
 		if (ret) {
 			pr_err("%s: init extclk fail: %d\n", __func__, ret);
 			wcd_dsp_mgr_exit();
 		}
 	} else {
 		pr_err("%s: init dsp mgr fail: %d\n", __func__, ret);
-	}
+	}*/

 	return ret;
 }
@@ -37,7 +38,7 @@ module_init(wcd9xxx_soc_init);
 static void __exit wcd9xxx_soc_exit(void)
 {
 	audio_ref_clk_platform_exit();
-	wcd_dsp_mgr_exit();
+	//wcd_dsp_mgr_exit();
 }
 module_exit(wcd9xxx_soc_exit);

--- a/techpack/audio/asoc/sdm845.c
+++ b/techpack/audio/asoc/sdm845.c
@@ -178,8 +178,7 @@ struct msm_asoc_wcd93xx_codec {
 	void (*mbhc_hs_detect_exit)(struct snd_soc_codec *codec);
 };

-static const char *const pin_states[] = {"sleep", "i2s-active",
-					 "tdm-active"};
+static const char *const pin_states[] = {"sleep", "i2s-active", "tdm-active"};

 enum {
 	TDM_0 = 0,
@@ -2581,6 +2580,8 @@ static int msm_aux_pcm_tx_format_put(struct snd_kcontrol *kcontrol,
 	return 0;
 }

+// we don't support this
+#if 0
 static int msm_hifi_ctrl(struct snd_soc_codec *codec)
 {
 	struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
@@ -2630,6 +2631,7 @@ static int msm_hifi_put(struct snd_kcontrol *kcontrol,

 	return 0;
 }
+#endif

 static int msm_qos_ctl_get(struct snd_kcontrol *kcontrol,
 			   struct snd_ctl_elem_value *ucontrol)
@@ -2909,8 +2911,8 @@ static const struct snd_kcontrol_new msm_snd_controls[] = {
 			msm_aux_pcm_rx_format_get, msm_aux_pcm_rx_format_put),
 	SOC_ENUM_EXT("QUAT_AUX_PCM_TX Format", aux_pcm_tx_format,
 			msm_aux_pcm_tx_format_get, msm_aux_pcm_tx_format_put),
-	SOC_ENUM_EXT("HiFi Function", hifi_function, msm_hifi_get,
-			msm_hifi_put),
+	/*SOC_ENUM_EXT("HiFi Function", hifi_function, msm_hifi_get,
+			msm_hifi_put),*/
 	SOC_ENUM_EXT("MultiMedia5_RX QOS Vote", qos_vote, msm_qos_ctl_get,
 			msm_qos_ctl_put),
 };
@@ -2920,13 +2922,13 @@ static int msm_snd_enable_codec_ext_clk(struct snd_soc_codec *codec,
 {
 	int ret = 0;

-	if (!strcmp(dev_name(codec->dev), "tavil_codec")) {
+	/*if (!strcmp(dev_name(codec->dev), "tavil_codec")) {
 		ret = tavil_cdc_mclk_enable(codec, enable);
-	} else {
+	} else {*/
 		dev_err(codec->dev, "%s: unknown codec to enable ext clk\n",
 			__func__);
 		ret = -EINVAL;
-	}
+	//}
 	return ret;
 }

@@ -2935,13 +2937,13 @@ static int msm_snd_enable_codec_ext_tx_clk(struct snd_soc_codec *codec,
 {
 	int ret = 0;

-	if (!strcmp(dev_name(codec->dev), "tavil_codec")) {
+	/*if (!strcmp(dev_name(codec->dev), "tavil_codec")) {
 		ret = tavil_cdc_mclk_tx_enable(codec, enable);
-	} else {
+	} else {*/
 		dev_err(codec->dev, "%s: unknown codec to enable TX ext clk\n",
 			__func__);
 		ret = -EINVAL;
-	}
+	//}

 	return ret;
 }
@@ -2978,6 +2980,8 @@ static int msm_mclk_event(struct snd_soc_dapm_widget *w,
 	return 0;
 }

+// we don't have one of these
+#if 0
 static int msm_hifi_ctrl_event(struct snd_soc_dapm_widget *w,
 			       struct snd_kcontrol *k, int event)
 {
@@ -3010,19 +3014,16 @@ static int msm_hifi_ctrl_event(struct snd_soc_dapm_widget *w,

 	return 0;
 }
+#endif

 static const struct snd_soc_dapm_widget msm_dapm_widgets[] = {

-	SND_SOC_DAPM_SUPPLY("MCLK",  SND_SOC_NOPM, 0, 0,
-			    msm_mclk_event,
-			    SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
-
-	SND_SOC_DAPM_SUPPLY("MCLK TX",  SND_SOC_NOPM, 0, 0,
-	msm_mclk_tx_event, SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
+	SND_SOC_DAPM_SUPPLY("MCLK",  SND_SOC_NOPM, 0, 0, msm_mclk_event, SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
+	SND_SOC_DAPM_SUPPLY("MCLK TX",  SND_SOC_NOPM, 0, 0, msm_mclk_tx_event, SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),

 	SND_SOC_DAPM_SPK("Lineout_1 amp", NULL),
 	SND_SOC_DAPM_SPK("Lineout_2 amp", NULL),
-	SND_SOC_DAPM_SPK("hifi amp", msm_hifi_ctrl_event),
+	//SND_SOC_DAPM_SPK("hifi amp", msm_hifi_ctrl_event),
 	SND_SOC_DAPM_MIC("Handset Mic", NULL),
 	SND_SOC_DAPM_MIC("Headset Mic", NULL),
 	SND_SOC_DAPM_MIC("ANCRight Headset Mic", NULL),
@@ -3456,6 +3457,8 @@ done:
 	return rc;
 }

+// we don't support this
+#if 0
 static bool msm_usbc_swap_gnd_mic(struct snd_soc_codec *codec, bool active)
 {
 	int value = 0;
@@ -3577,6 +3580,7 @@ static bool msm_swap_gnd_mic(struct snd_soc_codec *codec, bool active)
 	}
 	return ret;
 }
+#endif

 static int msm_afe_set_config(struct snd_soc_codec *codec)
 {
@@ -3748,6 +3752,53 @@ static struct notifier_block service_nb = {
 	.priority = -INT_MAX,
 };

+static struct afe_param_cdc_reg_cfg audio_reg_cfg[] = {};
+
+static struct afe_param_cdc_reg_cfg_data tavil_audio_reg_cfg = {
+	.num_registers = ARRAY_SIZE(audio_reg_cfg),
+	.reg_data = audio_reg_cfg,
+};
+
+static struct afe_param_id_cdc_aanc_version tavil_cdc_aanc_version = {
+	.cdc_aanc_minor_version = AFE_API_VERSION_CDC_AANC_VERSION,
+	.aanc_hw_version        = AANC_HW_BLOCK_VERSION_2,
+};
+
+static struct afe_param_cdc_reg_page_cfg tavil_cdc_reg_page_cfg = {
+	.minor_version = AFE_API_VERSION_CDC_REG_PAGE_CFG,
+	.enable = 1,
+	.proc_id = AFE_CDC_REG_PAGE_ASSIGN_PROC_ID_1,
+};
+
+/**
+ * tavil_get_afe_config - returns specific codec configuration to afe to write
+ *
+ * @codec: codec instance
+ * @config_type: Indicates type of configuration to write.
+ */
+void *tavil_get_afe_config(struct snd_soc_codec *codec,
+			   enum afe_config_type config_type)
+{
+	//struct tavil_priv *priv = snd_soc_codec_get_drvdata(codec);
+
+	switch (config_type) {
+	//case AFE_SLIMBUS_SLAVE_CONFIG:
+	//	return &priv->slimbus_slave_cfg;
+	case AFE_CDC_REGISTERS_CONFIG:
+		return &tavil_audio_reg_cfg;
+	//case AFE_SLIMBUS_SLAVE_PORT_CONFIG:
+	//	return &tavil_slimbus_slave_port_cfg;
+	case AFE_AANC_VERSION:
+		return &tavil_cdc_aanc_version;
+	case AFE_CDC_REGISTER_PAGE_CONFIG:
+		return &tavil_cdc_reg_page_cfg;
+	default:
+		dev_info(codec->dev, "%s: Unknown config_type 0x%x\n",
+			__func__, config_type);
+		return NULL;
+	}
+}
+
 static int msm_audrx_init(struct snd_soc_pcm_runtime *rtd)
 {
 	int ret = 0;
@@ -3761,6 +3812,7 @@ static int msm_audrx_init(struct snd_soc_pcm_runtime *rtd)
 	struct snd_info_entry *entry;
 	struct msm_asoc_mach_data *pdata =
 				snd_soc_card_get_drvdata(rtd->card);
+	struct clk *mclk;

 	/* Codec SLIMBUS configuration
 	 * RX1, RX2, RX3, RX4, RX5, RX6, RX7, RX8
@@ -3785,11 +3837,8 @@ static int msm_audrx_init(struct snd_soc_pcm_runtime *rtd)
 		return ret;
 	}

-	snd_soc_dapm_new_controls(dapm, msm_dapm_widgets,
-				ARRAY_SIZE(msm_dapm_widgets));
-
-	snd_soc_dapm_add_routes(dapm, wcd_audio_paths,
-				ARRAY_SIZE(wcd_audio_paths));
+	snd_soc_dapm_new_controls(dapm, msm_dapm_widgets, ARRAY_SIZE(msm_dapm_widgets));
+	snd_soc_dapm_add_routes(dapm, wcd_audio_paths, ARRAY_SIZE(wcd_audio_paths));

 	snd_soc_dapm_ignore_suspend(dapm, "Handset Mic");
 	snd_soc_dapm_ignore_suspend(dapm, "Headset Mic");
@@ -3849,7 +3898,7 @@ static int msm_audrx_init(struct snd_soc_pcm_runtime *rtd)
 	 */
 	pr_debug("%s: Number of aux devices: %d\n",
 		__func__, rtd->card->num_aux_devs);
-	if (rtd->card->num_aux_devs &&
+	/*if (rtd->card->num_aux_devs &&
 	    !list_empty(&rtd->card->aux_comp_list)) {
 		aux_comp = list_first_entry(&rtd->card->aux_comp_list,
 				struct snd_soc_component, list_aux);
@@ -3859,7 +3908,7 @@ static int msm_audrx_init(struct snd_soc_pcm_runtime *rtd)
 			tavil_set_spkr_gain_offset(rtd->codec,
 					WCD934X_RX_GAIN_OFFSET_M1P5_DB);
 		}
-	}
+	}*/
 	card = rtd->card->snd_card;
 	entry = snd_info_create_subdir(card->module, "codecs",
 				       card->proc_root);
@@ -3870,7 +3919,18 @@ static int msm_audrx_init(struct snd_soc_pcm_runtime *rtd)
 		goto done;
 	}
 	pdata->codec_root = entry;
-	tavil_codec_info_create_codec_entry(pdata->codec_root, codec);
+	//tavil_codec_info_create_codec_entry(pdata->codec_root, codec);
+
+	// enable mclk
+		mclk = clk_get(codec->dev, "mclk");
+		if (IS_ERR(mclk)) {
+		return -1;
+	}
+		
+	ret = clk_prepare_enable(mclk);
+	if (ret) {
+		return -1;
+	}

 done:
 	codec_reg_done = true;
@@ -3880,6 +3940,7 @@ err:
 	return ret;
 }

+#if 0
 static int msm_wcn_init(struct snd_soc_pcm_runtime *rtd)
 {
 	unsigned int rx_ch[WCN_CDC_SLIM_RX_CH_MAX] = {157, 158};
@@ -3923,6 +3984,7 @@ static void *def_tavil_mbhc_cal(void)

 	return tavil_wcd_cal;
 }
+#endif

 static int msm_snd_hw_params(struct snd_pcm_substream *substream,
 			     struct snd_pcm_hw_params *params)
@@ -4627,7 +4689,7 @@ static int msm_mi2s_snd_startup(struct snd_pcm_substream *substream)
 				__func__, index, ret);
 			goto clk_off;
 		}
-		if (index == QUAT_MI2S) {
+		if (index == QUAT_MI2S || true) {
 			ret_pinctrl = msm_set_pinctrl(pinctrl_info,
 						      STATE_MI2S_ACTIVE);
 			if (ret_pinctrl)
@@ -5279,6 +5341,7 @@ static struct snd_soc_dai_link msm_common_dai_links[] = {
 };

 static struct snd_soc_dai_link msm_tavil_fe_dai_links[] = {
+#if 0
 	{
 		.name = LPASS_BE_SLIMBUS_4_TX,
 		.stream_name = "Slimbus4 Capture",
@@ -5317,6 +5380,7 @@ static struct snd_soc_dai_link msm_tavil_fe_dai_links[] = {
 		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,
 		.ops = &msm_slimbus_2_be_ops,
 	},
+#endif
 };

 static struct snd_soc_dai_link msm_common_misc_fe_dai_links[] = {
@@ -5583,6 +5647,7 @@ static struct snd_soc_dai_link msm_common_be_dai_links[] = {
 };

 static struct snd_soc_dai_link msm_tavil_be_dai_links[] = {
+#if 0
 	{
 		.name = LPASS_BE_SLIMBUS_0_RX,
 		.stream_name = "Slimbus Playback",
@@ -5768,9 +5833,11 @@ static struct snd_soc_dai_link msm_tavil_be_dai_links[] = {
 		.dpcm_capture = 1,
 		.ignore_pmdown_time = 1,
 	},
+#endif
 };

 static struct snd_soc_dai_link msm_wcn_be_dai_links[] = {
+#if 0
 	{
 		.name = LPASS_BE_SLIMBUS_7_RX,
 		.stream_name = "Slimbus7 Playback",
@@ -5820,6 +5887,7 @@ static struct snd_soc_dai_link msm_wcn_be_dai_links[] = {
 		.ops = &msm_wcn_ops,
 		.ignore_suspend = 1,
 	},
+#endif
 };

 static struct snd_soc_dai_link ext_disp_be_dai_link[] = {
@@ -5875,8 +5943,10 @@ static struct snd_soc_dai_link msm_mi2s_be_dai_links[] = {
 		.stream_name = "Secondary MI2S Playback",
 		.cpu_dai_name = "msm-dai-q6-mi2s.1",
 		.platform_name = "msm-pcm-routing",
-		.codec_name = "msm-stub-codec.1",
-		.codec_dai_name = "msm-stub-rx",
+		/*.codec_name = "msm-stub-codec.1",
+		.codec_dai_name = "msm-stub-rx",*/
+    .codec_name = "max98088.0-0010",
+    .codec_dai_name = "HiFi",
 		.no_pcm = 1,
 		.dpcm_playback = 1,
 		.id = MSM_BACKEND_DAI_SECONDARY_MI2S_RX,
@@ -5884,14 +5954,17 @@ static struct snd_soc_dai_link msm_mi2s_be_dai_links[] = {
 		.ops = &msm_mi2s_be_ops,
 		.ignore_suspend = 1,
 		.ignore_pmdown_time = 1,
+		.init = &msm_audrx_init,
 	},
 	{
 		.name = LPASS_BE_SEC_MI2S_TX,
 		.stream_name = "Secondary MI2S Capture",
 		.cpu_dai_name = "msm-dai-q6-mi2s.1",
 		.platform_name = "msm-pcm-routing",
-		.codec_name = "msm-stub-codec.1",
-		.codec_dai_name = "msm-stub-tx",
+		/*.codec_name = "msm-stub-codec.1",
+		.codec_dai_name = "msm-stub-tx",*/
+    .codec_name = "max98088.0-0010",
+    .codec_dai_name = "HiFi",
 		.no_pcm = 1,
 		.dpcm_capture = 1,
 		.id = MSM_BACKEND_DAI_SECONDARY_MI2S_TX,
@@ -5899,13 +5972,16 @@ static struct snd_soc_dai_link msm_mi2s_be_dai_links[] = {
 		.ops = &msm_mi2s_be_ops,
 		.ignore_suspend = 1,
 	},
+  	// max98088 is connected here!
 	{
 		.name = LPASS_BE_TERT_MI2S_RX,
 		.stream_name = "Tertiary MI2S Playback",
 		.cpu_dai_name = "msm-dai-q6-mi2s.2",
 		.platform_name = "msm-pcm-routing",
-		.codec_name = "msm-stub-codec.1",
-		.codec_dai_name = "msm-stub-rx",
+		/*.codec_name = "msm-stub-codec.1",
+		.codec_dai_name = "msm-stub-rx",*/
+    .codec_name = "max98088.0-0010",
+    .codec_dai_name = "HiFi",
 		.no_pcm = 1,
 		.dpcm_playback = 1,
 		.id = MSM_BACKEND_DAI_TERTIARY_MI2S_RX,
@@ -5919,8 +5995,10 @@ static struct snd_soc_dai_link msm_mi2s_be_dai_links[] = {
 		.stream_name = "Tertiary MI2S Capture",
 		.cpu_dai_name = "msm-dai-q6-mi2s.2",
 		.platform_name = "msm-pcm-routing",
-		.codec_name = "msm-stub-codec.1",
-		.codec_dai_name = "msm-stub-tx",
+		/*.codec_name = "msm-stub-codec.1",
+		.codec_dai_name = "msm-stub-tx",*/
+    .codec_name = "max98088.0-0010",
+    .codec_dai_name = "HiFi",
 		.no_pcm = 1,
 		.dpcm_capture = 1,
 		.id = MSM_BACKEND_DAI_TERTIARY_MI2S_TX,
@@ -6080,15 +6158,16 @@ static struct snd_soc_dai_link msm_auxpcm_be_dai_links[] = {

 static struct snd_soc_dai_link msm_tavil_snd_card_dai_links[
 			 ARRAY_SIZE(msm_common_dai_links) +
-			 ARRAY_SIZE(msm_tavil_fe_dai_links) +
+			 ARRAY_SIZE(msm_tavil_fe_dai_links) + // disabled, no tavil
 			 ARRAY_SIZE(msm_common_misc_fe_dai_links) +
 			 ARRAY_SIZE(msm_common_be_dai_links) +
-			 ARRAY_SIZE(msm_tavil_be_dai_links) +
-			 ARRAY_SIZE(msm_wcn_be_dai_links) +
+			 ARRAY_SIZE(msm_tavil_be_dai_links) + // disabled, no tavil
+			 ARRAY_SIZE(msm_wcn_be_dai_links) + // disabled, no wcn
 			 ARRAY_SIZE(ext_disp_be_dai_link) +
 			 ARRAY_SIZE(msm_mi2s_be_dai_links) +
 			 ARRAY_SIZE(msm_auxpcm_be_dai_links)];

+#if 0
 static int msm_snd_card_tavil_late_probe(struct snd_soc_card *card)
 {
 	const char *be_dl_name = LPASS_BE_SLIMBUS_0_RX;
@@ -6124,10 +6203,12 @@ err_free_mbhc_cal:
 err:
 	return ret;
 }
+#endif

 struct snd_soc_card snd_soc_card_tavil_msm = {
 	.name		= "sdm845-tavil-snd-card",
-	.late_probe	= msm_snd_card_tavil_late_probe,
+  // LPASS_BE_SLIMBUS_0_RX is disabled
+	//.late_probe	= msm_snd_card_tavil_late_probe,
 };

 static int msm_populate_dai_link_component_of_node(
@@ -6462,6 +6543,8 @@ static struct snd_soc_card *populate_snd_card_dailinks(struct device *dev)
 	return card;
 }

+// no support for wsa881x
+#if 0
 static int msm_wsa881x_init(struct snd_soc_component *component)
 {
 	u8 spkleft_ports[WSA881X_MAX_SWR_PORTS] = {100, 101, 102, 106};
@@ -6701,6 +6784,7 @@ err_free_dev_info:
 err:
 	return ret;
 }
+#endif

 static void msm_i2s_auxpcm_init(struct platform_device *pdev)
 {
@@ -6814,20 +6898,24 @@ static int msm_asoc_machine_probe(struct platform_device *pdev)
 		ret = -EPROBE_DEFER;
 		goto err;
 	}
-	ret = msm_init_wsa_dev(pdev, card);
+
+  	// we don't have a wsa dev
+	/*ret = msm_init_wsa_dev(pdev, card);
 	if (ret)
-		goto err;
+		goto err;*/

 	ret = devm_snd_soc_register_card(&pdev->dev, card);
 	if (ret == -EPROBE_DEFER) {
 		if (codec_reg_done)
 			ret = -EINVAL;
+
 		goto err;
 	} else if (ret) {
 		dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n",
 			ret);
 		goto err;
 	}
+
 	dev_info(&pdev->dev, "Sound card %s registered\n", card->name);
 	spdev = pdev;

@@ -6880,6 +6968,8 @@ static int msm_asoc_machine_probe(struct platform_device *pdev)
 	 * entry is not found in DT file as some targets do not support
 	 * US-Euro detection
 	 */
+
+  #if 0
 	pdata->us_euro_gpio = of_get_named_gpio(pdev->dev.of_node,
 				"qcom,us-euro-gpios", 0);
 	if (!gpio_is_valid(pdata->us_euro_gpio))
@@ -6896,6 +6986,7 @@ static int msm_asoc_machine_probe(struct platform_device *pdev)

 	if (of_find_property(pdev->dev.of_node, usb_c_dt, NULL))
 		wcd_mbhc_cfg.swap_gnd_mic = msm_swap_gnd_mic;
+  #endif

 	ret = msm_prepare_us_euro(card);
 	if (ret)
--- a/techpack/audio/config/sdm845auto.conf
+++ b/techpack/audio/config/sdm845auto.conf
@@ -11,6 +11,7 @@ CONFIG_SND_SOC_WCD934X_MBHC=m
 CONFIG_SND_SOC_WCD934X_DSD=m
 CONFIG_SND_SOC_MACHINE_SDM845=m
 CONFIG_WCD_DSP_GLINK=m
+
 CONFIG_MSM_QDSP6V2_CODECS=y
 CONFIG_MSM_ULTRASOUND=y
 CONFIG_MSM_QDSP6_APRV2_GLINK=y