asoc: lahaina: fractional sample rate support for TDM
Fractional sample rate doesn't work due to GSDC is not enabled. Add vote for audio hw clk for fractional sample rate. Change-Id: I12d5315b0f346d54e7f384b2e38bbfd0f35199ff
This commit is contained in:
parent
a61f696990
commit
e30fce1a7d
4 changed files with 167 additions and 47 deletions
2
asoc/Kbuild
Executable file → Normal file
2
asoc/Kbuild
Executable file → Normal file
|
|
@ -139,6 +139,8 @@ COMMON_INC := -I$(AUDIO_ROOT)/$(COMMON_DIR)
|
|||
|
||||
############ ASoC Drivers ############
|
||||
|
||||
MACHINE_OBJS += msm-common.o
|
||||
|
||||
# for SM8150 sound card driver
|
||||
ifdef CONFIG_SND_SOC_SM8150
|
||||
MACHINE_OBJS += sm8150.o
|
||||
|
|
|
|||
100
asoc/lahaina.c
100
asoc/lahaina.c
|
|
@ -41,6 +41,7 @@
|
|||
#include "codecs/bolero/wsa-macro.h"
|
||||
#include "lahaina-port-config.h"
|
||||
#include "msm_dailink.h"
|
||||
#include "msm-common.h"
|
||||
|
||||
#define DRV_NAME "lahaina-asoc-snd"
|
||||
#define __CHIPSET__ "LAHAINA "
|
||||
|
|
@ -132,16 +133,6 @@ enum {
|
|||
AUX_PCM_MAX,
|
||||
};
|
||||
|
||||
enum {
|
||||
PRIM_MI2S = 0,
|
||||
SEC_MI2S,
|
||||
TERT_MI2S,
|
||||
QUAT_MI2S,
|
||||
QUIN_MI2S,
|
||||
SEN_MI2S,
|
||||
MI2S_MAX,
|
||||
};
|
||||
|
||||
enum {
|
||||
WSA_CDC_DMA_RX_0 = 0,
|
||||
WSA_CDC_DMA_RX_1,
|
||||
|
|
@ -227,33 +218,6 @@ struct ext_mclk_src_info {
|
|||
struct ext_mclk_gpio_info *gpio_info;
|
||||
};
|
||||
|
||||
struct msm_asoc_mach_data {
|
||||
struct snd_info_entry *codec_root;
|
||||
int usbc_en2_gpio; /* used by gpio driver API */
|
||||
int lito_v2_enabled;
|
||||
struct device_node *dmic01_gpio_p; /* used by pinctrl API */
|
||||
struct device_node *dmic23_gpio_p; /* used by pinctrl API */
|
||||
struct device_node *dmic45_gpio_p; /* used by pinctrl API */
|
||||
struct device_node *mi2s_gpio_p[MI2S_MAX]; /* used by pinctrl API */
|
||||
atomic_t mi2s_gpio_ref_count[MI2S_MAX]; /* used by pinctrl API */
|
||||
struct device_node *us_euro_gpio_p; /* used by pinctrl API */
|
||||
struct pinctrl *usbc_en2_gpio_p; /* used by pinctrl API */
|
||||
struct device_node *hph_en1_gpio_p; /* used by pinctrl API */
|
||||
struct device_node *hph_en0_gpio_p; /* used by pinctrl API */
|
||||
bool supports_ext_mclk;
|
||||
struct ext_mclk_src_info *ext_mclk_srcs;
|
||||
u32 num_ext_mclk_srcs;
|
||||
bool is_afe_config_done;
|
||||
struct device_node *fsa_handle;
|
||||
struct clk *lpass_audio_hw_vote;
|
||||
int core_audio_vote_count;
|
||||
u32 wsa_max_devs;
|
||||
u32 tdm_max_slots; /* Max TDM slots used */
|
||||
int wcd_disabled;
|
||||
int (*get_wsa_dev_num)(struct snd_soc_component*);
|
||||
struct afe_cps_hw_intf_cfg cps_config;
|
||||
};
|
||||
|
||||
struct tdm_port {
|
||||
u32 mode;
|
||||
u32 channel;
|
||||
|
|
@ -2096,20 +2060,41 @@ static int tdm_get_sample_rate(int value)
|
|||
sample_rate = SAMPLING_RATE_8KHZ;
|
||||
break;
|
||||
case 1:
|
||||
sample_rate = SAMPLING_RATE_16KHZ;
|
||||
sample_rate = SAMPLING_RATE_11P025KHZ;
|
||||
break;
|
||||
case 2:
|
||||
sample_rate = SAMPLING_RATE_32KHZ;
|
||||
sample_rate = SAMPLING_RATE_16KHZ;
|
||||
break;
|
||||
case 3:
|
||||
sample_rate = SAMPLING_RATE_48KHZ;
|
||||
sample_rate = SAMPLING_RATE_22P05KHZ;
|
||||
break;
|
||||
case 4:
|
||||
sample_rate = SAMPLING_RATE_176P4KHZ;
|
||||
sample_rate = SAMPLING_RATE_32KHZ;
|
||||
break;
|
||||
case 5:
|
||||
sample_rate = SAMPLING_RATE_44P1KHZ;
|
||||
break;
|
||||
case 6:
|
||||
sample_rate = SAMPLING_RATE_48KHZ;
|
||||
break;
|
||||
case 7:
|
||||
sample_rate = SAMPLING_RATE_88P2KHZ;
|
||||
break;
|
||||
case 8:
|
||||
sample_rate = SAMPLING_RATE_96KHZ;
|
||||
break;
|
||||
case 9:
|
||||
sample_rate = SAMPLING_RATE_176P4KHZ;
|
||||
break;
|
||||
case 10:
|
||||
sample_rate = SAMPLING_RATE_192KHZ;
|
||||
break;
|
||||
case 11:
|
||||
sample_rate = SAMPLING_RATE_352P8KHZ;
|
||||
break;
|
||||
case 12:
|
||||
sample_rate = SAMPLING_RATE_384KHZ;
|
||||
break;
|
||||
default:
|
||||
sample_rate = SAMPLING_RATE_48KHZ;
|
||||
break;
|
||||
|
|
@ -2125,23 +2110,44 @@ static int tdm_get_sample_rate_val(int sample_rate)
|
|||
case SAMPLING_RATE_8KHZ:
|
||||
sample_rate_val = 0;
|
||||
break;
|
||||
case SAMPLING_RATE_16KHZ:
|
||||
case SAMPLING_RATE_11P025KHZ:
|
||||
sample_rate_val = 1;
|
||||
break;
|
||||
case SAMPLING_RATE_32KHZ:
|
||||
case SAMPLING_RATE_16KHZ:
|
||||
sample_rate_val = 2;
|
||||
break;
|
||||
case SAMPLING_RATE_48KHZ:
|
||||
case SAMPLING_RATE_22P05KHZ:
|
||||
sample_rate_val = 3;
|
||||
break;
|
||||
case SAMPLING_RATE_176P4KHZ:
|
||||
case SAMPLING_RATE_32KHZ:
|
||||
sample_rate_val = 4;
|
||||
break;
|
||||
case SAMPLING_RATE_352P8KHZ:
|
||||
case SAMPLING_RATE_44P1KHZ:
|
||||
sample_rate_val = 5;
|
||||
break;
|
||||
case SAMPLING_RATE_48KHZ:
|
||||
sample_rate_val = 6;
|
||||
break;
|
||||
case SAMPLING_RATE_88P2KHZ:
|
||||
sample_rate_val = 7;
|
||||
break;
|
||||
case SAMPLING_RATE_96KHZ:
|
||||
sample_rate_val = 8;
|
||||
break;
|
||||
case SAMPLING_RATE_176P4KHZ:
|
||||
sample_rate_val = 9;
|
||||
break;
|
||||
case SAMPLING_RATE_192KHZ:
|
||||
sample_rate_val = 10;
|
||||
break;
|
||||
case SAMPLING_RATE_352P8KHZ:
|
||||
sample_rate_val = 11;
|
||||
break;
|
||||
case SAMPLING_RATE_384KHZ:
|
||||
sample_rate_val = 12;
|
||||
break;
|
||||
default:
|
||||
sample_rate_val = 3;
|
||||
sample_rate_val = 6;
|
||||
break;
|
||||
}
|
||||
return sample_rate_val;
|
||||
|
|
|
|||
60
asoc/msm-common.c
Normal file
60
asoc/msm-common.c
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved.
|
||||
*/
|
||||
|
||||
#include <linux/clk.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/of_device.h>
|
||||
#include <sound/control.h>
|
||||
#include <sound/core.h>
|
||||
#include <sound/soc.h>
|
||||
#include <sound/pcm_params.h>
|
||||
#include <sound/info.h>
|
||||
|
||||
#include "msm-common.h"
|
||||
|
||||
int msm_lpass_audio_hw_vote_req(struct snd_pcm_substream *substream, bool enable)
|
||||
{
|
||||
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
||||
struct snd_soc_card *card = rtd->card;
|
||||
struct msm_asoc_mach_data *pdata = snd_soc_card_get_drvdata(card);
|
||||
int rc = 0;
|
||||
|
||||
if (enable) {
|
||||
if (pdata->lpass_audio_hw_vote == NULL) {
|
||||
dev_err(rtd->card->dev, "%s: Invalid lpass audio hw node\n",
|
||||
__func__);
|
||||
rc = -EINVAL;
|
||||
goto rtn;
|
||||
}
|
||||
if (pdata->core_audio_vote_count == 0) {
|
||||
rc = clk_prepare_enable(pdata->lpass_audio_hw_vote);
|
||||
if (rc < 0) {
|
||||
dev_err(rtd->card->dev, "%s: audio vote error\n",
|
||||
__func__);
|
||||
goto rtn;
|
||||
}
|
||||
}
|
||||
|
||||
pdata->core_audio_vote_count++;
|
||||
} else {
|
||||
if (pdata->lpass_audio_hw_vote != NULL) {
|
||||
if (--pdata->core_audio_vote_count == 0) {
|
||||
clk_disable_unprepare(
|
||||
pdata->lpass_audio_hw_vote);
|
||||
} else if (pdata->core_audio_vote_count < 0) {
|
||||
pr_err("%s: audio vote mismatch\n", __func__);
|
||||
pdata->core_audio_vote_count = 0;
|
||||
}
|
||||
} else {
|
||||
pr_err("%s: Invalid lpass audio hw node\n", __func__);
|
||||
}
|
||||
}
|
||||
|
||||
rtn:
|
||||
return rc;
|
||||
}
|
||||
EXPORT_SYMBOL(msm_lpass_audio_hw_vote_req);
|
||||
|
||||
52
asoc/msm-common.h
Normal file
52
asoc/msm-common.h
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
/*
|
||||
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||
*/
|
||||
|
||||
#ifndef _MSM_COMMON_H_
|
||||
#define _MSM_COMMON_H_
|
||||
|
||||
#include <sound/soc.h>
|
||||
#include <sound/pcm.h>
|
||||
#include <dsp/apr_audio-v2.h>
|
||||
|
||||
enum {
|
||||
PRIM_MI2S = 0,
|
||||
SEC_MI2S,
|
||||
TERT_MI2S,
|
||||
QUAT_MI2S,
|
||||
QUIN_MI2S,
|
||||
SEN_MI2S,
|
||||
MI2S_MAX,
|
||||
};
|
||||
|
||||
struct msm_asoc_mach_data {
|
||||
struct snd_info_entry *codec_root;
|
||||
int usbc_en2_gpio; /* used by gpio driver API */
|
||||
int lito_v2_enabled;
|
||||
struct device_node *dmic01_gpio_p; /* used by pinctrl API */
|
||||
struct device_node *dmic23_gpio_p; /* used by pinctrl API */
|
||||
struct device_node *dmic45_gpio_p; /* used by pinctrl API */
|
||||
struct device_node *mi2s_gpio_p[MI2S_MAX]; /* used by pinctrl API */
|
||||
atomic_t mi2s_gpio_ref_count[MI2S_MAX]; /* used by pinctrl API */
|
||||
struct device_node *us_euro_gpio_p; /* used by pinctrl API */
|
||||
struct pinctrl *usbc_en2_gpio_p; /* used by pinctrl API */
|
||||
struct device_node *hph_en1_gpio_p; /* used by pinctrl API */
|
||||
struct device_node *hph_en0_gpio_p; /* used by pinctrl API */
|
||||
bool supports_ext_mclk;
|
||||
struct ext_mclk_src_info *ext_mclk_srcs;
|
||||
u32 num_ext_mclk_srcs;
|
||||
bool is_afe_config_done;
|
||||
struct device_node *fsa_handle;
|
||||
struct clk *lpass_audio_hw_vote;
|
||||
int core_audio_vote_count;
|
||||
u32 wsa_max_devs;
|
||||
u32 tdm_max_slots; /* Max TDM slots used */
|
||||
int wcd_disabled;
|
||||
int (*get_wsa_dev_num)(struct snd_soc_component*);
|
||||
struct afe_cps_hw_intf_cfg cps_config;
|
||||
};
|
||||
|
||||
int msm_lpass_audio_hw_vote_req(struct snd_pcm_substream *substream, bool enable);
|
||||
|
||||
#endif
|
||||
Loading…
Add table
Reference in a new issue