Merge c1a5a5068a2fd37c06456f18c2a27de0aeb99c5b on remote branch
Change-Id: I3c387a13d8633ecf051f1c01832f38ee388cda2e
diff --git a/asoc/Android.mk b/asoc/Android.mk
index ffbfc86..2eac43f 100644
--- a/asoc/Android.mk
+++ b/asoc/Android.mk
@@ -25,6 +25,11 @@
AUDIO_SELECT += CONFIG_SND_SOC_8909_DIG_CDC=m
endif
+ifeq ($(strip $(TARGET_ROARING_LIONUS)),true)
+TARGET := msm8909
+AUDIO_SELECT += CONFIG_MSM_8905=m
+endif
+
AUDIO_CHIPSET := audio
# Build/Package only in case of supported target
ifeq ($(call is-board-platform-in-list,msm8909 msm8953 msm8937 sdm845 sdm710 qcs605),true)
@@ -108,6 +113,16 @@
include $(DLKM_DIR)/AndroidKernelModule.mk
endif
###########################################################
+ifeq ($(strip $(TARGET_ROARING_LIONUS)),true)
+include $(CLEAR_VARS)
+LOCAL_MODULE := $(AUDIO_CHIPSET)_machine_int_$(TARGET).ko
+LOCAL_MODULE_KBUILD_NAME := machine_int_dlkm.ko
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_DEBUG_ENABLE := true
+LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
+include $(DLKM_DIR)/AndroidKernelModule.mk
+endif
+###########################################################
endif # DLKM check
endif # supported target check
diff --git a/asoc/Kbuild b/asoc/Kbuild
index 8a3d78b..be1a8de 100644
--- a/asoc/Kbuild
+++ b/asoc/Kbuild
@@ -41,9 +41,16 @@
INCS += -include $(AUDIO_ROOT)/config/sdxpoorwillsautoconf.h
endif
ifeq ($(CONFIG_ARCH_MSM8909), y)
- include $(AUDIO_ROOT)/config/msm8909auto.conf
- export
- INCS += -include $(AUDIO_ROOT)/config/msm8909autoconf.h
+ ifeq ($(CONFIG_MSM_BGCOM), y)
+ include $(AUDIO_ROOT)/config/msm8909auto.conf
+ export
+ INCS += -include $(AUDIO_ROOT)/config/msm8909autoconf.h
+ endif
+ ifeq ($(CONFIG_MSM_8905), m)
+ include $(AUDIO_ROOT)/config/msm8905auto.conf
+ export
+ INCS += -include $(AUDIO_ROOT)/config/msm8905autoconf.h
+ endif
endif
ifeq ($(CONFIG_ARCH_MSM8917), y)
include $(AUDIO_ROOT)/config/sdm450auto.conf
diff --git a/asoc/codecs/Android.mk b/asoc/codecs/Android.mk
index ae7c7fe..b284aaa 100644
--- a/asoc/codecs/Android.mk
+++ b/asoc/codecs/Android.mk
@@ -16,11 +16,15 @@
AUDIO_SELECT += CONFIG_SND_SOC_EXT_CODEC_SDM450=m
endif
-ifeq ($(call is-board-platform-in-list,msm8909),true)
+ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM_8909W)),true)
AUDIO_SELECT += CONFIG_SND_SOC_BG_8909=m
AUDIO_SELECT += CONFIG_SND_SOC_8909_DIG_CDC=m
endif
+ifeq ($(strip $(TARGET_ROARING_LIONUS)),true)
+AUDIO_SELECT += CONFIG_MSM_8905=m
+endif
+
AUDIO_CHIPSET := audio
# Build/Package only in case of supported target
ifeq ($(call is-board-platform-in-list,msm8909 msm8953 msm8937 sdm845 sdm710 qcs605),true)
diff --git a/asoc/codecs/Kbuild b/asoc/codecs/Kbuild
index d2984b9..548bab1 100644
--- a/asoc/codecs/Kbuild
+++ b/asoc/codecs/Kbuild
@@ -35,9 +35,16 @@
INCS += -include $(AUDIO_ROOT)/config/sdm450autoconf.h
endif
ifeq ($(CONFIG_ARCH_MSM8909), y)
- include $(AUDIO_ROOT)/config/msm8909auto.conf
- export
- INCS += -include $(AUDIO_ROOT)/config/msm8909autoconf.h
+ ifeq ($(CONFIG_MSM_BGCOM), y)
+ include $(AUDIO_ROOT)/config/msm8909auto.conf
+ export
+ INCS += -include $(AUDIO_ROOT)/config/msm8909autoconf.h
+ endif
+ ifeq ($(CONFIG_MSM_8905), m)
+ include $(AUDIO_ROOT)/config/msm8905auto.conf
+ export
+ INCS += -include $(AUDIO_ROOT)/config/msm8905autoconf.h
+ endif
endif
ifeq ($(CONFIG_ARCH_MSM8917), y)
include $(AUDIO_ROOT)/config/sdm450auto.conf
diff --git a/asoc/codecs/msm_stub.c b/asoc/codecs/msm_stub.c
index 68e55ae..862051b 100644
--- a/asoc/codecs/msm_stub.c
+++ b/asoc/codecs/msm_stub.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011-2014, 2017 The Linux Foundation. All rights reserved.
+/* Copyright (c) 2011-2014, 2017, 2020, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -24,9 +24,12 @@
.playback = { /* Support maximum range */
.stream_name = "Playback",
.channels_min = 1,
- .channels_max = 8,
- .rates = SNDRV_PCM_RATE_8000_48000,
- .formats = SNDRV_PCM_FMTBIT_S16_LE,
+ .channels_max = 16,
+ .rates = SNDRV_PCM_RATE_8000_384000,
+ .formats = (SNDRV_PCM_FMTBIT_S16_LE |
+ SNDRV_PCM_FMTBIT_S24_LE |
+ SNDRV_PCM_FMTBIT_S24_3LE |
+ SNDRV_PCM_FMTBIT_S32_LE),
},
},
{
@@ -34,10 +37,51 @@
.capture = { /* Support maximum range */
.stream_name = "Record",
.channels_min = 1,
- .channels_max = 8,
+ .channels_max = 16,
.rates = SNDRV_PCM_RATE_8000_48000,
.formats = (SNDRV_PCM_FMTBIT_S16_LE |
- SNDRV_PCM_FMTBIT_S24_LE),
+ SNDRV_PCM_FMTBIT_S24_LE |
+ SNDRV_PCM_FMTBIT_S24_3LE |
+ SNDRV_PCM_FMTBIT_S32_LE),
+ },
+ },
+ {
+ .name = "msm-stub-tx1",
+ .capture = { /* Support maximum range */
+ .stream_name = "Record1",
+ .channels_min = 1,
+ .channels_max = 16,
+ .rates = SNDRV_PCM_RATE_8000_48000,
+ .formats = (SNDRV_PCM_FMTBIT_S16_LE |
+ SNDRV_PCM_FMTBIT_S24_LE |
+ SNDRV_PCM_FMTBIT_S24_3LE |
+ SNDRV_PCM_FMTBIT_S32_LE),
+ },
+ },
+ {
+ .name = "msm-stub-tx2",
+ .capture = { /* Support maximum range */
+ .stream_name = "Record2",
+ .channels_min = 1,
+ .channels_max = 16,
+ .rates = SNDRV_PCM_RATE_8000_48000,
+ .formats = (SNDRV_PCM_FMTBIT_S16_LE |
+ SNDRV_PCM_FMTBIT_S24_LE |
+ SNDRV_PCM_FMTBIT_S24_3LE |
+ SNDRV_PCM_FMTBIT_S32_LE),
+ },
+ },
+ {
+ .name = "msm-stub-tx3",
+ .capture = { /* Support maximum range */
+ .stream_name = "Record3",
+ .channels_min = 1,
+ .channels_max = 16,
+ .rates = SNDRV_PCM_RATE_8000_48000,
+ .formats = (SNDRV_PCM_FMTBIT_S16_LE |
+ SNDRV_PCM_FMTBIT_S24_LE |
+ SNDRV_PCM_FMTBIT_S24_3LE |
+ SNDRV_PCM_FMTBIT_S32_LE),
},
},
};
diff --git a/asoc/codecs/sdm660_cdc/Kbuild b/asoc/codecs/sdm660_cdc/Kbuild
index 04bee2c..13a1361 100644
--- a/asoc/codecs/sdm660_cdc/Kbuild
+++ b/asoc/codecs/sdm660_cdc/Kbuild
@@ -41,9 +41,16 @@
INCS += -include $(AUDIO_ROOT)/config/sdm450autoconf.h
endif
ifeq ($(CONFIG_ARCH_MSM8909), y)
- include $(AUDIO_ROOT)/config/msm8909auto.conf
- export
- INCS += -include $(AUDIO_ROOT)/config/msm8909autoconf.h
+ ifeq ($(CONFIG_MSM_BGCOM), y)
+ include $(AUDIO_ROOT)/config/msm8909auto.conf
+ export
+ INCS += -include $(AUDIO_ROOT)/config/msm8909autoconf.h
+ endif
+ ifeq ($(CONFIG_MSM_8905), m)
+ include $(AUDIO_ROOT)/config/msm8905auto.conf
+ export
+ INCS += -include $(AUDIO_ROOT)/config/msm8905autoconf.h
+ endif
endif
endif
diff --git a/asoc/msm-dai-fe.c b/asoc/msm-dai-fe.c
index cdad909..7787355 100644
--- a/asoc/msm-dai-fe.c
+++ b/asoc/msm-dai-fe.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -2092,7 +2092,10 @@
.aif_name = "MM_UL9",
.rates = (SNDRV_PCM_RATE_8000_48000|
SNDRV_PCM_RATE_KNOT),
- .formats = SNDRV_PCM_FMTBIT_S16_LE,
+ .formats = (SNDRV_PCM_FMTBIT_S16_LE |
+ SNDRV_PCM_FMTBIT_S24_LE |
+ SNDRV_PCM_FMTBIT_S24_3LE |
+ SNDRV_PCM_FMTBIT_S32_LE),
.channels_min = 1,
.channels_max = 32,
.rate_min = 8000,
@@ -2607,6 +2610,25 @@
.name = "MultiMedia29",
.probe = fe_dai_probe,
},
+ {
+ .playback = {
+ .stream_name = "MultiMedia30 Playback",
+ .aif_name = "MM_DL30",
+ .rates = (SNDRV_PCM_RATE_8000_384000|
+ SNDRV_PCM_RATE_KNOT),
+ .formats = (SNDRV_PCM_FMTBIT_S16_LE |
+ SNDRV_PCM_FMTBIT_S24_LE |
+ SNDRV_PCM_FMTBIT_S24_3LE |
+ SNDRV_PCM_FMTBIT_S32_LE),
+ .channels_min = 1,
+ .channels_max = 32,
+ .rate_min = 8000,
+ .rate_max = 384000,
+ },
+ .ops = &msm_fe_Multimedia_dai_ops,
+ .name = "MultiMedia30",
+ .probe = fe_dai_probe,
+ },
};
static int msm_fe_dai_dev_probe(struct platform_device *pdev)
diff --git a/asoc/msm-pcm-routing-v2.c b/asoc/msm-pcm-routing-v2.c
index 5fcde20..81bea63 100644
--- a/asoc/msm-pcm-routing-v2.c
+++ b/asoc/msm-pcm-routing-v2.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -656,6 +656,9 @@
/* MULTIMEDIA29 */
{{0, INVALID_SESSION, LEGACY_PCM_MODE, {NULL, NULL} },
{0, INVALID_SESSION, LEGACY_PCM_MODE, {NULL, NULL} } },
+ /* MULTIMEDIA30 */
+ {{0, INVALID_SESSION, LEGACY_PCM_MODE, {NULL, NULL} },
+ {0, INVALID_SESSION, LEGACY_PCM_MODE, {NULL, NULL} } },
/* VOIP */
{{0, INVALID_SESSION, LEGACY_PCM_MODE, {NULL, NULL} },
{0, INVALID_SESSION, LEGACY_PCM_MODE, {NULL, NULL} } },
@@ -5005,7 +5008,10 @@
MSM_BACKEND_DAI_PRI_MI2S_RX,
MSM_FRONTEND_DAI_MULTIMEDIA29, 1, 0, msm_routing_get_audio_mixer,
msm_routing_put_audio_mixer),
-
+ SOC_DOUBLE_EXT("MultiMedia30", SND_SOC_NOPM,
+ MSM_BACKEND_DAI_PRI_MI2S_RX,
+ MSM_FRONTEND_DAI_MULTIMEDIA30, 1, 0, msm_routing_get_audio_mixer,
+ msm_routing_put_audio_mixer),
};
static const struct snd_kcontrol_new int0_mi2s_rx_mixer_controls[] = {
@@ -9272,6 +9278,22 @@
MSM_BACKEND_DAI_SLIMBUS_6_TX,
MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer,
msm_routing_put_audio_mixer),
+ SOC_DOUBLE_EXT("PRI_TDM_TX_0", SND_SOC_NOPM,
+ MSM_BACKEND_DAI_PRI_TDM_TX_0,
+ MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer,
+ msm_routing_put_audio_mixer),
+ SOC_DOUBLE_EXT("PRI_TDM_TX_1", SND_SOC_NOPM,
+ MSM_BACKEND_DAI_PRI_TDM_TX_1,
+ MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer,
+ msm_routing_put_audio_mixer),
+ SOC_DOUBLE_EXT("PRI_TDM_TX_2", SND_SOC_NOPM,
+ MSM_BACKEND_DAI_PRI_TDM_TX_2,
+ MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer,
+ msm_routing_put_audio_mixer),
+ SOC_DOUBLE_EXT("PRI_TDM_TX_3", SND_SOC_NOPM,
+ MSM_BACKEND_DAI_PRI_TDM_TX_3,
+ MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer,
+ msm_routing_put_audio_mixer),
SOC_DOUBLE_EXT("TERT_TDM_TX_0", SND_SOC_NOPM,
MSM_BACKEND_DAI_TERT_TDM_TX_0,
MSM_FRONTEND_DAI_MULTIMEDIA9, 1, 0, msm_routing_get_audio_mixer,
@@ -15124,6 +15146,7 @@
SND_SOC_DAPM_AIF_IN("MM_DL15", "MultiMedia15 Playback", 0, 0, 0, 0),
SND_SOC_DAPM_AIF_IN("MM_DL16", "MultiMedia16 Playback", 0, 0, 0, 0),
SND_SOC_DAPM_AIF_IN("MM_DL20", "MultiMedia20 Playback", 0, 0, 0, 0),
+ SND_SOC_DAPM_AIF_IN("MM_DL30", "MultiMedia30 Playback", 0, 0, 0, 0),
SND_SOC_DAPM_AIF_IN("VOIP_DL", "VoIP Playback", 0, 0, 0, 0),
SND_SOC_DAPM_AIF_OUT("MM_UL1", "MultiMedia1 Capture", 0, 0, 0, 0),
SND_SOC_DAPM_AIF_OUT("MM_UL2", "MultiMedia2 Capture", 0, 0, 0, 0),
@@ -16391,6 +16414,7 @@
{"PRI_RX Audio Mixer", "MultiMedia14", "MM_DL14"},
{"PRI_RX Audio Mixer", "MultiMedia15", "MM_DL15"},
{"PRI_RX Audio Mixer", "MultiMedia16", "MM_DL16"},
+ {"PRI_RX Audio Mixer", "MultiMedia30", "MM_DL30"},
{"PRI_I2S_RX", NULL, "PRI_RX Audio Mixer"},
{"SEC_RX Audio Mixer", "MultiMedia1", "MM_DL1"},
@@ -16724,6 +16748,7 @@
{"PRI_MI2S_RX Audio Mixer", "MultiMedia14", "MM_DL14"},
{"PRI_MI2S_RX Audio Mixer", "MultiMedia15", "MM_DL15"},
{"PRI_MI2S_RX Audio Mixer", "MultiMedia16", "MM_DL16"},
+ {"PRI_MI2S_RX Audio Mixer", "MultiMedia30", "MM_DL30"},
{"PRI_MI2S_RX", NULL, "PRI_MI2S_RX Audio Mixer"},
{"INT0_MI2S_RX Audio Mixer", "MultiMedia1", "MM_DL1"},
@@ -17483,6 +17508,10 @@
{"MultiMedia8 Mixer", "QUIN_TDM_TX_2", "QUIN_TDM_TX_2"},
{"MultiMedia8 Mixer", "QUIN_TDM_TX_3", "QUIN_TDM_TX_3"},
+ {"MultiMedia9 Mixer", "PRI_TDM_TX_0", "PRI_TDM_TX_0"},
+ {"MultiMedia9 Mixer", "PRI_TDM_TX_1", "PRI_TDM_TX_1"},
+ {"MultiMedia9 Mixer", "PRI_TDM_TX_2", "PRI_TDM_TX_2"},
+ {"MultiMedia9 Mixer", "PRI_TDM_TX_3", "PRI_TDM_TX_3"},
{"MultiMedia9 Mixer", "TERT_TDM_TX_0", "TERT_TDM_TX_0"},
{"MultiMedia9 Mixer", "TERT_TDM_TX_1", "TERT_TDM_TX_1"},
{"MultiMedia9 Mixer", "TERT_TDM_TX_2", "TERT_TDM_TX_2"},
diff --git a/asoc/msm-pcm-routing-v2.h b/asoc/msm-pcm-routing-v2.h
index 93f6ceb..8c12b6a 100644
--- a/asoc/msm-pcm-routing-v2.h
+++ b/asoc/msm-pcm-routing-v2.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2018, 2020 The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -214,6 +214,7 @@
MSM_FRONTEND_DAI_MULTIMEDIA20,
MSM_FRONTEND_DAI_MULTIMEDIA28,
MSM_FRONTEND_DAI_MULTIMEDIA29,
+ MSM_FRONTEND_DAI_MULTIMEDIA30,
MSM_FRONTEND_DAI_VOIP,
MSM_FRONTEND_DAI_AFE_RX,
MSM_FRONTEND_DAI_AFE_TX,
@@ -235,8 +236,8 @@
MSM_FRONTEND_DAI_MAX,
};
-#define MSM_FRONTEND_DAI_MM_SIZE (MSM_FRONTEND_DAI_MULTIMEDIA29 + 1)
-#define MSM_FRONTEND_DAI_MM_MAX_ID MSM_FRONTEND_DAI_MULTIMEDIA29
+#define MSM_FRONTEND_DAI_MM_SIZE (MSM_FRONTEND_DAI_MULTIMEDIA30 + 1)
+#define MSM_FRONTEND_DAI_MM_MAX_ID MSM_FRONTEND_DAI_MULTIMEDIA30
enum {
MSM_BACKEND_DAI_PRI_I2S_RX = 0,
diff --git a/asoc/msm8952.c b/asoc/msm8952.c
index 44db613..fcafd27 100644
--- a/asoc/msm8952.c
+++ b/asoc/msm8952.c
@@ -1,4 +1,5 @@
-/* Copyright (c) 2015-2016, 2018, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, 2018, 2020, The Linux Foundation.
+ * All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -2347,6 +2348,24 @@
.ignore_pmdown_time = 1,
.id = MSM_FRONTEND_DAI_MULTIMEDIA19,
},
+ {/* hw:x,41 */
+ .name = "MSM8x16 Haptic Audio",
+ .stream_name = "MultiMedia30",
+ .cpu_dai_name = "MultiMedia30",
+ .platform_name = "msm-pcm-dsp.1",
+ .dynamic = 1,
+ .dpcm_playback = 1,
+ .async_ops = ASYNC_DPCM_SND_SOC_PREPARE |
+ ASYNC_DPCM_SND_SOC_HW_PARAMS,
+ .codec_dai_name = "snd-soc-dummy-dai",
+ .codec_name = "snd-soc-dummy",
+ .trigger = {SND_SOC_DPCM_TRIGGER_POST,
+ SND_SOC_DPCM_TRIGGER_POST},
+ .ignore_suspend = 1,
+ /* this dainlink has playback support */
+ .ignore_pmdown_time = 1,
+ .id = MSM_FRONTEND_DAI_MULTIMEDIA30,
+ },
/* Backend I2S DAI Links */
{
.name = LPASS_BE_PRI_MI2S_RX,
@@ -2968,17 +2987,19 @@
const char *ext_pa = "qcom,msm-ext-pa";
const char *mclk = "qcom,msm-mclk-freq";
const char *wsa = "asoc-wsa-codec-names";
- const char *wsa_prefix = "asoc-wsa-codec-prefixes";
const char *type = NULL;
const char *ext_pa_str = NULL;
- const char *wsa_str = NULL;
- const char *wsa_prefix_str = NULL;
const char *spk_ext_pa = "qcom,msm-spk-ext-pa";
int num_strings;
int id, i, val;
int ret = 0;
struct resource *muxsel;
+#if IS_ENABLED(CONFIG_SND_SOC_WSA881X_ANALOG)
+ const char *wsa_prefix = "asoc-wsa-codec-prefixes";
+ const char *wsa_str = NULL;
+ const char *wsa_prefix_str = NULL;
char *temp_str = NULL;
+#endif
pdata = devm_kzalloc(&pdev->dev,
sizeof(struct msm_asoc_mach_data),
@@ -3060,6 +3081,7 @@
/*reading the gpio configurations from dtsi file*/
num_strings = of_property_count_strings(pdev->dev.of_node,
wsa);
+#if IS_ENABLED(CONFIG_SND_SOC_WSA881X_ANALOG)
if (num_strings > 0) {
if (wsa881x_get_probing_count() < 2) {
ret = -EPROBE_DEFER;
@@ -3125,6 +3147,7 @@
msm_anlg_cdc_update_int_spk_boost(false);
}
}
+#endif
card = msm8952_populate_sndcard_dailinks(&pdev->dev);
dev_dbg(&pdev->dev, "default codec configured\n");
diff --git a/asoc/sdm660-common.c b/asoc/sdm660-common.c
index abd85df..1cceb7a 100644
--- a/asoc/sdm660-common.c
+++ b/asoc/sdm660-common.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2020, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -43,6 +43,29 @@
EXT_DISP_RX_IDX_MAX,
};
+enum {
+ PRIMARY_TDM_RX_0,
+ PRIMARY_TDM_RX_1,
+ PRIMARY_TDM_RX_2,
+ PRIMARY_TDM_RX_3,
+ PRIMARY_TDM_RX_4,
+ PRIMARY_TDM_RX_5,
+ PRIMARY_TDM_RX_6,
+ PRIMARY_TDM_RX_7,
+ TDM_MAX_RX,
+};
+enum {
+ PRIMARY_TDM_TX_0,
+ PRIMARY_TDM_TX_1,
+ PRIMARY_TDM_TX_2,
+ PRIMARY_TDM_TX_3,
+ PRIMARY_TDM_TX_4,
+ PRIMARY_TDM_TX_5,
+ PRIMARY_TDM_TX_6,
+ PRIMARY_TDM_TX_7,
+ TDM_MAX_TX,
+};
+
bool codec_reg_done;
struct tdm_dai_data {
@@ -605,18 +628,62 @@
{0xFFFF}, /* not used */
}
};
-static unsigned int tdm_param_set_slot_mask(int slots)
+
+static unsigned int tdm_param_set_slot_mask(u16 port_id, int slot_width,
+ int slots, int tdm_interface)
{
unsigned int slot_mask = 0;
- int i = 0;
+ int upper, lower, i, j, rx_path = 0;
+ unsigned int *slot_offset;
- if ((slots <= 0) || (slots > 32)) {
- pr_err("%s: invalid slot number %d\n", __func__, slots);
- return -EINVAL;
+ switch (port_id) {
+ pr_err("port_id %x", port_id );
+ case AFE_PORT_ID_PRIMARY_TDM_RX:
+ case AFE_PORT_ID_PRIMARY_TDM_RX_1:
+ case AFE_PORT_ID_PRIMARY_TDM_RX_2:
+ case AFE_PORT_ID_PRIMARY_TDM_RX_3:
+ case AFE_PORT_ID_PRIMARY_TDM_RX_4:
+ case AFE_PORT_ID_PRIMARY_TDM_RX_5:
+ case AFE_PORT_ID_PRIMARY_TDM_RX_6:
+ case AFE_PORT_ID_PRIMARY_TDM_RX_7:
+ lower = PRIMARY_TDM_RX_0;
+ upper = PRIMARY_TDM_RX_7;
+ rx_path = 1;
+ break;
+ case AFE_PORT_ID_PRIMARY_TDM_TX:
+ case AFE_PORT_ID_PRIMARY_TDM_TX_1:
+ case AFE_PORT_ID_PRIMARY_TDM_TX_2:
+ case AFE_PORT_ID_PRIMARY_TDM_TX_3:
+ case AFE_PORT_ID_PRIMARY_TDM_TX_4:
+ case AFE_PORT_ID_PRIMARY_TDM_TX_5:
+ case AFE_PORT_ID_PRIMARY_TDM_TX_6:
+ case AFE_PORT_ID_PRIMARY_TDM_TX_7:
+ lower = PRIMARY_TDM_TX_0;
+ upper = PRIMARY_TDM_TX_7;
+ break;
+ default:
+ return slot_mask;
}
- for (i = 0; i < slots ; i++)
- slot_mask |= 1 << i;
+ for (i = lower; i <= upper; i++) {
+ if (rx_path)
+ slot_offset = tdm_rx_slot_offset[tdm_interface][i];
+ else
+ slot_offset = tdm_tx_slot_offset[tdm_interface][i];
+
+ for (j = 0; j < TDM_SLOT_OFFSET_MAX; j++) {
+ if (slot_offset[j] != AFE_SLOT_MAPPING_OFFSET_INVALID) {
+ /*
+ * set the mask of active slot according to
+ * the offset table for the group of devices
+ */
+ slot_mask |=
+ (1 << ((slot_offset[j] * 8) / slot_width));
+ } else {
+ break;
+ }
+ }
+ }
return slot_mask;
}
@@ -627,7 +694,7 @@
struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
int ret = 0;
- int channels, slot_width, slots, rate, format;
+ int channels, slot_width, slots, rate, format, tdm_interface;
unsigned int slot_mask;
unsigned int *slot_offset;
int offset_channels = 0;
@@ -662,401 +729,481 @@
slots = tdm_slot[TDM_PRI].num;
slot_width = tdm_slot[TDM_PRI].width;
slot_offset = tdm_rx_slot_offset[TDM_PRI][TDM_0];
+ tdm_interface = TDM_PRI;
break;
case AFE_PORT_ID_PRIMARY_TDM_RX_1:
slots = tdm_slot[TDM_PRI].num;
slot_width = tdm_slot[TDM_PRI].width;
slot_offset = tdm_rx_slot_offset[TDM_PRI][TDM_1];
+ tdm_interface = TDM_PRI;
break;
case AFE_PORT_ID_PRIMARY_TDM_RX_2:
slots = tdm_slot[TDM_PRI].num;
slot_width = tdm_slot[TDM_PRI].width;
slot_offset = tdm_rx_slot_offset[TDM_PRI][TDM_2];
+ tdm_interface = TDM_PRI;
break;
case AFE_PORT_ID_PRIMARY_TDM_RX_3:
slots = tdm_slot[TDM_PRI].num;
slot_width = tdm_slot[TDM_PRI].width;
slot_offset = tdm_rx_slot_offset[TDM_PRI][TDM_3];
+ tdm_interface = TDM_PRI;
break;
case AFE_PORT_ID_PRIMARY_TDM_RX_4:
slots = tdm_slot[TDM_PRI].num;
slot_width = tdm_slot[TDM_PRI].width;
slot_offset = tdm_rx_slot_offset[TDM_PRI][TDM_4];
+ tdm_interface = TDM_PRI;
break;
case AFE_PORT_ID_PRIMARY_TDM_RX_5:
slots = tdm_slot[TDM_PRI].num;
slot_width = tdm_slot[TDM_PRI].width;
slot_offset = tdm_rx_slot_offset[TDM_PRI][TDM_5];
+ tdm_interface = TDM_PRI;
break;
case AFE_PORT_ID_PRIMARY_TDM_RX_6:
slots = tdm_slot[TDM_PRI].num;
slot_width = tdm_slot[TDM_PRI].width;
slot_offset = tdm_rx_slot_offset[TDM_PRI][TDM_6];
+ tdm_interface = TDM_PRI;
break;
case AFE_PORT_ID_PRIMARY_TDM_RX_7:
slots = tdm_slot[TDM_PRI].num;
slot_width = tdm_slot[TDM_PRI].width;
slot_offset = tdm_rx_slot_offset[TDM_PRI][TDM_7];
+ tdm_interface = TDM_PRI;
break;
case AFE_PORT_ID_PRIMARY_TDM_TX:
slots = tdm_slot[TDM_PRI].num;
slot_width = tdm_slot[TDM_PRI].width;
slot_offset = tdm_tx_slot_offset[TDM_PRI][TDM_0];
+ tdm_interface = TDM_PRI;
break;
case AFE_PORT_ID_PRIMARY_TDM_TX_1:
slots = tdm_slot[TDM_PRI].num;
slot_width = tdm_slot[TDM_PRI].width;
slot_offset = tdm_tx_slot_offset[TDM_PRI][TDM_1];
+ tdm_interface = TDM_PRI;
break;
case AFE_PORT_ID_PRIMARY_TDM_TX_2:
slots = tdm_slot[TDM_PRI].num;
slot_width = tdm_slot[TDM_PRI].width;
slot_offset = tdm_tx_slot_offset[TDM_PRI][TDM_2];
+ tdm_interface = TDM_PRI;
break;
case AFE_PORT_ID_PRIMARY_TDM_TX_3:
slots = tdm_slot[TDM_PRI].num;
slot_width = tdm_slot[TDM_PRI].width;
slot_offset = tdm_tx_slot_offset[TDM_PRI][TDM_3];
+ tdm_interface = TDM_PRI;
break;
case AFE_PORT_ID_PRIMARY_TDM_TX_4:
slots = tdm_slot[TDM_PRI].num;
slot_width = tdm_slot[TDM_PRI].width;
slot_offset = tdm_tx_slot_offset[TDM_PRI][TDM_4];
+ tdm_interface = TDM_PRI;
break;
case AFE_PORT_ID_PRIMARY_TDM_TX_5:
slots = tdm_slot[TDM_PRI].num;
slot_width = tdm_slot[TDM_PRI].width;
slot_offset = tdm_tx_slot_offset[TDM_PRI][TDM_5];
+ tdm_interface = TDM_PRI;
break;
case AFE_PORT_ID_PRIMARY_TDM_TX_6:
slots = tdm_slot[TDM_PRI].num;
slot_width = tdm_slot[TDM_PRI].width;
slot_offset = tdm_tx_slot_offset[TDM_PRI][TDM_6];
+ tdm_interface = TDM_PRI;
break;
case AFE_PORT_ID_PRIMARY_TDM_TX_7:
slots = tdm_slot[TDM_PRI].num;
slot_width = tdm_slot[TDM_PRI].width;
slot_offset = tdm_tx_slot_offset[TDM_PRI][TDM_7];
+ tdm_interface = TDM_PRI;
break;
case AFE_PORT_ID_SECONDARY_TDM_RX:
slots = tdm_slot[TDM_SEC].num;
slot_width = tdm_slot[TDM_SEC].width;
slot_offset = tdm_rx_slot_offset[TDM_SEC][TDM_0];
+ tdm_interface = TDM_SEC;
break;
case AFE_PORT_ID_SECONDARY_TDM_RX_1:
slots = tdm_slot[TDM_SEC].num;
slot_width = tdm_slot[TDM_SEC].width;
slot_offset = tdm_rx_slot_offset[TDM_SEC][TDM_1];
+ tdm_interface = TDM_SEC;
break;
case AFE_PORT_ID_SECONDARY_TDM_RX_2:
slots = tdm_slot[TDM_SEC].num;
slot_width = tdm_slot[TDM_SEC].width;
slot_offset = tdm_rx_slot_offset[TDM_SEC][TDM_2];
+ tdm_interface = TDM_SEC;
break;
case AFE_PORT_ID_SECONDARY_TDM_RX_3:
slots = tdm_slot[TDM_SEC].num;
slot_width = tdm_slot[TDM_SEC].width;
slot_offset = tdm_rx_slot_offset[TDM_SEC][TDM_3];
+ tdm_interface = TDM_SEC;
break;
case AFE_PORT_ID_SECONDARY_TDM_RX_4:
slots = tdm_slot[TDM_SEC].num;
slot_width = tdm_slot[TDM_SEC].width;
slot_offset = tdm_rx_slot_offset[TDM_SEC][TDM_4];
+ tdm_interface = TDM_SEC;
break;
case AFE_PORT_ID_SECONDARY_TDM_RX_5:
slots = tdm_slot[TDM_SEC].num;
slot_width = tdm_slot[TDM_SEC].width;
slot_offset = tdm_rx_slot_offset[TDM_SEC][TDM_5];
+ tdm_interface = TDM_SEC;
break;
case AFE_PORT_ID_SECONDARY_TDM_RX_6:
slots = tdm_slot[TDM_SEC].num;
slot_width = tdm_slot[TDM_SEC].width;
slot_offset = tdm_rx_slot_offset[TDM_SEC][TDM_6];
+ tdm_interface = TDM_SEC;
break;
case AFE_PORT_ID_SECONDARY_TDM_RX_7:
slots = tdm_slot[TDM_SEC].num;
slot_width = tdm_slot[TDM_SEC].width;
slot_offset = tdm_rx_slot_offset[TDM_SEC][TDM_7];
+ tdm_interface = TDM_SEC;
break;
case AFE_PORT_ID_SECONDARY_TDM_TX:
slots = tdm_slot[TDM_SEC].num;
slot_width = tdm_slot[TDM_SEC].width;
slot_offset = tdm_tx_slot_offset[TDM_SEC][TDM_0];
+ tdm_interface = TDM_SEC;
break;
case AFE_PORT_ID_SECONDARY_TDM_TX_1:
slots = tdm_slot[TDM_SEC].num;
slot_width = tdm_slot[TDM_SEC].width;
slot_offset = tdm_tx_slot_offset[TDM_SEC][TDM_1];
+ tdm_interface = TDM_SEC;
break;
case AFE_PORT_ID_SECONDARY_TDM_TX_2:
slots = tdm_slot[TDM_SEC].num;
slot_width = tdm_slot[TDM_SEC].width;
slot_offset = tdm_tx_slot_offset[TDM_SEC][TDM_2];
+ tdm_interface = TDM_SEC;
break;
case AFE_PORT_ID_SECONDARY_TDM_TX_3:
slots = tdm_slot[TDM_SEC].num;
slot_width = tdm_slot[TDM_SEC].width;
slot_offset = tdm_tx_slot_offset[TDM_SEC][TDM_3];
+ tdm_interface = TDM_SEC;
break;
case AFE_PORT_ID_SECONDARY_TDM_TX_4:
slots = tdm_slot[TDM_SEC].num;
slot_width = tdm_slot[TDM_SEC].width;
slot_offset = tdm_tx_slot_offset[TDM_SEC][TDM_4];
+ tdm_interface = TDM_SEC;
break;
case AFE_PORT_ID_SECONDARY_TDM_TX_5:
slots = tdm_slot[TDM_SEC].num;
slot_width = tdm_slot[TDM_SEC].width;
slot_offset = tdm_tx_slot_offset[TDM_SEC][TDM_5];
+ tdm_interface = TDM_SEC;
break;
case AFE_PORT_ID_SECONDARY_TDM_TX_6:
slots = tdm_slot[TDM_SEC].num;
slot_width = tdm_slot[TDM_SEC].width;
slot_offset = tdm_tx_slot_offset[TDM_SEC][TDM_6];
+ tdm_interface = TDM_SEC;
break;
case AFE_PORT_ID_SECONDARY_TDM_TX_7:
slots = tdm_slot[TDM_SEC].num;
slot_width = tdm_slot[TDM_SEC].width;
slot_offset = tdm_tx_slot_offset[TDM_SEC][TDM_7];
+ tdm_interface = TDM_SEC;
break;
case AFE_PORT_ID_TERTIARY_TDM_RX:
slots = tdm_slot[TDM_TERT].num;
slot_width = tdm_slot[TDM_TERT].width;
slot_offset = tdm_rx_slot_offset[TDM_TERT][TDM_0];
+ tdm_interface = TDM_TERT;
break;
case AFE_PORT_ID_TERTIARY_TDM_RX_1:
slots = tdm_slot[TDM_TERT].num;
slot_width = tdm_slot[TDM_TERT].width;
slot_offset = tdm_rx_slot_offset[TDM_TERT][TDM_1];
+ tdm_interface = TDM_TERT;
break;
case AFE_PORT_ID_TERTIARY_TDM_RX_2:
slots = tdm_slot[TDM_TERT].num;
slot_width = tdm_slot[TDM_TERT].width;
slot_offset = tdm_rx_slot_offset[TDM_TERT][TDM_2];
+ tdm_interface = TDM_TERT;
break;
case AFE_PORT_ID_TERTIARY_TDM_RX_3:
slots = tdm_slot[TDM_TERT].num;
slot_width = tdm_slot[TDM_TERT].width;
slot_offset = tdm_rx_slot_offset[TDM_TERT][TDM_3];
+ tdm_interface = TDM_TERT;
break;
case AFE_PORT_ID_TERTIARY_TDM_RX_4:
slots = tdm_slot[TDM_TERT].num;
slot_width = tdm_slot[TDM_TERT].width;
slot_offset = tdm_rx_slot_offset[TDM_TERT][TDM_4];
+ tdm_interface = TDM_TERT;
break;
case AFE_PORT_ID_TERTIARY_TDM_RX_5:
slots = tdm_slot[TDM_TERT].num;
slot_width = tdm_slot[TDM_TERT].width;
slot_offset = tdm_rx_slot_offset[TDM_TERT][TDM_5];
+ tdm_interface = TDM_TERT;
break;
case AFE_PORT_ID_TERTIARY_TDM_RX_6:
slots = tdm_slot[TDM_TERT].num;
slot_width = tdm_slot[TDM_TERT].width;
slot_offset = tdm_rx_slot_offset[TDM_TERT][TDM_6];
+ tdm_interface = TDM_TERT;
break;
case AFE_PORT_ID_TERTIARY_TDM_RX_7:
slots = tdm_slot[TDM_TERT].num;
slot_width = tdm_slot[TDM_TERT].width;
slot_offset = tdm_rx_slot_offset[TDM_TERT][TDM_7];
+ tdm_interface = TDM_TERT;
break;
case AFE_PORT_ID_TERTIARY_TDM_TX:
slots = tdm_slot[TDM_TERT].num;
slot_width = tdm_slot[TDM_TERT].width;
slot_offset = tdm_tx_slot_offset[TDM_TERT][TDM_0];
+ tdm_interface = TDM_TERT;
break;
case AFE_PORT_ID_TERTIARY_TDM_TX_1:
slots = tdm_slot[TDM_TERT].num;
slot_width = tdm_slot[TDM_TERT].width;
slot_offset = tdm_tx_slot_offset[TDM_TERT][TDM_1];
+ tdm_interface = TDM_TERT;
break;
case AFE_PORT_ID_TERTIARY_TDM_TX_2:
slots = tdm_slot[TDM_TERT].num;
slot_width = tdm_slot[TDM_TERT].width;
slot_offset = tdm_tx_slot_offset[TDM_TERT][TDM_2];
+ tdm_interface = TDM_TERT;
break;
case AFE_PORT_ID_TERTIARY_TDM_TX_3:
slots = tdm_slot[TDM_TERT].num;
slot_width = tdm_slot[TDM_TERT].width;
slot_offset = tdm_tx_slot_offset[TDM_TERT][TDM_3];
+ tdm_interface = TDM_TERT;
break;
case AFE_PORT_ID_TERTIARY_TDM_TX_4:
slots = tdm_slot[TDM_TERT].num;
slot_width = tdm_slot[TDM_TERT].width;
slot_offset = tdm_tx_slot_offset[TDM_TERT][TDM_4];
+ tdm_interface = TDM_TERT;
break;
case AFE_PORT_ID_TERTIARY_TDM_TX_5:
slots = tdm_slot[TDM_TERT].num;
slot_width = tdm_slot[TDM_TERT].width;
slot_offset = tdm_tx_slot_offset[TDM_TERT][TDM_5];
+ tdm_interface = TDM_TERT;
break;
case AFE_PORT_ID_TERTIARY_TDM_TX_6:
slots = tdm_slot[TDM_TERT].num;
slot_width = tdm_slot[TDM_TERT].width;
slot_offset = tdm_tx_slot_offset[TDM_TERT][TDM_6];
+ tdm_interface = TDM_TERT;
break;
case AFE_PORT_ID_TERTIARY_TDM_TX_7:
slots = tdm_slot[TDM_TERT].num;
slot_width = tdm_slot[TDM_TERT].width;
slot_offset = tdm_tx_slot_offset[TDM_TERT][TDM_7];
+ tdm_interface = TDM_TERT;
break;
case AFE_PORT_ID_QUATERNARY_TDM_RX:
slots = tdm_slot[TDM_QUAT].num;
slot_width = tdm_slot[TDM_QUAT].width;
slot_offset = tdm_rx_slot_offset[TDM_QUAT][TDM_0];
+ tdm_interface = TDM_QUAT;
break;
case AFE_PORT_ID_QUATERNARY_TDM_RX_1:
slots = tdm_slot[TDM_QUAT].num;
slot_width = tdm_slot[TDM_QUAT].width;
slot_offset = tdm_rx_slot_offset[TDM_QUAT][TDM_1];
+ tdm_interface = TDM_QUAT;
break;
case AFE_PORT_ID_QUATERNARY_TDM_RX_2:
slots = tdm_slot[TDM_QUAT].num;
slot_width = tdm_slot[TDM_QUAT].width;
slot_offset = tdm_rx_slot_offset[TDM_QUAT][TDM_2];
+ tdm_interface = TDM_QUAT;
break;
case AFE_PORT_ID_QUATERNARY_TDM_RX_3:
slots = tdm_slot[TDM_QUAT].num;
slot_width = tdm_slot[TDM_QUAT].width;
slot_offset = tdm_rx_slot_offset[TDM_QUAT][TDM_3];
+ tdm_interface = TDM_QUAT;
break;
case AFE_PORT_ID_QUATERNARY_TDM_RX_4:
slots = tdm_slot[TDM_QUAT].num;
slot_width = tdm_slot[TDM_QUAT].width;
slot_offset = tdm_rx_slot_offset[TDM_QUAT][TDM_4];
+ tdm_interface = TDM_QUAT;
break;
case AFE_PORT_ID_QUATERNARY_TDM_RX_5:
slots = tdm_slot[TDM_QUAT].num;
slot_width = tdm_slot[TDM_QUAT].width;
slot_offset = tdm_rx_slot_offset[TDM_QUAT][TDM_5];
+ tdm_interface = TDM_QUAT;
break;
case AFE_PORT_ID_QUATERNARY_TDM_RX_6:
slots = tdm_slot[TDM_QUAT].num;
slot_width = tdm_slot[TDM_QUAT].width;
slot_offset = tdm_rx_slot_offset[TDM_QUAT][TDM_6];
+ tdm_interface = TDM_QUAT;
break;
case AFE_PORT_ID_QUATERNARY_TDM_RX_7:
slots = tdm_slot[TDM_QUAT].num;
slot_width = tdm_slot[TDM_QUAT].width;
slot_offset = tdm_rx_slot_offset[TDM_QUAT][TDM_7];
+ tdm_interface = TDM_QUAT;
break;
case AFE_PORT_ID_QUATERNARY_TDM_TX:
slots = tdm_slot[TDM_QUAT].num;
slot_width = tdm_slot[TDM_QUAT].width;
slot_offset = tdm_tx_slot_offset[TDM_QUAT][TDM_0];
+ tdm_interface = TDM_QUAT;
break;
case AFE_PORT_ID_QUATERNARY_TDM_TX_1:
slots = tdm_slot[TDM_QUAT].num;
slot_width = tdm_slot[TDM_QUAT].width;
slot_offset = tdm_tx_slot_offset[TDM_QUAT][TDM_1];
+ tdm_interface = TDM_QUAT;
break;
case AFE_PORT_ID_QUATERNARY_TDM_TX_2:
slots = tdm_slot[TDM_QUAT].num;
slot_width = tdm_slot[TDM_QUAT].width;
slot_offset = tdm_tx_slot_offset[TDM_QUAT][TDM_2];
+ tdm_interface = TDM_QUAT;
break;
case AFE_PORT_ID_QUATERNARY_TDM_TX_3:
slots = tdm_slot[TDM_QUAT].num;
slot_width = tdm_slot[TDM_QUAT].width;
slot_offset = tdm_tx_slot_offset[TDM_QUAT][TDM_3];
+ tdm_interface = TDM_QUAT;
break;
case AFE_PORT_ID_QUATERNARY_TDM_TX_4:
slots = tdm_slot[TDM_QUAT].num;
slot_width = tdm_slot[TDM_QUAT].width;
slot_offset = tdm_tx_slot_offset[TDM_QUAT][TDM_4];
+ tdm_interface = TDM_QUAT;
break;
case AFE_PORT_ID_QUATERNARY_TDM_TX_5:
slots = tdm_slot[TDM_QUAT].num;
slot_width = tdm_slot[TDM_QUAT].width;
slot_offset = tdm_tx_slot_offset[TDM_QUAT][TDM_5];
+ tdm_interface = TDM_QUAT;
break;
case AFE_PORT_ID_QUATERNARY_TDM_TX_6:
slots = tdm_slot[TDM_QUAT].num;
slot_width = tdm_slot[TDM_QUAT].width;
slot_offset = tdm_tx_slot_offset[TDM_QUAT][TDM_6];
+ tdm_interface = TDM_QUAT;
break;
case AFE_PORT_ID_QUATERNARY_TDM_TX_7:
slots = tdm_slot[TDM_QUAT].num;
slot_width = tdm_slot[TDM_QUAT].width;
slot_offset = tdm_tx_slot_offset[TDM_QUAT][TDM_7];
+ tdm_interface = TDM_QUAT;
break;
case AFE_PORT_ID_QUINARY_TDM_RX:
slots = tdm_slot[TDM_QUIN].num;
slot_width = tdm_slot[TDM_QUIN].width;
slot_offset = tdm_rx_slot_offset[TDM_QUIN][TDM_0];
+ tdm_interface = TDM_QUIN;
break;
case AFE_PORT_ID_QUINARY_TDM_RX_1:
slots = tdm_slot[TDM_QUIN].num;
slot_width = tdm_slot[TDM_QUIN].width;
slot_offset = tdm_rx_slot_offset[TDM_QUIN][TDM_1];
+ tdm_interface = TDM_QUIN;
break;
case AFE_PORT_ID_QUINARY_TDM_RX_2:
slots = tdm_slot[TDM_QUIN].num;
slot_width = tdm_slot[TDM_QUIN].width;
slot_offset = tdm_rx_slot_offset[TDM_QUIN][TDM_2];
+ tdm_interface = TDM_QUIN;
break;
case AFE_PORT_ID_QUINARY_TDM_RX_3:
slots = tdm_slot[TDM_QUIN].num;
slot_width = tdm_slot[TDM_QUIN].width;
slot_offset = tdm_rx_slot_offset[TDM_QUIN][TDM_3];
+ tdm_interface = TDM_QUIN;
break;
case AFE_PORT_ID_QUINARY_TDM_RX_4:
slots = tdm_slot[TDM_QUIN].num;
slot_width = tdm_slot[TDM_QUIN].width;
slot_offset = tdm_rx_slot_offset[TDM_QUIN][TDM_4];
+ tdm_interface = TDM_QUIN;
break;
case AFE_PORT_ID_QUINARY_TDM_RX_5:
slots = tdm_slot[TDM_QUIN].num;
slot_width = tdm_slot[TDM_QUIN].width;
slot_offset = tdm_rx_slot_offset[TDM_QUIN][TDM_5];
+ tdm_interface = TDM_QUIN;
break;
case AFE_PORT_ID_QUINARY_TDM_RX_6:
slots = tdm_slot[TDM_QUIN].num;
slot_width = tdm_slot[TDM_QUIN].width;
slot_offset = tdm_rx_slot_offset[TDM_QUIN][TDM_6];
+ tdm_interface = TDM_QUIN;
break;
case AFE_PORT_ID_QUINARY_TDM_RX_7:
slots = tdm_slot[TDM_QUIN].num;
slot_width = tdm_slot[TDM_QUIN].width;
slot_offset = tdm_rx_slot_offset[TDM_QUIN][TDM_7];
+ tdm_interface = TDM_QUIN;
break;
case AFE_PORT_ID_QUINARY_TDM_TX:
slots = tdm_slot[TDM_QUIN].num;
slot_width = tdm_slot[TDM_QUIN].width;
slot_offset = tdm_tx_slot_offset[TDM_QUIN][TDM_0];
+ tdm_interface = TDM_QUIN;
break;
case AFE_PORT_ID_QUINARY_TDM_TX_1:
slots = tdm_slot[TDM_QUIN].num;
slot_width = tdm_slot[TDM_QUIN].width;
slot_offset = tdm_tx_slot_offset[TDM_QUIN][TDM_1];
+ tdm_interface = TDM_QUIN;
break;
case AFE_PORT_ID_QUINARY_TDM_TX_2:
slots = tdm_slot[TDM_QUIN].num;
slot_width = tdm_slot[TDM_QUIN].width;
slot_offset = tdm_tx_slot_offset[TDM_QUIN][TDM_2];
+ tdm_interface = TDM_QUIN;
break;
case AFE_PORT_ID_QUINARY_TDM_TX_3:
slots = tdm_slot[TDM_QUIN].num;
slot_width = tdm_slot[TDM_QUIN].width;
slot_offset = tdm_tx_slot_offset[TDM_QUIN][TDM_3];
+ tdm_interface = TDM_QUIN;
break;
case AFE_PORT_ID_QUINARY_TDM_TX_4:
slots = tdm_slot[TDM_QUIN].num;
slot_width = tdm_slot[TDM_QUIN].width;
slot_offset = tdm_tx_slot_offset[TDM_QUIN][TDM_4];
+ tdm_interface = TDM_QUIN;
break;
case AFE_PORT_ID_QUINARY_TDM_TX_5:
slots = tdm_slot[TDM_QUIN].num;
slot_width = tdm_slot[TDM_QUIN].width;
slot_offset = tdm_tx_slot_offset[TDM_QUIN][TDM_5];
+ tdm_interface = TDM_QUIN;
break;
case AFE_PORT_ID_QUINARY_TDM_TX_6:
slots = tdm_slot[TDM_QUIN].num;
slot_width = tdm_slot[TDM_QUIN].width;
slot_offset = tdm_tx_slot_offset[TDM_QUIN][TDM_6];
+ tdm_interface = TDM_QUIN;
break;
case AFE_PORT_ID_QUINARY_TDM_TX_7:
slots = tdm_slot[TDM_QUIN].num;
slot_width = tdm_slot[TDM_QUIN].width;
slot_offset = tdm_tx_slot_offset[TDM_QUIN][TDM_7];
+ tdm_interface = TDM_QUIN;
break;
default:
pr_err("%s: dai id 0x%x not supported\n",
@@ -1083,7 +1230,10 @@
return -EINVAL;
}
- slot_mask = tdm_param_set_slot_mask(slots);
+ slot_mask = tdm_param_set_slot_mask(cpu_dai->id,
+ slot_width, slots, tdm_interface);
+ pr_debug("%s: slot_mask :%x\n", __func__, slot_mask);
+
if (!slot_mask) {
pr_err("%s: invalid slot_mask 0x%x\n",
__func__, slot_mask);
@@ -1108,6 +1258,7 @@
goto end;
}
} else if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {
+
ret = snd_soc_dai_set_tdm_slot(cpu_dai, slot_mask, 0,
slots, slot_width);
if (ret < 0) {
@@ -3094,18 +3245,45 @@
SOC_ENUM_EXT("PRI_TDM_TX_0 SampleRate", tdm_tx_sample_rate,
tdm_tx_sample_rate_get,
tdm_tx_sample_rate_put),
+ SOC_ENUM_EXT("PRI_TDM_TX_1 SampleRate", tdm_tx_sample_rate,
+ tdm_tx_sample_rate_get,
+ tdm_tx_sample_rate_put),
+ SOC_ENUM_EXT("PRI_TDM_TX_2 SampleRate", tdm_tx_sample_rate,
+ tdm_tx_sample_rate_get,
+ tdm_tx_sample_rate_put),
+ SOC_ENUM_EXT("PRI_TDM_TX_3 SampleRate", tdm_tx_sample_rate,
+ tdm_tx_sample_rate_get,
+ tdm_tx_sample_rate_put),
SOC_ENUM_EXT("PRI_TDM_RX_0 Format", tdm_rx_format,
tdm_rx_format_get,
tdm_rx_format_put),
SOC_ENUM_EXT("PRI_TDM_TX_0 Format", tdm_tx_format,
tdm_tx_format_get,
tdm_tx_format_put),
+ SOC_ENUM_EXT("PRI_TDM_TX_1 Format", tdm_tx_format,
+ tdm_tx_format_get,
+ tdm_tx_format_put),
+ SOC_ENUM_EXT("PRI_TDM_TX_2 Format", tdm_tx_format,
+ tdm_tx_format_get,
+ tdm_tx_format_put),
+ SOC_ENUM_EXT("PRI_TDM_TX_3 Format", tdm_tx_format,
+ tdm_tx_format_get,
+ tdm_tx_format_put),
SOC_ENUM_EXT("PRI_TDM_RX_0 Channels", tdm_rx_chs,
tdm_rx_ch_get,
tdm_rx_ch_put),
SOC_ENUM_EXT("PRI_TDM_TX_0 Channels", tdm_tx_chs,
tdm_tx_ch_get,
tdm_tx_ch_put),
+ SOC_ENUM_EXT("PRI_TDM_TX_1 Channels", tdm_tx_chs,
+ tdm_tx_ch_get,
+ tdm_tx_ch_put),
+ SOC_ENUM_EXT("PRI_TDM_TX_2 Channels", tdm_tx_chs,
+ tdm_tx_ch_get,
+ tdm_tx_ch_put),
+ SOC_ENUM_EXT("PRI_TDM_TX_3 Channels", tdm_tx_chs,
+ tdm_tx_ch_get,
+ tdm_tx_ch_put),
SOC_ENUM_EXT("SEC_TDM_RX_0 SampleRate", tdm_rx_sample_rate,
tdm_rx_sample_rate_get,
tdm_rx_sample_rate_put),
@@ -4751,7 +4929,21 @@
switch (port_id) {
case AFE_PORT_ID_PRIMARY_TDM_RX:
+ case AFE_PORT_ID_PRIMARY_TDM_RX_1:
+ case AFE_PORT_ID_PRIMARY_TDM_RX_2:
+ case AFE_PORT_ID_PRIMARY_TDM_RX_3:
+ case AFE_PORT_ID_PRIMARY_TDM_RX_4:
+ case AFE_PORT_ID_PRIMARY_TDM_RX_5:
+ case AFE_PORT_ID_PRIMARY_TDM_RX_6:
+ case AFE_PORT_ID_PRIMARY_TDM_RX_7:
case AFE_PORT_ID_PRIMARY_TDM_TX:
+ case AFE_PORT_ID_PRIMARY_TDM_TX_1:
+ case AFE_PORT_ID_PRIMARY_TDM_TX_2:
+ case AFE_PORT_ID_PRIMARY_TDM_TX_3:
+ case AFE_PORT_ID_PRIMARY_TDM_TX_4:
+ case AFE_PORT_ID_PRIMARY_TDM_TX_5:
+ case AFE_PORT_ID_PRIMARY_TDM_TX_6:
+ case AFE_PORT_ID_PRIMARY_TDM_TX_7:
tdm_mode = TDM_PRI;
break;
case AFE_PORT_ID_SECONDARY_TDM_RX:
diff --git a/asoc/sdm660-ext-dai-links.c b/asoc/sdm660-ext-dai-links.c
index 65d9161..2ad6e63 100644
--- a/asoc/sdm660-ext-dai-links.c
+++ b/asoc/sdm660-ext-dai-links.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2020, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -1419,6 +1419,48 @@
.ignore_suspend = 1,
},
{
+ .name = LPASS_BE_PRI_TDM_TX_1,
+ .stream_name = "Primary TDM1 Capture",
+ .cpu_dai_name = "msm-dai-q6-tdm.36867",
+ .platform_name = "msm-pcm-routing",
+ .codec_name = "msm-stub-codec.1",
+ .codec_dai_name = "msm-stub-tx1",
+ .no_pcm = 1,
+ .dpcm_capture = 1,
+ .id = MSM_BACKEND_DAI_PRI_TDM_TX_1,
+ .be_hw_params_fixup = msm_tdm_be_hw_params_fixup,
+ .ops = &msm_tdm_be_ops,
+ .ignore_suspend = 1,
+ },
+ {
+ .name = LPASS_BE_PRI_TDM_TX_2,
+ .stream_name = "Primary TDM2 Capture",
+ .cpu_dai_name = "msm-dai-q6-tdm.36869",
+ .platform_name = "msm-pcm-routing",
+ .codec_name = "msm-stub-codec.1",
+ .codec_dai_name = "msm-stub-tx2",
+ .no_pcm = 1,
+ .dpcm_capture = 1,
+ .id = MSM_BACKEND_DAI_PRI_TDM_TX_2,
+ .be_hw_params_fixup = msm_tdm_be_hw_params_fixup,
+ .ops = &msm_tdm_be_ops,
+ .ignore_suspend = 1,
+ },
+ {
+ .name = LPASS_BE_PRI_TDM_TX_3,
+ .stream_name = "Primary TDM3 Capture",
+ .cpu_dai_name = "msm-dai-q6-tdm.36871",
+ .platform_name = "msm-pcm-routing",
+ .codec_name = "msm-stub-codec.1",
+ .codec_dai_name = "msm-stub-tx3",
+ .no_pcm = 1,
+ .dpcm_capture = 1,
+ .id = MSM_BACKEND_DAI_PRI_TDM_TX_3,
+ .be_hw_params_fixup = msm_tdm_be_hw_params_fixup,
+ .ops = &msm_tdm_be_ops,
+ .ignore_suspend = 1,
+ },
+ {
.name = LPASS_BE_SEC_TDM_RX_0,
.stream_name = "Secondary TDM0 Playback",
.cpu_dai_name = "msm-dai-q6-tdm.36880",
diff --git a/config/msm8905auto.conf b/config/msm8905auto.conf
new file mode 100644
index 0000000..ebbe634
--- /dev/null
+++ b/config/msm8905auto.conf
@@ -0,0 +1,19 @@
+CONFIG_SND_SOC_MSM_QDSP6V2_INTF=m
+CONFIG_WCD9XXX_CODEC_CORE=m
+CONFIG_SND_SOC_QDSP6V2=m
+CONFIG_QTI_PP=m
+CONFIG_SND_SOC_MSM8909=m
+CONFIG_SND_SOC_ANALOG_CDC=m
+CONFIG_SND_SOC_DIGITAL_CDC_LEGACY=m
+CONFIG_SND_SOC_WCD9XXX_V2=m
+CONFIG_SND_SOC_WCD_MBHC=m
+CONFIG_SND_SOC_WCD_MBHC_LEGACY=m
+CONFIG_SND_SOC_MSM_STUB=m
+CONFIG_MSM_QDSP6_APRV3=m
+CONFIG_MSM_ADSP_LOADER=m
+CONFIG_MSM_QDSP6_NOTIFIER=m
+CONFIG_MSM_CDC_PINCTRL=m
+CONFIG_MSM_QDSP6_SSR=m
+CONFIG_SND_HWDEP_ROUTING=m
+CONFIG_SND_SOC_SDM660_CDC=m
+CONFIG_COMMON_CLK_MSM=m
diff --git a/config/msm8905autoconf.h b/config/msm8905autoconf.h
new file mode 100644
index 0000000..390baaa
--- /dev/null
+++ b/config/msm8905autoconf.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2020, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#define CONFIG_SND_SOC_MSM_HOSTLESS_PCM 1
+#define CONFIG_WCD9XXX_CODEC_CORE 1
+#define CONFIG_SND_SOC_QDSP6V2 1
+#define CONFIG_QTI_PP 1
+#define CONFIG_SND_SOC_MSM8909 1
+#define CONFIG_SND_SOC_ANALOG_CDC 1
+#define CONFIG_SND_SOC_DIGITAL_CDC_LEGACY 1
+#define CONFIG_SND_SOC_WCD9XXX_V2 1
+#define CONFIG_SND_SOC_WCD_MBHC 1
+#define CONFIG_SND_SOC_WCD_MBHC_LEGACY 1
+#define CONFIG_SND_SOC_MSM_STUB 1
+#define CONFIG_MSM_QDSP6_APRV3 1
+#define CONFIG_MSM_QDSP6_NOTIFIER 1
+#define CONFIG_MSM_QDSP6_SSR 1
+#define CONFIG_MSM_ADSP_LOADER 1
+#define CONFIG_MSM_CDC_PINCTRL 1
+#define CONFIG_SND_HWDEP_ROUTING 1
+#define CONFIG_SND_SOC_SDM660_CDC 1
+#define CONFIG_COMMON_CLK_MSM 1
diff --git a/dsp/Android.mk b/dsp/Android.mk
index cdea019..14a8ef0 100644
--- a/dsp/Android.mk
+++ b/dsp/Android.mk
@@ -15,11 +15,15 @@
AUDIO_SELECT := CONFIG_SND_SOC_SDM450=m
endif
-ifeq ($(call is-board-platform-in-list,msm8909),true)
+ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM_8909W)),true)
AUDIO_SELECT := CONFIG_SND_SOC_BG_8909=m
AUDIO_SELECT += CONFIG_SND_SOC_8909_DIG_CDC=m
endif
+ifeq ($(strip $(TARGET_ROARING_LIONUS)),true)
+AUDIO_SELECT += CONFIG_MSM_8905=m
+endif
+
AUDIO_CHIPSET := audio
# Build/Package only in case of supported target
ifeq ($(call is-board-platform-in-list,msm8909 msm8953 msm8937 sdm845 sdm710 qcs605),true)
diff --git a/dsp/Kbuild b/dsp/Kbuild
index 1a810e1..8ff6c4e 100644
--- a/dsp/Kbuild
+++ b/dsp/Kbuild
@@ -35,9 +35,16 @@
INCS += -include $(AUDIO_ROOT)/config/sdm450autoconf.h
endif
ifeq ($(CONFIG_ARCH_MSM8909), y)
- include $(AUDIO_ROOT)/config/msm8909auto.conf
- export
- INCS += -include $(AUDIO_ROOT)/config/msm8909autoconf.h
+ ifeq ($(CONFIG_MSM_BGCOM), y)
+ include $(AUDIO_ROOT)/config/msm8909auto.conf
+ export
+ INCS += -include $(AUDIO_ROOT)/config/msm8909autoconf.h
+ endif
+ ifeq ($(CONFIG_MSM_8905), m)
+ include $(AUDIO_ROOT)/config/msm8905auto.conf
+ export
+ INCS += -include $(AUDIO_ROOT)/config/msm8905autoconf.h
+ endif
endif
ifeq ($(CONFIG_ARCH_MSM8917), y)
include $(AUDIO_ROOT)/config/sdm450auto.conf
diff --git a/dsp/codecs/Android.mk b/dsp/codecs/Android.mk
index 86f3173..6802121 100644
--- a/dsp/codecs/Android.mk
+++ b/dsp/codecs/Android.mk
@@ -15,11 +15,15 @@
AUDIO_SELECT := CONFIG_SND_SOC_SDM450=m
endif
-ifeq ($(call is-board-platform-in-list,msm8909),true)
+ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM_8909W)),true)
AUDIO_SELECT += CONFIG_SND_SOC_BG_8909=m
AUDIO_SELECT += CONFIG_SND_SOC_8909_DIG_CDC=m
endif
+ifeq ($(strip $(TARGET_ROARING_LIONUS)),true)
+AUDIO_SELECT += CONFIG_MSM_8905=m
+endif
+
AUDIO_CHIPSET := audio
# Build/Package only in case of supported target
ifeq ($(call is-board-platform-in-list,msm8953 msm8937 sdm845 sdm710 qcs605),true)
diff --git a/dsp/codecs/Kbuild b/dsp/codecs/Kbuild
index 49d14d7..70ab624 100644
--- a/dsp/codecs/Kbuild
+++ b/dsp/codecs/Kbuild
@@ -36,9 +36,16 @@
INCS += -include $(AUDIO_ROOT)/config/sdm450autoconf.h
endif
ifeq ($(CONFIG_ARCH_MSM8909), y)
- include $(AUDIO_ROOT)/config/msm8909auto.conf
- export
- INCS += -include $(AUDIO_ROOT)/config/msm8909autoconf.h
+ ifeq ($(CONFIG_MSM_BGCOM), y)
+ include $(AUDIO_ROOT)/config/msm8909auto.conf
+ export
+ INCS += -include $(AUDIO_ROOT)/config/msm8909autoconf.h
+ endif
+ ifeq ($(CONFIG_MSM_8905), m)
+ include $(AUDIO_ROOT)/config/msm8905auto.conf
+ export
+ INCS += -include $(AUDIO_ROOT)/config/msm8905autoconf.h
+ endif
endif
ifeq ($(CONFIG_ARCH_MSM8917), y)
include $(AUDIO_ROOT)/config/sdm450auto.conf
diff --git a/ipc/Android.mk b/ipc/Android.mk
index 132aedc..b053cfd 100644
--- a/ipc/Android.mk
+++ b/ipc/Android.mk
@@ -15,11 +15,15 @@
AUDIO_SELECT := CONFIG_SND_SOC_SDM450=m
endif
-ifeq ($(call is-board-platform-in-list,msm8909),true)
+ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM_8909W)),true)
AUDIO_SELECT += CONFIG_SND_SOC_BG_8909=m
AUDIO_SELECT += CONFIG_MSM_BG_GLINK=m
endif
+ifeq ($(strip $(TARGET_ROARING_LIONUS)),true)
+AUDIO_SELECT += CONFIG_MSM_8905=m
+endif
+
AUDIO_CHIPSET := audio
# Build/Package only in case of supported target
ifeq ($(call is-board-platform-in-list,msm8909 msm8953 msm8937 sdm845 sdm710 qcs605),true)
diff --git a/ipc/Kbuild b/ipc/Kbuild
index b2c2a72..2d0c915 100644
--- a/ipc/Kbuild
+++ b/ipc/Kbuild
@@ -57,9 +57,16 @@
INCS += -include $(AUDIO_ROOT)/config/sdm450autoconf.h
endif
ifeq ($(CONFIG_ARCH_MSM8909), y)
- include $(AUDIO_ROOT)/config/msm8909auto.conf
- export
- INCS += -include $(AUDIO_ROOT)/config/msm8909autoconf.h
+ ifeq ($(CONFIG_MSM_BGCOM), y)
+ include $(AUDIO_ROOT)/config/msm8909auto.conf
+ export
+ INCS += -include $(AUDIO_ROOT)/config/msm8909autoconf.h
+ endif
+ ifeq ($(CONFIG_MSM_8905), m)
+ include $(AUDIO_ROOT)/config/msm8905auto.conf
+ export
+ INCS += -include $(AUDIO_ROOT)/config/msm8905autoconf.h
+ endif
endif
ifeq ($(CONFIG_ARCH_MSM8917), y)
include $(AUDIO_ROOT)/config/sdm450auto.conf
diff --git a/soc/Android.mk b/soc/Android.mk
index 0f893f9..e75cef2 100644
--- a/soc/Android.mk
+++ b/soc/Android.mk
@@ -15,11 +15,15 @@
AUDIO_SELECT := CONFIG_SND_SOC_SDM450=m
endif
-ifeq ($(call is-board-platform-in-list,msm8909),true)
+ifeq ($(strip $(AUDIO_FEATURE_ENABLED_DLKM_8909W)),true)
AUDIO_SELECT += CONFIG_SND_SOC_BG_8909=m
AUDIO_SELECT += CONFIG_SND_SOC_8909_DIG_CDC=m
endif
+ifeq ($(strip $(TARGET_ROARING_LIONUS)),true)
+AUDIO_SELECT += CONFIG_MSM_8905=m
+endif
+
AUDIO_CHIPSET := audio
# Build/Package only in case of supported target
ifeq ($(call is-board-platform-in-list,msm8909 msm8953 msm8937 sdm845 sdm710 qcs605),true)
diff --git a/soc/Kbuild b/soc/Kbuild
index 69dadc2..7a0ed04 100644
--- a/soc/Kbuild
+++ b/soc/Kbuild
@@ -35,9 +35,16 @@
INCS += -include $(AUDIO_ROOT)/config/sdm450autoconf.h
endif
ifeq ($(CONFIG_ARCH_MSM8909), y)
- include $(AUDIO_ROOT)/config/msm8909auto.conf
- export
- INCS += -include $(AUDIO_ROOT)/config/msm8909autoconf.h
+ ifeq ($(CONFIG_MSM_BGCOM), y)
+ include $(AUDIO_ROOT)/config/msm8909auto.conf
+ export
+ INCS += -include $(AUDIO_ROOT)/config/msm8909autoconf.h
+ endif
+ ifeq ($(CONFIG_MSM_8905), m)
+ include $(AUDIO_ROOT)/config/msm8905auto.conf
+ export
+ INCS += -include $(AUDIO_ROOT)/config/msm8905autoconf.h
+ endif
endif
ifeq ($(CONFIG_ARCH_MSM8917), y)
include $(AUDIO_ROOT)/config/sdm450auto.conf