ASoC: omap-abe-twl6040: Remove support for pdata (legacy boot)

Just recently OMAP4 legacy boot support has been removed. No reason to keep
the code used by the legacy boot (pdata based) since neither OMAP4 or OMAP5
can boot in this mode.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

1 files changed, 41 insertions, 92 deletions

diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c
index 70cd5c7b2e14..ebb13906b3a0 100644
--- a/sound/soc/omap/omap-abe-twl6040.c
+++ b/sound/soc/omap/omap-abe-twl6040.c
@@ -23,7 +23,6 @@
 #include <linux/clk.h>
 #include <linux/platform_device.h>
 #include <linux/mfd/twl6040.h>
-#include <linux/platform_data/omap-abe-twl6040.h>
 #include <linux/module.h>
 #include <linux/of.h>
 
@@ -166,19 +165,10 @@ static const struct snd_soc_dapm_route audio_map[] = {
         {"AFMR", NULL, "Line In"},
 };
 
-static inline void twl6040_disconnect_pin(struct snd_soc_dapm_context *dapm,
-                                          int connected, char *pin)
-{
-        if (!connected)
-                snd_soc_dapm_disable_pin(dapm, pin);
-}
-
 static int omap_abe_twl6040_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
         struct snd_soc_card *card = codec->card;
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
-        struct omap_abe_twl6040_data *pdata = dev_get_platdata(card->dev);
         struct abe_twl6040 *priv = snd_soc_card_get_drvdata(card);
         int hs_trim;
         int ret = 0;
@@ -203,24 +193,6 @@ static int omap_abe_twl6040_init(struct snd_soc_pcm_runtime *rtd)
                 twl6040_hs_jack_detect(codec, &hs_jack, SND_JACK_HEADSET);
         }
 
-        /*
-         * NULL pdata means we booted with DT. In this case the routing is
-         * provided and the card is fully routed, no need to mark pins.
-         */
-        if (!pdata)
-                return ret;
-
-        /* Disable not connected paths if not used */
-        twl6040_disconnect_pin(dapm, pdata->has_hs, "Headset Stereophone");
-        twl6040_disconnect_pin(dapm, pdata->has_hf, "Ext Spk");
-        twl6040_disconnect_pin(dapm, pdata->has_ep, "Earphone Spk");
-        twl6040_disconnect_pin(dapm, pdata->has_aux, "Line Out");
-        twl6040_disconnect_pin(dapm, pdata->has_vibra, "Vibrator");
-        twl6040_disconnect_pin(dapm, pdata->has_hsmic, "Headset Mic");
-        twl6040_disconnect_pin(dapm, pdata->has_mainmic, "Main Handset Mic");
-        twl6040_disconnect_pin(dapm, pdata->has_submic, "Sub Handset Mic");
-        twl6040_disconnect_pin(dapm, pdata->has_afm, "Line In");
-
         return ret;
 }
 
