asoc: fix compilation issues

Fix compilation issues for qcs405.

CRs-Fixed: 2248380
Change-Id: I1a4929dbcd888cb6be30a155d2f492cbf314a25a
Signed-off-by: Mangesh Kunchamwar <[email protected]>

asoc/codecs/bolero/va-macro.c

@@ -283,7 +283,7 @@ static void va_macro_mute_update_callback(struct work_struct *work)
 	hpf_gate_reg = BOLERO_CDC_VA_TX0_TX_PATH_SEC2 +
 			VA_MACRO_TX_PATH_OFFSET * decimator;
 	snd_soc_update_bits(codec, hpf_gate_reg, 0x01, 0x01);
-	snd_soc_update_bits(codec, tx_vol_ctl_reg, 0x01, 0x00);
+	snd_soc_update_bits(codec, tx_vol_ctl_reg, 0x10, 0x00);
 	dev_dbg(va_priv->dev, "%s: decimator %u unmute\n",
 		__func__, decimator);
 }
@@ -458,12 +458,15 @@ static int va_macro_enable_dmic(struct snd_soc_dapm_widget *w,
 	case SND_SOC_DAPM_PRE_PMU:
 		(*dmic_clk_cnt)++;
 		if (*dmic_clk_cnt == 1) {
-			snd_soc_update_bits(codec, dmic_clk_reg,
-					dmic_clk_en, dmic_clk_en);
+			snd_soc_update_bits(codec,
+					BOLERO_CDC_VA_TOP_CSR_DMIC_CFG,
+					0x80, 0x00);
 			snd_soc_update_bits(codec, dmic_clk_reg,
 					VA_MACRO_TX_DMIC_CLK_DIV_MASK,
 					va_priv->dmic_clk_div <<
 					VA_MACRO_TX_DMIC_CLK_DIV_SHFT);
+			snd_soc_update_bits(codec, dmic_clk_reg,
+					dmic_clk_en, dmic_clk_en);
 		}
 		break;
 	case SND_SOC_DAPM_POST_PMD:
@@ -1453,7 +1456,7 @@ static int va_macro_probe(struct platform_device *pdev)
 	ret = of_property_read_u32(pdev->dev.of_node, dmic_sample_rate,
 				   &sample_rate);
 	if (ret) {
-		dev_err(&pdev->dev, "%s: could not find %s entry in dt\n",
+		dev_err(&pdev->dev, "%s: could not find %d entry in dt\n",
 			__func__, sample_rate);
 		va_priv->dmic_clk_div = VA_MACRO_CLK_DIV_2;
 	} else {
@@ -1484,7 +1487,7 @@ static int va_macro_probe(struct platform_device *pdev)
 		if (IS_ERR(va_priv->micb_supply)) {
 			ret = PTR_ERR(va_priv->micb_supply);
 			dev_err(&pdev->dev,
-				"%s:Failed to get micbias supply for VA Mic\n",
+				"%s:Failed to get micbias supply for VA Mic %d\n",
 				__func__, ret);
 			return ret;
 		}

asoc/codecs/wcd9335.c

@@ -13589,7 +13589,7 @@ static int tasha_codec_probe(struct snd_soc_codec *codec)
 	if (tasha->is_wsa_attach)
 		snd_soc_add_codec_controls(codec,
 				tasha_spkr_wsa_controls,
-				ARRAY_SIZE(tasha_wsa_controls));
+				ARRAY_SIZE(tasha_spkr_wsa_controls));
 	control->num_rx_port = TASHA_RX_MAX;
 	control->rx_chs = ptr;
 	memcpy(control->rx_chs, tasha_rx_chs, sizeof(tasha_rx_chs));

asoc/msm-pcm-routing-v2.c

@@ -1220,7 +1220,7 @@ int msm_pcm_routing_get_pp_ch_cnt(int fe_id, int session_type)
 	ret = msm_pcm_routing_get_stream_app_type_cfg(fe_id, session_type,
 						      &be_id, &cfg_data);
 	if (ret) {
-		pr_err("%s: cannot get stream app type cfg\n");
+		pr_err("%s: cannot get stream app type cfg\n", __func__);
 		return ret;
 	}
 

asoc/qcs405.c

@@ -6833,47 +6833,6 @@ err:
 	return ret;
 }
 
-static int msm_audrx_stub_init(struct snd_soc_pcm_runtime *rtd)
-{
-	return 0;
-}
-
-static int msm_snd_stub_hw_params(struct snd_pcm_substream *substream,
-			     struct snd_pcm_hw_params *params)
-{
-	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
-
-	int ret = 0;
-	unsigned int rx_ch[] = {144, 145, 146, 147, 148, 149, 150,
-				151};
-	unsigned int tx_ch[] = {128, 129, 130, 131, 132, 133,
-				134, 135, 136, 137, 138, 139,
-				140, 141, 142, 143};
-
-	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-		ret = snd_soc_dai_set_channel_map(cpu_dai, 0, 0,
-					slim_rx_cfg[SLIM_RX_0].channels,
-					rx_ch);
-		if (ret < 0)
-			pr_err("%s: RX failed to set cpu chan map error %d\n",
-				__func__, ret);
-	} else {
-		ret = snd_soc_dai_set_channel_map(cpu_dai,
-					slim_tx_cfg[SLIM_TX_0].channels,
-					tx_ch, 0, 0);
-		if (ret < 0)
-			pr_err("%s: TX failed to set cpu chan map error %d\n",
-				__func__, ret);
-	}
-
-	return ret;
-}
-
-static struct snd_soc_ops msm_stub_be_ops = {
-	.hw_params = msm_snd_stub_hw_params,
-};
-
 static struct snd_soc_dai_link msm_stub_fe_dai_links[] = {
 
 	/* FrontEnd DAI Links */