ASoC: ti: davinci-i2s: Remove the unused clk_input_pin attribute

The clk_input_pin attribute of davinci_mcbsp_dev struct is not set since
commit 257ade78b601 ("ASoC: davinci-i2s: Convert to use edma-pcm").

Remove the attribute.
Keep the behaviour of the MCBSP_CLKR case as MCBSP_CLKR == 0.
I can't test the BC_FP format so I added back the initial comment that
was removed by commit ec6375533748 ("ASoC: DaVinci: Added selection of
clk input pin for McBSP"). This was the last dependency to
linux/platform_data/davinci_asp.h so it is not included anymore.

Remove the enum mcbsp_clk_input_pin from davinci_asp.h as it is not used
anywhere else.

Signed-off-by: Bastien Curutchet <bastien.curutchet@bootlin.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@gmail.com>
Link: https://msgid.link/r/20240402071213.11671-4-bastien.curutchet@bootlin.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/linux/platform_data/davinci_asp.h b/include/linux/platform_data/davinci_asp.h
index c8645b2ed3c02b1e2304838b87e9cf6a7713dc30..b9c8520b4bd3d6bd441ec8fa079cd37253a9c28f 100644 (file)
--- a/include/linux/platform_data/davinci_asp.h
+++ b/include/linux/platform_data/davinci_asp.h
@@ -25,16 +25,6 @@ struct davinci_mcasp_pdata {
        unsigned sram_size_capture;
        struct gen_pool *sram_pool;
 
-       /*
-        * If McBSP peripheral gets the clock from an external pin,
-        * there are three chooses, that are MCBSP_CLKX, MCBSP_CLKR
-        * and MCBSP_CLKS.
-        * Depending on different hardware connections it is possible
-        * to use this setting to change the behaviour of McBSP
-        * driver.
-        */
-       int clk_input_pin;
-
        /*
         * This flag works when both clock and FS are outputs for the cpu
         * and makes clock more accurate (FS is not symmetrical and the
@@ -91,11 +81,6 @@ enum {
        MCASP_VERSION_OMAP,     /* OMAP4/5 */
 };
 
-enum mcbsp_clk_input_pin {
-       MCBSP_CLKR = 0,         /* as in DM365 */
-       MCBSP_CLKS,
-};
-
 #define INACTIVE_MODE  0
 #define TX_MODE                1
 #define RX_MODE                2

diff --git a/sound/soc/ti/davinci-i2s.c b/sound/soc/ti/davinci-i2s.c
index 07c8b2259208dc95ee479cb1496d24d576d718f9..5c906641640eb73b0977903c2506bad1a0648474 100644 (file)
--- a/sound/soc/ti/davinci-i2s.c
+++ b/sound/soc/ti/davinci-i2s.c
@@ -19,7 +19,6 @@
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/clk.h>
-#include <linux/platform_data/davinci_asp.h>
 
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -159,7 +158,6 @@ struct davinci_mcbsp_dev {
 
        unsigned int fmt;
        int clk_div;
-       int clk_input_pin;
        bool i2s_accurate_sck;
 };
 
@@ -239,26 +237,12 @@ static int davinci_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai,
                        DAVINCI_MCBSP_PCR_CLKRM;
                break;
        case SND_SOC_DAIFMT_BC_FP:
-               pcr = DAVINCI_MCBSP_PCR_FSRM | DAVINCI_MCBSP_PCR_FSXM;
                /*
-                * Selection of the clock input pin that is the
-                * input for the Sample Rate Generator.
-                * McBSP FSR and FSX are driven by the Sample Rate
-                * Generator.
+                * McBSP CLKR pin is the input for the Sample Rate Generator.
+                * McBSP FSR and FSX are driven by the Sample Rate Generator.
                 */
-               switch (dev->clk_input_pin) {
-               case MCBSP_CLKS:
-                       pcr |= DAVINCI_MCBSP_PCR_CLKXM |
-                               DAVINCI_MCBSP_PCR_CLKRM;
-                       break;
-               case MCBSP_CLKR:
-                       pcr |= DAVINCI_MCBSP_PCR_SCLKME;
-                       break;
-               default:
-                       dev_err(dev->dev, "bad clk_input_pin\n");
-                       return -EINVAL;
-               }
-
+               pcr = DAVINCI_MCBSP_PCR_FSRM | DAVINCI_MCBSP_PCR_FSXM;
+               pcr |= DAVINCI_MCBSP_PCR_SCLKME;
                break;
        case SND_SOC_DAIFMT_BC_FC:
                /* codec is master */