@@ -274,13 +246,18 @@ static struct snd_soc_card omap_abe_card = {
 
 static int omap_abe_probe(struct platform_device *pdev)
 {
-        struct omap_abe_twl6040_data *pdata = dev_get_platdata(&pdev->dev);
         struct device_node *node = pdev->dev.of_node;
         struct snd_soc_card *card = &omap_abe_card;
+        struct device_node *dai_node;
         struct abe_twl6040 *priv;
         int num_links = 0;
         int ret = 0;
 
+        if (!node) {
+                dev_err(&pdev->dev, "of node is missing.\n");
+                return -ENODEV;
+        }
+
         card->dev = &pdev->dev;
 
         priv = devm_kzalloc(&pdev->dev, sizeof(struct abe_twl6040), GFP_KERNEL);
@@ -289,78 +266,50 @@ static int omap_abe_probe(struct platform_device *pdev)
 
         priv->dmic_codec_dev = ERR_PTR(-EINVAL);
 
-        if (node) {
-                struct device_node *dai_node;
-
-                if (snd_soc_of_parse_card_name(card, "ti,model")) {
-                        dev_err(&pdev->dev, "Card name is not provided\n");
-                        return -ENODEV;
-                }
+        if (snd_soc_of_parse_card_name(card, "ti,model")) {
+                dev_err(&pdev->dev, "Card name is not provided\n");
+                return -ENODEV;
+        }
 
-                ret = snd_soc_of_parse_audio_routing(card,
-                                                "ti,audio-routing");
-                if (ret) {
-                        dev_err(&pdev->dev,
-                                "Error while parsing DAPM routing\n");
-                        return ret;
-                }
+        ret = snd_soc_of_parse_audio_routing(card, "ti,audio-routing");
+        if (ret) {
+                dev_err(&pdev->dev, "Error while parsing DAPM routing\n");
+                return ret;
+        }
 
-                dai_node = of_parse_phandle(node, "ti,mcpdm", 0);
-                if (!dai_node) {
-                        dev_err(&pdev->dev, "McPDM node is not provided\n");
-                        return -EINVAL;
-                }
-                abe_twl6040_dai_links[0].cpu_dai_name  = NULL;
-                abe_twl6040_dai_links[0].cpu_of_node = dai_node;
+        dai_node = of_parse_phandle(node, "ti,mcpdm", 0);
+        if (!dai_node) {
+                dev_err(&pdev->dev, "McPDM node is not provided\n");
+                return -EINVAL;
+        }
+        abe_twl6040_dai_links[0].cpu_dai_name  = NULL;
+        abe_twl6040_dai_links[0].cpu_of_node = dai_node;
 
-                dai_node = of_parse_phandle(node, "ti,dmic", 0);
-                if (dai_node) {
-                        num_links = 2;
-                        abe_twl6040_dai_links[1].cpu_dai_name  = NULL;
-                        abe_twl6040_dai_links[1].cpu_of_node = dai_node;
+        dai_node = of_parse_phandle(node, "ti,dmic", 0);
+        if (dai_node) {
+                num_links = 2;
+                abe_twl6040_dai_links[1].cpu_dai_name  = NULL;
+                abe_twl6040_dai_links[1].cpu_of_node = dai_node;
 
-                        priv->dmic_codec_dev = platform_device_register_simple(
+                priv->dmic_codec_dev = platform_device_register_simple(
                                                 "dmic-codec", -1, NULL, 0);
-                        if (IS_ERR(priv->dmic_codec_dev)) {
-                                dev_err(&pdev->dev,
-                                        "Can't instantiate dmic-codec\n");
-                                return PTR_ERR(priv->dmic_codec_dev);
-                        }
-                } else {
-                        num_links = 1;
-                }
-
-                priv->jack_detection = of_property_read_bool(node,
-                                                           "ti,jack-detection");
-                of_property_read_u32(node, "ti,mclk-freq",
-                                     &priv->mclk_freq);
-                if (!priv->mclk_freq) {
-                        dev_err(&pdev->dev, "MCLK frequency not provided\n");
-                        ret = -EINVAL;
-                        goto err_unregister;
+                if (IS_ERR(priv->dmic_codec_dev)) {
+                        dev_err(&pdev->dev, "Can't instantiate dmic-codec\n");
+                        return PTR_ERR(priv->dmic_codec_dev);
                 }
-
-                omap_abe_card.fully_routed = 1;
-        } else if (pdata) {
-                if (pdata->card_name) {
-                        card->name = pdata->card_name;
-                } else {
-                        dev_err(&pdev->dev, "Card name is not provided\n");
-                        return -ENODEV;
-                }
-
-                if (pdata->has_dmic)
-                        num_links = 2;
-                else
-                        num_links = 1;
-
-                priv->jack_detection = pdata->jack_detection;
-                priv->mclk_freq = pdata->mclk_freq;
         } else {
-                dev_err(&pdev->dev, "Missing pdata\n");
-                return -ENODEV;
+                num_links = 1;
+        }
+
+        priv->jack_detection = of_property_read_bool(node, "ti,jack-detection");
+        of_property_read_u32(node, "ti,mclk-freq", &priv->mclk_freq);
+        if (!priv->mclk_freq) {
+                dev_err(&pdev->dev, "MCLK frequency not provided\n");
+                ret = -EINVAL;
+                goto err_unregister;
         }
 
+        card->fully_routed = 1;
 
         if (!priv->mclk_freq) {
                 dev_err(&pdev->dev, "MCLK frequency missing\n");