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 <jonathanh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1784822
Reviewed-by: Sameer Pujar <spujar@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Dara Ramesh <dramesh@nvidia.com>
Reviewed-by: Bibek Basu <bbasu@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

3 files changed, 4 insertions, 211 deletions

diff --git a/include/linux/platform_data/tegra_asoc_pdata.h b/include/linux/platform_data/tegra_asoc_pdata.h
deleted file mode 100644
index 17b3dcaf5..000000000
--- a/include/linux/platform_data/tegra_asoc_pdata.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2012-2013, NVIDIA CORPORATION. All rights reserved.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-#define HIFI_CODEC              0
-#define BASEBAND                1
-#define BT_SCO                  2
-#define VOICE_CODEC             3
-#define NUM_I2S_DEVICES         4
-
-#define TEGRA_DAIFMT_DSP_A              0
-#define TEGRA_DAIFMT_DSP_B              1
-#define TEGRA_DAIFMT_I2S                2
-#define TEGRA_DAIFMT_RIGHT_J            3
-#define TEGRA_DAIFMT_LEFT_J             4
-
-struct i2s_config {
-        int audio_port_id;
-        int is_i2s_master;
-        int i2s_mode;
-        int sample_size;
-        int rate;
-        int channels;
-        int bit_clk;
-};
-
-struct ahub_bbc1_config {
-        int port_id;
-        int sample_size;
-        int rate;
-        int channels;
-        int bit_clk;
-};
-
-enum tegra_speaker_edp_states {
-        TEGRA_SPK_EDP_NEG_1,
-        TEGRA_SPK_EDP_ZERO,
-        TEGRA_SPK_EDP_1,
-        TEGRA_SPK_EDP_NUM_STATES,
-};
-
-struct tegra_asoc_platform_data {
-        const char *codec_name;
-        const char *codec_dai_name;
-        int num_links;
-        int gpio_spkr_en;
-        int gpio_hp_det;
-        int gpio_hp_det_active_high;
-        int gpio_hp_mute;
-        int gpio_int_mic_en;
-        int gpio_ext_mic_en;
-        int gpio_ldo1_en;
-        int gpio_codec1;
-        int gpio_codec2;
-        int gpio_codec3;
-        bool micbias_gpio_absent;
-        bool use_codec_jd_irq;
-        unsigned int debounce_time_hp;
-        bool edp_support;
-        unsigned int edp_states[TEGRA_SPK_EDP_NUM_STATES];
-        struct i2s_config i2s_param[NUM_I2S_DEVICES];
-        struct ahub_bbc1_config *ahub_bbc1_param;
-};
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 4d168df9b..7cbeff22f 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 <linux/delay.h>
 #include <linux/pm_runtime.h>
 #include <linux/version.h>
-#include <linux/platform_data/tegra_asoc_pdata.h>
 #include <sound/core.h>
 #include <sound/jack.h>
 #include <sound/pcm.h>
@@ -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);
diff --git a/sound/soc/tegra-alt/machine_drivers/tegra_t186ref_p4573_alt.c b/sound/soc/tegra-alt/machine_drivers/tegra_t186ref_p4573_alt.c
index e54728d9f..5ee6ae6e0 100644
--- a/sound/soc/tegra-alt/machine_drivers/tegra_t186ref_p4573_alt.c
+++ b/sound/soc/tegra-alt/machine_drivers/tegra_t186ref_p4573_alt.c
@@ -20,11 +20,6 @@
 #include <linux/module.h>
 #include <linux/of_platform.h>
 #include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
-#include <linux/platform_data/tegra_asoc_pdata.h>
-#else
-#include <mach/tegra_asoc_pdata.h>
-#endif
 
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
@@ -45,7 +40,6 @@ static const char * const dai_link_names[] = {
 
 struct tegra_t186 {
         struct tegra_asoc_audio_clock_info audio_clock;
-        struct tegra_asoc_platform_data *pdata;
         struct snd_soc_dai_link *codec_link;
         unsigned int num_codec_links;
         struct snd_soc_card *pcard;
@@ -399,7 +393,6 @@ static int tegra186_driver_probe(struct platform_device *pdev)
 {
         struct snd_soc_card *card = &snd_soc_tegra_t186;
         struct device_node *np = pdev->dev.of_node;
-        struct tegra_asoc_platform_data *pdata;
         struct snd_soc_pcm_runtime *rtd;
         struct device *dev = &pdev->dev;
         struct tegra_t186 *machine;
@@ -451,14 +444,6 @@ static int tegra186_driver_probe(struct platform_device *pdev)
 
         dai_link_setup(pdev);
 
-        pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
-        if (!pdata) {
-                dev_err(dev,
-                        "Can't allocate tegra_asoc_platform_data struct\n");
-                return -ENOMEM;
-        }
-
-        machine->pdata = pdata;
         machine->pcard = card;
 
         ret = tegra_alt_asoc_utils_init(&machine->audio_clock, dev, card);