ARM/ASoC: omap-mcbsp: Remove CLKR/FSR mux configuration code

Remove the feature to configure the CLKR/FSR mux on McBSP port with 6pin
configuration.
When moving to devicetree these callback can no longer be used in a clean
way anymore.
If a board require to change the 6pin port to work in 4pin setup it needs
to set up the mux in the board file.
For OMAP2/3:
u32 devconf0;

/* McBSP1 CLKR/FSR signal to be connected to CLKX/FSX pin */
devconf0 = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);
devconf0 |=  OMAP2_MCBSP1_CLKR_MASK | OMAP2_MCBSP1_FSR_MASK;
omap_ctrl_writel(devconf0, OMAP2_CONTROL_DEVCONF0);

For OMAP4:
u32 mcbsp_pad;

/* McBSP4 CLKR/FSR signal to be connected to CLKX/FSX pin */
mcbsp_pad = omap4_ctrl_pad_readl(OMAP2_CONTROL_DEVCONF0);
mcbsp_pad |=  ((1 << 31) | (1 << 30));
omap4_ctrl_pad_writel(mcbsp_pad, OMAP2_CONTROL_DEVCONF0);

In case when the kernel is booted with DT blob the pinctrl-single will be
provided as soon as it is enabled on the platform.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

3 files changed, 3 insertions, 36 deletions

diff --git a/sound/soc/omap/mcbsp.h b/sound/soc/omap/mcbsp.h
index 262a6152111f..49a67259ce5a 100644
--- a/sound/soc/omap/mcbsp.h
+++ b/sound/soc/omap/mcbsp.h
@@ -334,9 +334,6 @@ void omap_mcbsp_stop(struct omap_mcbsp *mcbsp, int tx, int rx);
 /* McBSP functional clock source changing function */
 int omap2_mcbsp_set_clks_src(struct omap_mcbsp *mcbsp, u8 fck_src_id);
 
-/* McBSP signal muxing API */
-int omap_mcbsp_6pin_src_mux(struct omap_mcbsp *mcbsp, u8 mux);
-
 /* Sidetone specific API */
 int omap_st_set_chgain(struct omap_mcbsp *mcbsp, int channel, s16 chgain);
 int omap_st_get_chgain(struct omap_mcbsp *mcbsp, int channel, s16 *chgain);
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 1046083e90a0..506159493a9d 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -516,21 +516,9 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
                         return -EBUSY;
         }
 
-        if (clk_id == OMAP_MCBSP_SYSCLK_CLK ||
-            clk_id == OMAP_MCBSP_SYSCLK_CLKS_FCLK ||
-            clk_id == OMAP_MCBSP_SYSCLK_CLKS_EXT ||
-            clk_id == OMAP_MCBSP_SYSCLK_CLKX_EXT ||
-            clk_id == OMAP_MCBSP_SYSCLK_CLKR_EXT) {
-                mcbsp->in_freq = freq;
-                regs->srgr2     &= ~CLKSM;
-                regs->pcr0      &= ~SCLKME;
-        } else if (cpu_class_is_omap1()) {
-                /*
-                 * McBSP CLKR/FSR signal muxing functions are only available on
-                 * OMAP2 or newer versions
-                 */
-                return -EINVAL;
-        }
+        mcbsp->in_freq = freq;
+        regs->srgr2 &= ~CLKSM;
+        regs->pcr0 &= ~SCLKME;
 
         switch (clk_id) {
         case OMAP_MCBSP_SYSCLK_CLK:
@@ -558,20 +546,6 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
         case OMAP_MCBSP_SYSCLK_CLKR_EXT:
                 regs->pcr0      |= SCLKME;
                 break;
-
-
-        case OMAP_MCBSP_CLKR_SRC_CLKR:
-                err = omap_mcbsp_6pin_src_mux(mcbsp, CLKR_SRC_CLKR);
-                break;
-        case OMAP_MCBSP_CLKR_SRC_CLKX:
-                err = omap_mcbsp_6pin_src_mux(mcbsp, CLKR_SRC_CLKX);
-                break;
-        case OMAP_MCBSP_FSR_SRC_FSR:
-                err = omap_mcbsp_6pin_src_mux(mcbsp, FSR_SRC_FSR);
-                break;
-        case OMAP_MCBSP_FSR_SRC_FSX:
-                err = omap_mcbsp_6pin_src_mux(mcbsp, FSR_SRC_FSX);
-                break;
         default:
                 err = -ENODEV;
         }
diff --git a/sound/soc/omap/omap-mcbsp.h b/sound/soc/omap/omap-mcbsp.h
index f877b16f19c9..baebcee30e30 100644
--- a/sound/soc/omap/omap-mcbsp.h
+++ b/sound/soc/omap/omap-mcbsp.h
@@ -32,10 +32,6 @@ enum omap_mcbsp_clksrg_clk {
         OMAP_MCBSP_SYSCLK_CLK,          /* Internal ICLK */
         OMAP_MCBSP_SYSCLK_CLKX_EXT,     /* External CLKX pin */
         OMAP_MCBSP_SYSCLK_CLKR_EXT,     /* External CLKR pin */
-        OMAP_MCBSP_CLKR_SRC_CLKR,       /* CLKR from CLKR pin */
-        OMAP_MCBSP_CLKR_SRC_CLKX,       /* CLKR from CLKX pin */
-        OMAP_MCBSP_FSR_SRC_FSR,         /* FSR from FSR pin */
-        OMAP_MCBSP_FSR_SRC_FSX,         /* FSR from FSX pin */
 };
 
 /* McBSP dividers */