samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

asoc: lpass_cdc: Program FS_CTL reg based on input used

Browse Source 
Program WSA_DATA_FS_CTL reg based on input used(wsa rx/wsa2 rx)
and also update the channelmap based on mixer cntl.

Change-Id: I0cfac1d9b25dd1211824bcea2753bb6c1131f767
Signed-off-by: Ganapathiraju Sarath Varma <quic_ganavarm@quicinc.com>
This commit is contained in:
Ganapathiraju Sarath Varma
2023-01-11 14:35:29 +05:30
committed by Gerrit - the friendly Code Review server
parent 0709b47e97
commit d41a40721c
2 changed files with 102 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
asoc/codecs/lpass-cdc/lpass-cdc-wsa-macro.c
View File

@@ -314,10 +314,12 @@ struct lpass_cdc_wsa_macro_priv {
u32 wsa_sys_gain[2 * (LPASS_CDC_WSA_MACRO_RX1 + 1)]; u32 wsa_sys_gain[2 * (LPASS_CDC_WSA_MACRO_RX1 + 1)];
u32 wsa_bat_cfg[LPASS_CDC_WSA_MACRO_RX1 + 1]; u32 wsa_bat_cfg[LPASS_CDC_WSA_MACRO_RX1 + 1];
u32 wsa_rload[LPASS_CDC_WSA_MACRO_RX1 + 1]; u32 wsa_rload[LPASS_CDC_WSA_MACRO_RX1 + 1];
u32 wsa_fs_ctl_reg;
u8 idle_detect_en; u8 idle_detect_en;
int noise_gate_mode; int noise_gate_mode;
bool pre_dev_up; bool pre_dev_up;
int pbr_clk_users; int pbr_clk_users;
char __iomem *wsa_fs_reg_base;
}; };
static struct snd_soc_dai_driver lpass_cdc_wsa_macro_dai[]; static struct snd_soc_dai_driver lpass_cdc_wsa_macro_dai[];
@@ -590,7 +592,7 @@ static int lpass_cdc_wsa_macro_set_prim_interpolator_rate(struct snd_soc_dai *da
LPASS_CDC_WSA_MACRO_RX_MAX) { LPASS_CDC_WSA_MACRO_RX_MAX) {
int_1_mix1_inp = port; int_1_mix1_inp = port;
if ((int_1_mix1_inp < LPASS_CDC_WSA_MACRO_RX0) || if ((int_1_mix1_inp < LPASS_CDC_WSA_MACRO_RX0) ||
(int_1_mix1_inp > LPASS_CDC_WSA_MACRO_RX_MIX1)) { (int_1_mix1_inp > LPASS_CDC_WSA_MACRO_RX_MAX)) {
dev_err_ratelimited(wsa_dev, dev_err_ratelimited(wsa_dev,
"%s: Invalid RX port, Dai ID is %d\n", "%s: Invalid RX port, Dai ID is %d\n",
__func__, dai->id); __func__, dai->id);
@@ -900,6 +902,7 @@ static int lpass_cdc_wsa_macro_mute_stream(struct snd_soc_dai *dai, int mute, in
struct device *wsa_dev = NULL; struct device *wsa_dev = NULL;
struct lpass_cdc_wsa_macro_priv *wsa_priv = NULL; struct lpass_cdc_wsa_macro_priv *wsa_priv = NULL;
bool adie_lb = false; bool adie_lb = false;
uint32_t temp;
if (mute) if (mute)
return 0; return 0;
@@ -912,10 +915,23 @@ static int lpass_cdc_wsa_macro_mute_stream(struct snd_soc_dai *dai, int mute, in
lpass_cdc_wsa_pa_on(wsa_dev, adie_lb); lpass_cdc_wsa_pa_on(wsa_dev, adie_lb);
lpass_cdc_wsa_unmute_interpolator(dai); lpass_cdc_wsa_unmute_interpolator(dai);
lpass_cdc_wsa_macro_enable_vi_decimator(component); lpass_cdc_wsa_macro_enable_vi_decimator(component);
break; break;
default: default:
break; break;
} }
if ((test_bit(LPASS_CDC_WSA_MACRO_RX4,
&wsa_priv->active_ch_mask[dai->id]) ||
test_bit(LPASS_CDC_WSA_MACRO_RX5,
&wsa_priv->active_ch_mask[dai->id])) &&
wsa_priv->wsa_fs_reg_base) {
temp = ioread32(wsa_priv->wsa_fs_reg_base);
if (temp != 0) {
temp = 0;
iowrite32(temp, wsa_priv->wsa_fs_reg_base);
}
dev_dbg(wsa_dev, "%s: LPASS_WSA_FS_CTL : %d", __func__, temp);
}
return 0; return 0;
} }
@@ -3847,6 +3863,17 @@ static int lpass_cdc_wsa_macro_probe(struct platform_device *pdev)
__func__, "reg"); __func__, "reg");
return ret; return ret;
} }
ret = of_property_read_u32(pdev->dev.of_node, "wsa_data_fs_ctl_reg",
&wsa_priv->wsa_fs_ctl_reg);
if (ret) {
dev_dbg(&pdev->dev, "%s: error finding %s entry in dt\n",
__func__, "wsa_data_fs_ctl_reg");
}
if (!wsa_priv->wsa_fs_reg_base && wsa_priv->wsa_fs_ctl_reg)
wsa_priv->wsa_fs_reg_base = devm_ioremap(&pdev->dev,
wsa_priv->wsa_fs_ctl_reg, LPASS_CDC_WSA_MACRO_MAX_OFFSET);
if (of_find_property(pdev->dev.of_node, is_used_wsa_swr_gpio_dt, if (of_find_property(pdev->dev.of_node, is_used_wsa_swr_gpio_dt,
NULL)) { NULL)) {
ret = of_property_read_u32(pdev->dev.of_node, ret = of_property_read_u32(pdev->dev.of_node,

80
asoc/codecs/lpass-cdc/lpass-cdc-wsa2-macro.c
View File

@@ -314,10 +314,13 @@ struct lpass_cdc_wsa2_macro_priv {
u32 wsa2_sys_gain[2 * (LPASS_CDC_WSA2_MACRO_RX1 + 1)]; u32 wsa2_sys_gain[2 * (LPASS_CDC_WSA2_MACRO_RX1 + 1)];
u32 wsa2_bat_cfg[LPASS_CDC_WSA2_MACRO_RX1 + 1]; u32 wsa2_bat_cfg[LPASS_CDC_WSA2_MACRO_RX1 + 1];
u32 wsa2_rload[LPASS_CDC_WSA2_MACRO_RX1 + 1]; u32 wsa2_rload[LPASS_CDC_WSA2_MACRO_RX1 + 1];
u32 wsa2_fs_ctl_reg;
u8 idle_detect_en; u8 idle_detect_en;
int noise_gate_mode; int noise_gate_mode;
bool pre_dev_up; bool pre_dev_up;
int pbr_clk_users; int pbr_clk_users;
char __iomem *wsa2_fs_reg_base;
bool wsa2_2ch_dma_enable;
}; };
static struct snd_soc_dai_driver lpass_cdc_wsa2_macro_dai[]; static struct snd_soc_dai_driver lpass_cdc_wsa2_macro_dai[];
@@ -590,7 +593,7 @@ static int lpass_cdc_wsa2_macro_set_prim_interpolator_rate(struct snd_soc_dai *d
LPASS_CDC_WSA2_MACRO_RX_MAX) { LPASS_CDC_WSA2_MACRO_RX_MAX) {
int_1_mix1_inp = port; int_1_mix1_inp = port;
if ((int_1_mix1_inp < LPASS_CDC_WSA2_MACRO_RX0) || if ((int_1_mix1_inp < LPASS_CDC_WSA2_MACRO_RX0) ||
(int_1_mix1_inp > LPASS_CDC_WSA2_MACRO_RX_MIX1)) { (int_1_mix1_inp >= LPASS_CDC_WSA2_MACRO_RX_MAX)) {
dev_err_ratelimited(wsa2_dev, dev_err_ratelimited(wsa2_dev,
"%s: Invalid RX port, Dai ID is %d\n", "%s: Invalid RX port, Dai ID is %d\n",
__func__, dai->id); __func__, dai->id);
@@ -831,11 +834,13 @@ static int lpass_cdc_wsa2_macro_get_channel_map(struct snd_soc_dai *dai,
if (++cnt == LPASS_CDC_WSA2_MACRO_MAX_DMA_CH_PER_PORT) if (++cnt == LPASS_CDC_WSA2_MACRO_MAX_DMA_CH_PER_PORT)
break; break;
} }
if (mask & 0x30) /* consider WSA2 Backend is used when 2ch_dma is enabled
mask = mask >> 0x4; * and doesn't require channel mask shift
if (mask & 0x03) */
mask = mask << 0x2; if (!wsa2_priv->wsa2_2ch_dma_enable) {
if (mask & 0x03)
mask = mask << 0x2;
}
*tx_slot = mask; *tx_slot = mask;
*tx_num = cnt; *tx_num = cnt;
break; break;
@@ -853,7 +858,7 @@ static int lpass_cdc_wsa2_macro_get_channel_map(struct snd_soc_dai *dai,
} }
if (mask & 0x30) if (mask & 0x30)
mask = mask >> 0x4; mask = mask >> 0x4;
if (mask & 0x03) else
mask = mask << 0x2; mask = mask << 0x2;
*rx_slot = mask; *rx_slot = mask;
*rx_num = cnt; *rx_num = cnt;
@@ -873,7 +878,7 @@ static int lpass_cdc_wsa2_macro_get_channel_map(struct snd_soc_dai *dai,
*tx_num = cnt; *tx_num = cnt;
break; break;
default: default:
dev_err_ratelimited(wsa2_dev, "%s: Invalid AIF\n", __func__); dev_err(wsa2_dev, "%s: Invalid AIF\n", __func__);
break; break;
} }
return 0; return 0;
@@ -904,6 +909,8 @@ static int lpass_cdc_wsa2_macro_mute_stream(struct snd_soc_dai *dai, int mute, i
struct snd_soc_component *component = dai->component; struct snd_soc_component *component = dai->component;
struct device *wsa2_dev = NULL; struct device *wsa2_dev = NULL;
struct lpass_cdc_wsa2_macro_priv *wsa2_priv = NULL; struct lpass_cdc_wsa2_macro_priv *wsa2_priv = NULL;
uint32_t temp;
bool adie_lb = false; bool adie_lb = false;
if (mute) if (mute)
@@ -921,6 +928,20 @@ static int lpass_cdc_wsa2_macro_mute_stream(struct snd_soc_dai *dai, int mute, i
default: default:
break; break;
} }
if ((test_bit(LPASS_CDC_WSA2_MACRO_RX4,
&wsa2_priv->active_ch_mask[dai->id]) ||
test_bit(LPASS_CDC_WSA2_MACRO_RX5,
&wsa2_priv->active_ch_mask[dai->id])) &&
wsa2_priv->wsa2_fs_reg_base) {
temp = ioread32(wsa2_priv->wsa2_fs_reg_base);
if (temp != 1) {
temp = 1;
iowrite32(temp, wsa2_priv->wsa2_fs_reg_base);
}
dev_dbg(wsa2_dev, "%s: LPASS_WSA_FS_CTL : %d", __func__, temp);
}
return 0; return 0;
} }
@@ -2650,6 +2671,35 @@ static int lpass_cdc_wsa2_macro_pbr_enable_put(struct snd_kcontrol *kcontrol,
} }
static int lpass_cdc_wsa2_macro_2ch_dma_enable_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_component *component =
snd_soc_kcontrol_component(kcontrol);
struct device *wsa2_dev = NULL;
struct lpass_cdc_wsa2_macro_priv *wsa2_priv = NULL;
if (!lpass_cdc_wsa2_macro_get_data(component, &wsa2_dev, &wsa2_priv, __func__))
return -EINVAL;
ucontrol->value.integer.value[0] = wsa2_priv->wsa2_2ch_dma_enable;
return 0;
}
static int lpass_cdc_wsa2_macro_2ch_dma_enable_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_component *component =
snd_soc_kcontrol_component(kcontrol);
struct device *wsa2_dev = NULL;
struct lpass_cdc_wsa2_macro_priv *wsa2_priv = NULL;
if (!lpass_cdc_wsa2_macro_get_data(component, &wsa2_dev, &wsa2_priv, __func__))
return -EINVAL;
wsa2_priv->wsa2_2ch_dma_enable = ucontrol->value.integer.value[0];
return 0;
}
static const struct snd_kcontrol_new lpass_cdc_wsa2_macro_snd_controls[] = { static const struct snd_kcontrol_new lpass_cdc_wsa2_macro_snd_controls[] = {
SOC_ENUM_EXT("WSA2_GSM mode Enable", lpass_cdc_wsa2_macro_vbat_bcl_gsm_mode_enum, SOC_ENUM_EXT("WSA2_GSM mode Enable", lpass_cdc_wsa2_macro_vbat_bcl_gsm_mode_enum,
@@ -2704,6 +2754,9 @@ static const struct snd_kcontrol_new lpass_cdc_wsa2_macro_snd_controls[] = {
SOC_SINGLE_EXT("WSA2 PBR Enable", SND_SOC_NOPM, 0, 1, SOC_SINGLE_EXT("WSA2 PBR Enable", SND_SOC_NOPM, 0, 1,
0, lpass_cdc_wsa2_macro_pbr_enable_get, 0, lpass_cdc_wsa2_macro_pbr_enable_get,
lpass_cdc_wsa2_macro_pbr_enable_put), lpass_cdc_wsa2_macro_pbr_enable_put),
SOC_SINGLE_EXT("WSA2 2CH_DMA ENABLE", SND_SOC_NOPM, 0, 1,
0, lpass_cdc_wsa2_macro_2ch_dma_enable_get,
lpass_cdc_wsa2_macro_2ch_dma_enable_put),
}; };
static const struct soc_enum rx_mux_enum = static const struct soc_enum rx_mux_enum =
@@ -3851,6 +3904,17 @@ static int lpass_cdc_wsa2_macro_probe(struct platform_device *pdev)
__func__, "reg"); __func__, "reg");
return ret; return ret;
} }
ret = of_property_read_u32(pdev->dev.of_node, "wsa_data_fs_ctl_reg",
&wsa2_priv->wsa2_fs_ctl_reg);
if (ret) {
dev_dbg(&pdev->dev, "%s: error finding %s entry in dt\n",
__func__, "wsa_data_fs_ctl_reg");
}
if (!wsa2_priv->wsa2_fs_reg_base && wsa2_priv->wsa2_fs_ctl_reg)
wsa2_priv->wsa2_fs_reg_base = devm_ioremap(&pdev->dev,
wsa2_priv->wsa2_fs_ctl_reg, LPASS_CDC_WSA2_MACRO_MAX_OFFSET);
if (of_find_property(pdev->dev.of_node, is_used_wsa2_swr_gpio_dt, if (of_find_property(pdev->dev.of_node, is_used_wsa2_swr_gpio_dt,
NULL)) { NULL)) {
ret = of_property_read_u32(pdev->dev.of_node, ret = of_property_read_u32(pdev->dev.of_node,