From c11cadfde1b7c24d323adb9c828d6d81d646fdf2 Mon Sep 17 00:00:00 2001 From: Jon Hunter Date: Tue, 24 Jul 2018 16:52:14 +0100 Subject: [PATCH] ASoC: tegra-alt: Remove legacy unused platform data The Tegra ASoC platform data is never used by any current audio machine driver and so get rid of the platform data and the associated code. Bug 200417361 Change-Id: I1ef8ce331b67c85aea95b4a143a6982a32fefe93 Signed-off-by: Jon Hunter Reviewed-on: https://git-master.nvidia.com/r/1784822 Reviewed-by: Sameer Pujar GVS: Gerrit_Virtual_Submit Reviewed-by: Dara Ramesh Reviewed-by: Bibek Basu Reviewed-by: mobile promotions Tested-by: mobile promotions --- .../tegra_machine_driver_mobile.c | 127 +----------------- 1 file changed, 4 insertions(+), 123 deletions(-) diff --git a/sound/soc/tegra-alt/machine_drivers/tegra_machine_driver_mobile.c b/sound/soc/tegra-alt/machine_drivers/tegra_machine_driver_mobile.c index 4d168df9..7cbeff22 100644 --- a/sound/soc/tegra-alt/machine_drivers/tegra_machine_driver_mobile.c +++ b/sound/soc/tegra-alt/machine_drivers/tegra_machine_driver_mobile.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include @@ -56,19 +55,13 @@ /* machine structure which holds sound card */ struct tegra_machine { - struct tegra_asoc_platform_data *pdata; struct tegra_asoc_audio_clock_info audio_clock; unsigned int num_codec_links; - int gpio_requested; - struct snd_soc_card *pcard; int rate_via_kcontrol; bool is_hs_supported; int fmt_via_kcontrol; unsigned int bclk_ratio_override; struct tegra_machine_soc_data *soc_data; - struct regulator *digital_reg; - struct regulator *spk_reg; - struct regulator *dmic_reg; }; /* used for soc specific data */ @@ -135,16 +128,6 @@ static int tegra_machine_codec_get_bclk_ratio(struct snd_kcontrol *, static int tegra_machine_codec_put_bclk_ratio(struct snd_kcontrol *, struct snd_ctl_elem_value *); -/* rt565x specific APIs */ -static int tegra_rt565x_event_int_spk(struct snd_soc_dapm_widget *, - struct snd_kcontrol *, int); -static int tegra_rt565x_event_int_mic(struct snd_soc_dapm_widget *, - struct snd_kcontrol *, int); -static int tegra_rt565x_event_ext_mic(struct snd_soc_dapm_widget *, - struct snd_kcontrol *, int); -static int tegra_rt565x_event_hp(struct snd_soc_dapm_widget *, - struct snd_kcontrol *, int); - /* t210 soc data */ static const struct tegra_machine_soc_data soc_data_tegra210 = { .num_xbar_dai_links = TEGRA210_XBAR_DAI_LINKS, @@ -258,10 +241,10 @@ static struct snd_soc_compr_ops tegra_machine_compr_ops = { #endif static const struct snd_soc_dapm_widget tegra_machine_dapm_widgets[] = { - SND_SOC_DAPM_SPK("x Int Spk", tegra_rt565x_event_int_spk), - SND_SOC_DAPM_HP("x Headphone Jack", tegra_rt565x_event_hp), - SND_SOC_DAPM_MIC("x Int Mic", tegra_rt565x_event_int_mic), - SND_SOC_DAPM_MIC("x Mic Jack", tegra_rt565x_event_ext_mic), + SND_SOC_DAPM_SPK("x Int Spk", NULL), + SND_SOC_DAPM_HP("x Headphone Jack", NULL), + SND_SOC_DAPM_MIC("x Int Mic", NULL), + SND_SOC_DAPM_MIC("x Mic Jack", NULL), SND_SOC_DAPM_SPK("d1 Headphone", NULL), SND_SOC_DAPM_SPK("d2 Headphone", NULL), @@ -360,90 +343,6 @@ static struct snd_soc_pcm_stream tegra_machine_asrc_link_params[] = { PARAMS(SNDRV_PCM_FMTBIT_S16_LE, 2), }; -static int tegra_rt565x_event_int_spk(struct snd_soc_dapm_widget *w, - struct snd_kcontrol *k, int event) -{ - struct snd_soc_dapm_context *dapm = w->dapm; - struct snd_soc_card *card = dapm->card; - struct tegra_machine *machine = snd_soc_card_get_drvdata(card); - struct tegra_asoc_platform_data *pdata = machine->pdata; - int err; - - if (machine->spk_reg) { - if (SND_SOC_DAPM_EVENT_ON(event)) - err = regulator_enable(machine->spk_reg); - else - regulator_disable(machine->spk_reg); - } - - if (!(machine->gpio_requested & GPIO_SPKR_EN)) - return 0; - - gpio_set_value_cansleep(pdata->gpio_spkr_en, - !!SND_SOC_DAPM_EVENT_ON(event)); - - return 0; -} - -static int tegra_rt565x_event_hp(struct snd_soc_dapm_widget *w, - struct snd_kcontrol *k, int event) -{ - struct snd_soc_dapm_context *dapm = w->dapm; - struct snd_soc_card *card = dapm->card; - struct tegra_machine *machine = snd_soc_card_get_drvdata(card); - struct tegra_asoc_platform_data *pdata = machine->pdata; - - if (!(machine->gpio_requested & GPIO_HP_MUTE)) - return 0; - - gpio_set_value_cansleep(pdata->gpio_hp_mute, - !SND_SOC_DAPM_EVENT_ON(event)); - return 0; -} - -static int tegra_rt565x_event_int_mic(struct snd_soc_dapm_widget *w, - struct snd_kcontrol *k, int event) -{ - struct snd_soc_dapm_context *dapm = w->dapm; - struct snd_soc_card *card = dapm->card; - struct tegra_machine *machine = snd_soc_card_get_drvdata(card); - struct tegra_asoc_platform_data *pdata = machine->pdata; - int ret = 0; - - if (machine->dmic_reg) { - if (SND_SOC_DAPM_EVENT_ON(event)) - ret = regulator_enable(machine->dmic_reg); - else - regulator_disable(machine->dmic_reg); - } - - if (!(machine->gpio_requested & GPIO_INT_MIC_EN)) - return 0; - - gpio_set_value_cansleep(pdata->gpio_int_mic_en, - !!SND_SOC_DAPM_EVENT_ON(event)); - - return 0; -} - -static int tegra_rt565x_event_ext_mic(struct snd_soc_dapm_widget *w, - struct snd_kcontrol *k, int event) -{ - struct snd_soc_dapm_context *dapm = w->dapm; - struct snd_soc_card *card = dapm->card; - struct tegra_machine *machine = snd_soc_card_get_drvdata(card); - struct tegra_asoc_platform_data *pdata = machine->pdata; - - if (!(machine->gpio_requested & GPIO_EXT_MIC_EN)) - return 0; - - gpio_set_value_cansleep(pdata->gpio_ext_mic_en, - !SND_SOC_DAPM_EVENT_ON(event)); - - return 0; -} - - static int tegra_machine_codec_get_rate(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { @@ -1156,7 +1055,6 @@ static int tegra_machine_driver_probe(struct platform_device *pdev) struct device_node *np = pdev->dev.of_node; struct snd_soc_card *card = &snd_soc_tegra_card; struct tegra_machine *machine; - struct tegra_asoc_platform_data *pdata = NULL; int ret = 0; const struct of_device_id *match; @@ -1235,23 +1133,6 @@ static int tegra_machine_driver_probe(struct platform_device *pdev) dai_link_setup(pdev); - pdata = devm_kzalloc(&pdev->dev, - sizeof(struct tegra_asoc_platform_data), - GFP_KERNEL); - if (!pdata) { - dev_err(&pdev->dev, - "Can't allocate tegra_asoc_platform_data struct\n"); - ret = -ENOMEM; - goto err_alloc_dai_link; - } - - pdata->gpio_codec1 = pdata->gpio_codec2 = pdata->gpio_codec3 = - pdata->gpio_spkr_en = pdata->gpio_hp_mute = - pdata->gpio_int_mic_en = pdata->gpio_ext_mic_en = -1; - - machine->pdata = pdata; - machine->pcard = card; - ret = tegra_alt_asoc_utils_init(&machine->audio_clock, &pdev->dev, card);