nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 17:25:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: tegra-alt: control for dspk osr value

Browse Source 
Add support for mixer controls for dspk osr value.

Bug 200369647

Change-Id: I551898357d2545c7e1b41e57593820c6126fb16e
Signed-off-by: Mohan Kumar <mkumard@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1609919
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Sameer Pujar <spujar@nvidia.com>
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
This commit is contained in:
Mohan Kumar
2017-12-01 12:55:48 +05:30
committed by Sameer Pujar
parent 5a7c6d070c
commit 4c26e42c42
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sound/soc/tegra-alt/include/tegra186_dspk_alt.h
View File

@@ -187,6 +187,7 @@ struct tegra186_dspk {
struct pinctrl_state *pin_active_state; struct pinctrl_state *pin_active_state;
struct pinctrl_state *pin_idle_state; struct pinctrl_state *pin_idle_state;
unsigned int rx_fifo_th; /* threshold in terms of frames */ unsigned int rx_fifo_th; /* threshold in terms of frames */
unsigned int osr_val; /* osr value */
bool is_shutdown; bool is_shutdown;
}; };

21
sound/soc/tegra-alt/tegra186_dspk_alt.c
View File

@@ -67,6 +67,8 @@ static int tegra186_dspk_get_control(struct snd_kcontrol *kcontrol,
if (strstr(kcontrol->id.name, "Rx fifo threshold")) if (strstr(kcontrol->id.name, "Rx fifo threshold"))
ucontrol->value.integer.value[0] = dspk->rx_fifo_th; ucontrol->value.integer.value[0] = dspk->rx_fifo_th;
else if (strstr(kcontrol->id.name, "OSR Value"))
ucontrol->value.integer.value[0] = dspk->osr_val;
return 0; return 0;
} }
@@ -83,7 +85,8 @@ static int tegra186_dspk_put_control(struct snd_kcontrol *kcontrol,
dspk->rx_fifo_th = val; dspk->rx_fifo_th = val;
else else
return -EINVAL; return -EINVAL;
} } else if (strstr(kcontrol->id.name, "OSR Value"))
dspk->osr_val = val;
return 0; return 0;
} }
@@ -211,7 +214,7 @@ static int tegra186_dspk_hw_params(struct snd_pcm_substream *substream,
struct device *dev = dai->dev; struct device *dev = dai->dev;
struct tegra186_dspk *dspk = snd_soc_dai_get_drvdata(dai); struct tegra186_dspk *dspk = snd_soc_dai_get_drvdata(dai);
int channels, srate, ret, dspk_clk; int channels, srate, ret, dspk_clk;
int osr = TEGRA186_DSPK_OSR_64; int osr = dspk->osr_val;
int interface_clk_ratio = 4; /* dspk interface clock should be fsout*4 */ int interface_clk_ratio = 4; /* dspk interface clock should be fsout*4 */
channels = params_channels(params); channels = params_channels(params);
@@ -255,6 +258,7 @@ static int tegra186_dspk_codec_probe(struct snd_soc_codec *codec)
codec->control_data = dspk->regmap; codec->control_data = dspk->regmap;
dspk->rx_fifo_th = 0; dspk->rx_fifo_th = 0;
dspk->osr_val = TEGRA186_DSPK_OSR_64;
return 0; return 0;
} }
@@ -330,18 +334,29 @@ static const struct snd_soc_dapm_route tegra186_dspk_routes[] = {
{ "DSPK Left Transmit", NULL, "DSPK TX" }, { "DSPK Left Transmit", NULL, "DSPK TX" },
}; };
static const char * const tegra186_dspk_osr_text[] = {
"OSR_32", "OSR_64", "OSR_128", "OSR_256",
};
static const struct soc_enum tegra186_dspk_osr_enum =
SOC_ENUM_SINGLE(SND_SOC_NOPM, 0,
ARRAY_SIZE(tegra186_dspk_osr_text),
tegra186_dspk_osr_text);
#define NV_SOC_SINGLE_RANGE_EXT(xname, xmin, xmax, xget, xput) \ #define NV_SOC_SINGLE_RANGE_EXT(xname, xmin, xmax, xget, xput) \
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
.info = snd_soc_info_xr_sx, .get = xget, .put = xput, \ .info = snd_soc_info_xr_sx, .get = xget, .put = xput, \
.private_value = (unsigned long)&(struct soc_mixer_control) \ .private_value = (unsigned long)&(struct soc_mixer_control) \
{.invert = 0, .min = xmin, .max = xmax, \ {.invert = 0, .min = xmin, .max = xmax, \
.platform_max = xmax}} .platform_max = xmax} \
}
static const struct snd_kcontrol_new tegrat186_dspk_controls[] = { static const struct snd_kcontrol_new tegrat186_dspk_controls[] = {
NV_SOC_SINGLE_RANGE_EXT("Rx fifo threshold", 0, NV_SOC_SINGLE_RANGE_EXT("Rx fifo threshold", 0,
TEGRA186_DSPK_RX_FIFO_DEPTH - 1, tegra186_dspk_get_control, TEGRA186_DSPK_RX_FIFO_DEPTH - 1, tegra186_dspk_get_control,
tegra186_dspk_put_control), tegra186_dspk_put_control),
SOC_ENUM_EXT("OSR Value", tegra186_dspk_osr_enum,
tegra186_dspk_get_control, tegra186_dspk_put_control),
}; };
static struct snd_soc_codec_driver tegra186_dspk_codec = { static struct snd_soc_codec_driver tegra186_dspk_codec = {