nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-24 10:11:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: tegra-alt: Simplify RT565x codec init

Browse Source 
The function 'tegra_machine_ext_codec_init()' is used for initialising
the RT565x codec. However, it is called even if the RT565x codec is not
present which is not necessary. Therefore, only call this function when
an RT565x is present and simplify the machine driver by moving the code
to set the jack detect to this function. Finally, update the name of
the function to be RT565x specific.

This change is required for supporting boards such as Galen that can
have multiple codecs and hence multiple jacks because it simplifies
the code for configuring the jack.

Bug 2187533

Change-Id: I43518f09a114678861ddface5a59861bb62dc2d9
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1748230
Reviewed-by: Mohan Kumar D <mkumard@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Sameer Pujar <spujar@nvidia.com>
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Bibek Basu <bbasu@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Jon Hunter
2018-06-06 21:37:53 +01:00
committed by Sameer Pujar
parent 01681eb712
commit 3e1be09df1
1 changed files with 13 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
sound/soc/tegra-alt/machine_drivers/tegra_machine_driver_mobile.c
View File

@@ -104,7 +104,7 @@ static int tegra_machine_driver_probe(struct platform_device *);
static void dai_link_setup(struct platform_device *);
static void ignore_suspend(struct snd_soc_card *);
static int tegra_machine_sfc_init(struct snd_soc_pcm_runtime *);
static int tegra_machine_ext_codec_init(struct snd_soc_pcm_runtime *);
static int tegra_machine_rt565x_init(struct snd_soc_pcm_runtime *);
#if IS_ENABLED(CONFIG_SND_SOC_TEGRA210_ADSP_ALT)
static int tegra_machine_compr_set_params(struct snd_compr_stream *);
@@ -139,8 +139,6 @@ static int tegra_machine_codec_get_jack_state(struct snd_kcontrol *,
struct snd_ctl_elem_value *);
static int tegra_machine_codec_put_jack_state(struct snd_kcontrol *,
struct snd_ctl_elem_value *);
static struct snd_soc_pcm_runtime *tegra_machine_get_codec_link(
struct snd_soc_card *card);
/* rt565x specific APIs */
static int tegra_rt565x_event_int_spk(struct snd_soc_dapm_widget *,
@@ -558,21 +556,6 @@ static int tegra_machine_codec_put_jack_state(struct snd_kcontrol *kcontrol,
return 0;
}
static struct snd_soc_pcm_runtime *tegra_machine_get_codec_link(
struct snd_soc_card *card)
{
struct snd_soc_pcm_runtime *rtd;
rtd = snd_soc_get_pcm_runtime(card, "rt565x-playback");
if (rtd)
goto end;
rtd = snd_soc_get_pcm_runtime(card, "tas2557-playback");
if (rtd)
goto end;
end:
return rtd;
}
static int tegra_machine_set_bclk_ratio(struct tegra_machine *machine,
struct snd_soc_pcm_runtime *rtd)
{
@@ -913,7 +896,7 @@ static int tegra_machine_resume_post(struct snd_soc_card *card)
struct snd_soc_pcm_runtime *rtd;
if (machine->is_hs_supported) {
rtd = tegra_machine_get_codec_link(card);
rtd = snd_soc_get_pcm_runtime(card, "rt565x-playback");
if (rtd)
return trigger_jack_status_check(rtd->codec);
}
@@ -997,7 +980,7 @@ static int tegra_machine_compr_set_params(struct snd_compr_stream *cstream)
}
#endif
static int tegra_machine_ext_codec_init(struct snd_soc_pcm_runtime *rtd)
static int tegra_machine_rt565x_init(struct snd_soc_pcm_runtime *rtd)
{
struct snd_soc_card *card = rtd->card;
struct tegra_machine *machine = snd_soc_card_get_drvdata(card);
@@ -1017,6 +1000,12 @@ static int tegra_machine_ext_codec_init(struct snd_soc_pcm_runtime *rtd)
return err;
}
err = rt5659_set_jack_detect(rtd->codec, &tegra_machine_hp_jack);
if (err) {
dev_err(card->dev, "Failed to set jack for RT565x: %d\n", err);
return err;
}
/* single button supporting play/pause */
snd_jack_set_key(tegra_machine_hp_jack.jack,
SND_JACK_BTN_0, KEY_MEDIA);
@@ -1081,9 +1070,11 @@ static void dai_link_setup(struct platform_device *pdev)
if (!strcmp("dit-hifi", codec_dai_name)) {
dev_info(&pdev->dev, "This is a dummy codec\n");
machine->is_hs_supported = false;
} else
} else {
machine->is_hs_supported = true;
tegra_machine_codec_links[i].init =
tegra_machine_rt565x_init;
}
snd_soc_tegra_card.controls =
tegra_machine_controls;
snd_soc_tegra_card.num_controls =
@@ -1092,8 +1083,6 @@ static void dai_link_setup(struct platform_device *pdev)
tegra_machine_dapm_widgets;
snd_soc_tegra_card.num_dapm_widgets =
ARRAY_SIZE(tegra_machine_dapm_widgets);
tegra_machine_codec_links[i].init =
tegra_machine_ext_codec_init;
} else if (strstr(tegra_machine_codec_links[i].name,
"tas2557-playback")) {
snd_soc_tegra_card.controls =
@@ -1219,10 +1208,7 @@ static int tegra_machine_driver_probe(struct platform_device *pdev)
struct snd_soc_card *card = &snd_soc_tegra_card;
struct tegra_machine *machine;
struct tegra_asoc_platform_data *pdata = NULL;
struct snd_soc_codec *codec = NULL;
int ret = 0;
const char *codec_dai_name;
struct snd_soc_pcm_runtime *rtd;
const struct of_device_id *match;
card->dev = &pdev->dev;
@@ -1336,22 +1322,6 @@ static int tegra_machine_driver_probe(struct platform_device *pdev)
machine->soc_data->num_xbar_dai_links +
machine->num_codec_links);
rtd = tegra_machine_get_codec_link(card);
if (!rtd)
dev_warn(&pdev->dev,
"codec link not defined - codec not part of sound card");
else {
codec = rtd->codec;
codec_dai_name = rtd->dai_link->codec_dai_name;
dev_info(&pdev->dev,
"codec-dai \"%s\" registered\n", codec_dai_name);
if (machine->is_hs_supported) {
/* setup for jack detection only in non-dummy case */
rt5659_set_jack_detect(codec, &tegra_machine_hp_jack);
}
}
return 0;
err_alloc_dai_link: