Merge "asoc: Add separate array for TDM BE dai links"
diff --git a/asoc/bengal.c b/asoc/bengal.c
index 02352a8..4c6befd 100644
--- a/asoc/bengal.c
+++ b/asoc/bengal.c
@@ -2976,6 +2976,32 @@
SOC_ENUM_EXT("USB_AUDIO_TX SampleRate", usb_tx_sample_rate,
usb_audio_tx_sample_rate_get,
usb_audio_tx_sample_rate_put),
+ SOC_ENUM_EXT("USB_AUDIO_RX Format", usb_rx_format,
+ usb_audio_rx_format_get, usb_audio_rx_format_put),
+ SOC_ENUM_EXT("USB_AUDIO_TX Format", usb_tx_format,
+ usb_audio_tx_format_get, usb_audio_tx_format_put),
+ SOC_ENUM_EXT("USB_AUDIO_RX Channels", usb_rx_chs,
+ usb_audio_rx_ch_get, usb_audio_rx_ch_put),
+ SOC_ENUM_EXT("USB_AUDIO_TX Channels", usb_tx_chs,
+ usb_audio_tx_ch_get, usb_audio_tx_ch_put),
+ SOC_ENUM_EXT("PROXY_RX Channels", proxy_rx_chs,
+ proxy_rx_ch_get, proxy_rx_ch_put),
+ SOC_ENUM_EXT("BT SampleRate", bt_sample_rate,
+ msm_bt_sample_rate_get,
+ msm_bt_sample_rate_put),
+ SOC_ENUM_EXT("BT SampleRate RX", bt_sample_rate_rx,
+ msm_bt_sample_rate_rx_get,
+ msm_bt_sample_rate_rx_put),
+ SOC_ENUM_EXT("BT SampleRate TX", bt_sample_rate_tx,
+ msm_bt_sample_rate_tx_get,
+ msm_bt_sample_rate_tx_put),
+ SOC_ENUM_EXT("AFE_LOOPBACK_TX Channels", afe_loopback_tx_chs,
+ afe_loopback_tx_ch_get, afe_loopback_tx_ch_put),
+ SOC_ENUM_EXT("VI_FEED_TX Channels", vi_feed_tx_chs,
+ msm_vi_feed_tx_ch_get, msm_vi_feed_tx_ch_put),
+};
+
+static const struct snd_kcontrol_new msm_tdm_snd_controls[] = {
SOC_ENUM_EXT("PRI_TDM_RX_0 SampleRate", tdm_rx_sample_rate,
tdm_rx_sample_rate_get,
tdm_rx_sample_rate_put),
@@ -3000,58 +3026,6 @@
SOC_ENUM_EXT("QUAT_TDM_TX_0 SampleRate", tdm_tx_sample_rate,
tdm_tx_sample_rate_get,
tdm_tx_sample_rate_put),
- SOC_ENUM_EXT("PRIM_AUX_PCM_RX SampleRate", prim_aux_pcm_rx_sample_rate,
- aux_pcm_rx_sample_rate_get,
- aux_pcm_rx_sample_rate_put),
- SOC_ENUM_EXT("SEC_AUX_PCM_RX SampleRate", sec_aux_pcm_rx_sample_rate,
- aux_pcm_rx_sample_rate_get,
- aux_pcm_rx_sample_rate_put),
- SOC_ENUM_EXT("TERT_AUX_PCM_RX SampleRate", tert_aux_pcm_rx_sample_rate,
- aux_pcm_rx_sample_rate_get,
- aux_pcm_rx_sample_rate_put),
- SOC_ENUM_EXT("QUAT_AUX_PCM_RX SampleRate", quat_aux_pcm_rx_sample_rate,
- aux_pcm_rx_sample_rate_get,
- aux_pcm_rx_sample_rate_put),
- SOC_ENUM_EXT("PRIM_AUX_PCM_TX SampleRate", prim_aux_pcm_tx_sample_rate,
- aux_pcm_tx_sample_rate_get,
- aux_pcm_tx_sample_rate_put),
- SOC_ENUM_EXT("SEC_AUX_PCM_TX SampleRate", sec_aux_pcm_tx_sample_rate,
- aux_pcm_tx_sample_rate_get,
- aux_pcm_tx_sample_rate_put),
- SOC_ENUM_EXT("TERT_AUX_PCM_TX SampleRate", tert_aux_pcm_tx_sample_rate,
- aux_pcm_tx_sample_rate_get,
- aux_pcm_tx_sample_rate_put),
- SOC_ENUM_EXT("QUAT_AUX_PCM_TX SampleRate", quat_aux_pcm_tx_sample_rate,
- aux_pcm_tx_sample_rate_get,
- aux_pcm_tx_sample_rate_put),
- SOC_ENUM_EXT("PRIM_MI2S_RX SampleRate", prim_mi2s_rx_sample_rate,
- mi2s_rx_sample_rate_get,
- mi2s_rx_sample_rate_put),
- SOC_ENUM_EXT("SEC_MI2S_RX SampleRate", sec_mi2s_rx_sample_rate,
- mi2s_rx_sample_rate_get,
- mi2s_rx_sample_rate_put),
- SOC_ENUM_EXT("TERT_MI2S_RX SampleRate", tert_mi2s_rx_sample_rate,
- mi2s_rx_sample_rate_get,
- mi2s_rx_sample_rate_put),
- SOC_ENUM_EXT("QUAT_MI2S_RX SampleRate", quat_mi2s_rx_sample_rate,
- mi2s_rx_sample_rate_get,
- mi2s_rx_sample_rate_put),
- SOC_ENUM_EXT("PRIM_MI2S_TX SampleRate", prim_mi2s_tx_sample_rate,
- mi2s_tx_sample_rate_get,
- mi2s_tx_sample_rate_put),
- SOC_ENUM_EXT("SEC_MI2S_TX SampleRate", sec_mi2s_tx_sample_rate,
- mi2s_tx_sample_rate_get,
- mi2s_tx_sample_rate_put),
- SOC_ENUM_EXT("TERT_MI2S_TX SampleRate", tert_mi2s_tx_sample_rate,
- mi2s_tx_sample_rate_get,
- mi2s_tx_sample_rate_put),
- SOC_ENUM_EXT("QUAT_MI2S_TX SampleRate", quat_mi2s_tx_sample_rate,
- mi2s_tx_sample_rate_get,
- mi2s_tx_sample_rate_put),
- SOC_ENUM_EXT("USB_AUDIO_RX Format", usb_rx_format,
- usb_audio_rx_format_get, usb_audio_rx_format_put),
- SOC_ENUM_EXT("USB_AUDIO_TX Format", usb_tx_format,
- usb_audio_tx_format_get, usb_audio_tx_format_put),
SOC_ENUM_EXT("PRI_TDM_RX_0 Format", tdm_rx_format,
tdm_rx_format_get,
tdm_rx_format_put),
@@ -3076,44 +3050,6 @@
SOC_ENUM_EXT("QUAT_TDM_TX_0 Format", tdm_tx_format,
tdm_tx_format_get,
tdm_tx_format_put),
- SOC_ENUM_EXT("PRIM_AUX_PCM_RX Format", aux_pcm_rx_format,
- msm_aux_pcm_rx_format_get, msm_aux_pcm_rx_format_put),
- SOC_ENUM_EXT("SEC_AUX_PCM_RX Format", aux_pcm_rx_format,
- msm_aux_pcm_rx_format_get, msm_aux_pcm_rx_format_put),
- SOC_ENUM_EXT("TERT_AUX_PCM_RX Format", aux_pcm_rx_format,
- msm_aux_pcm_rx_format_get, msm_aux_pcm_rx_format_put),
- SOC_ENUM_EXT("QUAT_AUX_PCM_RX Format", aux_pcm_rx_format,
- msm_aux_pcm_rx_format_get, msm_aux_pcm_rx_format_put),
- SOC_ENUM_EXT("PRIM_AUX_PCM_TX Format", aux_pcm_tx_format,
- msm_aux_pcm_tx_format_get, msm_aux_pcm_tx_format_put),
- SOC_ENUM_EXT("SEC_AUX_PCM_TX Format", aux_pcm_tx_format,
- msm_aux_pcm_tx_format_get, msm_aux_pcm_tx_format_put),
- SOC_ENUM_EXT("TERT_AUX_PCM_TX Format", aux_pcm_tx_format,
- msm_aux_pcm_tx_format_get, msm_aux_pcm_tx_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("PRIM_MI2S_RX Format", mi2s_rx_format,
- msm_mi2s_rx_format_get, msm_mi2s_rx_format_put),
- SOC_ENUM_EXT("SEC_MI2S_RX Format", mi2s_rx_format,
- msm_mi2s_rx_format_get, msm_mi2s_rx_format_put),
- SOC_ENUM_EXT("TERT_MI2S_RX Format", mi2s_rx_format,
- msm_mi2s_rx_format_get, msm_mi2s_rx_format_put),
- SOC_ENUM_EXT("QUAT_MI2S_RX Format", mi2s_rx_format,
- msm_mi2s_rx_format_get, msm_mi2s_rx_format_put),
- SOC_ENUM_EXT("PRIM_MI2S_TX Format", mi2s_tx_format,
- msm_mi2s_tx_format_get, msm_mi2s_tx_format_put),
- SOC_ENUM_EXT("SEC_MI2S_TX Format", mi2s_tx_format,
- msm_mi2s_tx_format_get, msm_mi2s_tx_format_put),
- SOC_ENUM_EXT("TERT_MI2S_TX Format", mi2s_tx_format,
- msm_mi2s_tx_format_get, msm_mi2s_tx_format_put),
- SOC_ENUM_EXT("QUAT_MI2S_TX Format", mi2s_tx_format,
- msm_mi2s_tx_format_get, msm_mi2s_tx_format_put),
- SOC_ENUM_EXT("USB_AUDIO_RX Channels", usb_rx_chs,
- usb_audio_rx_ch_get, usb_audio_rx_ch_put),
- SOC_ENUM_EXT("USB_AUDIO_TX Channels", usb_tx_chs,
- usb_audio_tx_ch_get, usb_audio_tx_ch_put),
- SOC_ENUM_EXT("PROXY_RX Channels", proxy_rx_chs,
- proxy_rx_ch_get, proxy_rx_ch_put),
SOC_ENUM_EXT("PRI_TDM_RX_0 Channels", tdm_rx_chs,
tdm_rx_ch_get,
tdm_rx_ch_put),
@@ -3138,6 +3074,89 @@
SOC_ENUM_EXT("QUAT_TDM_TX_0 Channels", tdm_tx_chs,
tdm_tx_ch_get,
tdm_tx_ch_put),
+};
+
+static const struct snd_kcontrol_new msm_auxpcm_snd_controls[] = {
+ SOC_ENUM_EXT("PRIM_AUX_PCM_RX SampleRate", prim_aux_pcm_rx_sample_rate,
+ aux_pcm_rx_sample_rate_get,
+ aux_pcm_rx_sample_rate_put),
+ SOC_ENUM_EXT("SEC_AUX_PCM_RX SampleRate", sec_aux_pcm_rx_sample_rate,
+ aux_pcm_rx_sample_rate_get,
+ aux_pcm_rx_sample_rate_put),
+ SOC_ENUM_EXT("TERT_AUX_PCM_RX SampleRate", tert_aux_pcm_rx_sample_rate,
+ aux_pcm_rx_sample_rate_get,
+ aux_pcm_rx_sample_rate_put),
+ SOC_ENUM_EXT("QUAT_AUX_PCM_RX SampleRate", quat_aux_pcm_rx_sample_rate,
+ aux_pcm_rx_sample_rate_get,
+ aux_pcm_rx_sample_rate_put),
+ SOC_ENUM_EXT("PRIM_AUX_PCM_TX SampleRate", prim_aux_pcm_tx_sample_rate,
+ aux_pcm_tx_sample_rate_get,
+ aux_pcm_tx_sample_rate_put),
+ SOC_ENUM_EXT("SEC_AUX_PCM_TX SampleRate", sec_aux_pcm_tx_sample_rate,
+ aux_pcm_tx_sample_rate_get,
+ aux_pcm_tx_sample_rate_put),
+ SOC_ENUM_EXT("TERT_AUX_PCM_TX SampleRate", tert_aux_pcm_tx_sample_rate,
+ aux_pcm_tx_sample_rate_get,
+ aux_pcm_tx_sample_rate_put),
+ SOC_ENUM_EXT("QUAT_AUX_PCM_TX SampleRate", quat_aux_pcm_tx_sample_rate,
+ aux_pcm_tx_sample_rate_get,
+ aux_pcm_tx_sample_rate_put),
+ SOC_ENUM_EXT("PRIM_AUX_PCM_RX Format", aux_pcm_rx_format,
+ msm_aux_pcm_rx_format_get, msm_aux_pcm_rx_format_put),
+ SOC_ENUM_EXT("SEC_AUX_PCM_RX Format", aux_pcm_rx_format,
+ msm_aux_pcm_rx_format_get, msm_aux_pcm_rx_format_put),
+ SOC_ENUM_EXT("TERT_AUX_PCM_RX Format", aux_pcm_rx_format,
+ msm_aux_pcm_rx_format_get, msm_aux_pcm_rx_format_put),
+ SOC_ENUM_EXT("QUAT_AUX_PCM_RX Format", aux_pcm_rx_format,
+ msm_aux_pcm_rx_format_get, msm_aux_pcm_rx_format_put),
+ SOC_ENUM_EXT("PRIM_AUX_PCM_TX Format", aux_pcm_tx_format,
+ msm_aux_pcm_tx_format_get, msm_aux_pcm_tx_format_put),
+ SOC_ENUM_EXT("SEC_AUX_PCM_TX Format", aux_pcm_tx_format,
+ msm_aux_pcm_tx_format_get, msm_aux_pcm_tx_format_put),
+ SOC_ENUM_EXT("TERT_AUX_PCM_TX Format", aux_pcm_tx_format,
+ msm_aux_pcm_tx_format_get, msm_aux_pcm_tx_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),
+};
+
+static const struct snd_kcontrol_new msm_mi2s_snd_controls[] = {
+ SOC_ENUM_EXT("PRIM_MI2S_RX SampleRate", prim_mi2s_rx_sample_rate,
+ mi2s_rx_sample_rate_get,
+ mi2s_rx_sample_rate_put),
+ SOC_ENUM_EXT("SEC_MI2S_RX SampleRate", sec_mi2s_rx_sample_rate,
+ mi2s_rx_sample_rate_get,
+ mi2s_rx_sample_rate_put),
+ SOC_ENUM_EXT("TERT_MI2S_RX SampleRate", tert_mi2s_rx_sample_rate,
+ mi2s_rx_sample_rate_get,
+ mi2s_rx_sample_rate_put),
+ SOC_ENUM_EXT("QUAT_MI2S_RX SampleRate", quat_mi2s_rx_sample_rate,
+ mi2s_rx_sample_rate_get,
+ mi2s_tx_sample_rate_put),
+ SOC_ENUM_EXT("SEC_MI2S_TX SampleRate", sec_mi2s_tx_sample_rate,
+ mi2s_tx_sample_rate_get,
+ mi2s_tx_sample_rate_put),
+ SOC_ENUM_EXT("TERT_MI2S_TX SampleRate", tert_mi2s_tx_sample_rate,
+ mi2s_tx_sample_rate_get,
+ mi2s_tx_sample_rate_put),
+ SOC_ENUM_EXT("QUAT_MI2S_TX SampleRate", quat_mi2s_tx_sample_rate,
+ mi2s_tx_sample_rate_get,
+ mi2s_tx_sample_rate_put),
+ SOC_ENUM_EXT("PRIM_MI2S_RX Format", mi2s_rx_format,
+ msm_mi2s_rx_format_get, msm_mi2s_rx_format_put),
+ SOC_ENUM_EXT("SEC_MI2S_RX Format", mi2s_rx_format,
+ msm_mi2s_rx_format_get, msm_mi2s_rx_format_put),
+ SOC_ENUM_EXT("TERT_MI2S_RX Format", mi2s_rx_format,
+ msm_mi2s_rx_format_get, msm_mi2s_rx_format_put),
+ SOC_ENUM_EXT("QUAT_MI2S_RX Format", mi2s_rx_format,
+ msm_mi2s_rx_format_get, msm_mi2s_rx_format_put),
+ SOC_ENUM_EXT("PRIM_MI2S_TX Format", mi2s_tx_format,
+ msm_mi2s_tx_format_get, msm_mi2s_tx_format_put),
+ SOC_ENUM_EXT("SEC_MI2S_TX Format", mi2s_tx_format,
+ msm_mi2s_tx_format_get, msm_mi2s_tx_format_put),
+ SOC_ENUM_EXT("TERT_MI2S_TX Format", mi2s_tx_format,
+ msm_mi2s_tx_format_get, msm_mi2s_tx_format_put),
+ SOC_ENUM_EXT("QUAT_MI2S_TX Format", mi2s_tx_format,
+ msm_mi2s_tx_format_get, msm_mi2s_tx_format_put),
SOC_ENUM_EXT("PRIM_MI2S_RX Channels", prim_mi2s_rx_chs,
msm_mi2s_rx_ch_get, msm_mi2s_rx_ch_put),
SOC_ENUM_EXT("SEC_MI2S_RX Channels", sec_mi2s_rx_chs,
@@ -3154,19 +3173,6 @@
msm_mi2s_tx_ch_get, msm_mi2s_tx_ch_put),
SOC_ENUM_EXT("QUAT_MI2S_TX Channels", quat_mi2s_tx_chs,
msm_mi2s_tx_ch_get, msm_mi2s_tx_ch_put),
- SOC_ENUM_EXT("BT SampleRate", bt_sample_rate,
- msm_bt_sample_rate_get,
- msm_bt_sample_rate_put),
- SOC_ENUM_EXT("BT SampleRate RX", bt_sample_rate_rx,
- msm_bt_sample_rate_rx_get,
- msm_bt_sample_rate_rx_put),
- SOC_ENUM_EXT("BT SampleRate TX", bt_sample_rate_tx,
- msm_bt_sample_rate_tx_get,
- msm_bt_sample_rate_tx_put),
- SOC_ENUM_EXT("AFE_LOOPBACK_TX Channels", afe_loopback_tx_chs,
- afe_loopback_tx_ch_get, afe_loopback_tx_ch_put),
- SOC_ENUM_EXT("VI_FEED_TX Channels", vi_feed_tx_chs,
- msm_vi_feed_tx_ch_get, msm_vi_feed_tx_ch_put),
};
static const struct snd_kcontrol_new msm_snd_controls[] = {
@@ -4214,6 +4220,45 @@
tx_ch, ARRAY_SIZE(rx_ch), rx_ch);
}
+#ifndef CONFIG_TDM_DISABLE
+static void msm_add_tdm_snd_controls(struct snd_soc_component *component)
+{
+ snd_soc_add_component_controls(component, msm_tdm_snd_controls,
+ ARRAY_SIZE(msm_tdm_snd_controls));
+}
+#else
+static void msm_add_tdm_snd_controls(struct snd_soc_component *component)
+{
+ return;
+}
+#endif
+
+#ifndef CONFIG_MI2S_DISABLE
+static void msm_add_mi2s_snd_controls(struct snd_soc_component *component)
+{
+ snd_soc_add_component_controls(component, msm_mi2s_snd_controls,
+ ARRAY_SIZE(msm_mi2s_snd_controls));
+}
+#else
+static void msm_add_mi2s_snd_controls(struct snd_soc_component *component)
+{
+ return;
+}
+#endif
+
+#ifndef CONFIG_AUXPCM_DISABLE
+static void msm_add_auxpcm_snd_controls(struct snd_soc_component *component)
+{
+ snd_soc_add_component_controls(component, msm_auxpcm_snd_controls,
+ ARRAY_SIZE(msm_auxpcm_snd_controls));
+}
+#else
+static void msm_add_auxpcm_snd_controls(struct snd_soc_component *component)
+{
+ return;
+}
+#endif
+
static int msm_int_audrx_init(struct snd_soc_pcm_runtime *rtd)
{
int ret = -EINVAL;
@@ -4251,6 +4296,10 @@
return ret;
}
+ msm_add_tdm_snd_controls(component);
+ msm_add_mi2s_snd_controls(component);
+ msm_add_auxpcm_snd_controls(component);
+
snd_soc_dapm_new_controls(dapm, msm_int_dapm_widgets,
ARRAY_SIZE(msm_int_dapm_widgets));
@@ -5149,6 +5198,9 @@
.be_hw_params_fixup = msm_be_hw_params_fixup,
.ignore_suspend = 1,
},
+};
+
+static struct snd_soc_dai_link msm_tdm_be_dai_links[] = {
{
.name = LPASS_BE_PRI_TDM_RX_0,
.stream_name = "Primary TDM0 Playback",
@@ -5728,7 +5780,8 @@
ARRAY_SIZE(msm_rx_tx_cdc_dma_be_dai_links) +
ARRAY_SIZE(msm_va_cdc_dma_be_dai_links) +
ARRAY_SIZE(msm_afe_rxtx_lb_be_dai_link) +
- ARRAY_SIZE(msm_wcn_btfm_be_dai_links)];
+ ARRAY_SIZE(msm_wcn_btfm_be_dai_links) +
+ ARRAY_SIZE(msm_tdm_be_dai_links)];
static int msm_populate_dai_link_component_of_node(
struct snd_soc_card *card)
@@ -6040,6 +6093,16 @@
ARRAY_SIZE(msm_afe_rxtx_lb_be_dai_link);
}
+ rc = of_property_read_u32(dev->of_node, "qcom,tdm-audio-intf",
+ &val);
+ if (!rc && val) {
+ memcpy(msm_bengal_dai_links + total_links,
+ msm_tdm_be_dai_links,
+ sizeof(msm_tdm_be_dai_links));
+ total_links +=
+ ARRAY_SIZE(msm_tdm_be_dai_links);
+ }
+
rc = of_property_read_u32(dev->of_node, "qcom,wcn-btfm",
&wcn_btfm_intf);
if (rc) {
diff --git a/config/bengalauto.conf b/config/bengalauto.conf
index cd614f6..f9c28da 100644
--- a/config/bengalauto.conf
+++ b/config/bengalauto.conf
@@ -36,3 +36,6 @@
CONFIG_PM2250_SPMI=m
CONFIG_SND_SOC_BENGAL=m
CONFIG_SND_EVENT=m
+CONFIG_TDM_DISABLE=m
+CONFIG_MI2S_DISABLE=m
+CONFIG_AUXPCM_DISABLE=m
diff --git a/config/bengalautoconf.h b/config/bengalautoconf.h
index 83cca08..f14f005 100644
--- a/config/bengalautoconf.h
+++ b/config/bengalautoconf.h
@@ -40,3 +40,6 @@
#define CONFIG_PM2250_SPMI 1
#define CONFIG_SND_SOC_BENGAL 1
#define CONFIG_SND_EVENT 1
+#define CONFIG_TDM_DISABLE 1
+#define CONFIG_MI2S_DISABLE 1
+#define CONFIG_AUXPCM_DISABLE 1