ASoC: OMAP: Add functionality to set CLKR and FSR sources in McBSP DAI

The McBSP1 port in OMAP3 processors (I believe OMAP2 too but I don't have
specifications to check it) have additional CLKR and FSR pins for McBSP1
receiver. Reset default is that receiver is using bit clock and frame
sync signal from those pins but it is possible to configure to use
also CLKX and FSX pins as well. In fact, other McBSP ports are doing that
internally that transmitter and receiver share the CLKX and FSX.

Add functionaly that machine drivers can set the CLKR and FSR sources by
using the snd_soc_dai_set_sysclk.

Thanks to "Aggarwal, Anuj" <anuj.aggarwal@ti.com> for reporting the issue.

Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 0e173e7e0c3a6b3c0dc717efeb14be4fb53ae4d0..3341f49402ca634226eeaa7b7e231b4c98f80fd7 100644 (file)
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -512,6 +512,40 @@ static int omap_mcbsp_dai_set_clks_src(struct omap_mcbsp_data *mcbsp_data,
        return 0;
 }
 
+static int omap_mcbsp_dai_set_rcvr_src(struct omap_mcbsp_data *mcbsp_data,
+                                      int clk_id)
+{
+       int sel_bit, set = 0;
+       u16 reg = OMAP2_CONTROL_DEVCONF0;
+
+       if (cpu_class_is_omap1())
+               return -EINVAL; /* TODO: Can this be implemented for OMAP1? */
+       if (mcbsp_data->bus_id != 0)
+               return -EINVAL;
+
+       switch (clk_id) {
+       case OMAP_MCBSP_CLKR_SRC_CLKX:
+               set = 1;
+       case OMAP_MCBSP_CLKR_SRC_CLKR:
+               sel_bit = 3;
+               break;
+       case OMAP_MCBSP_FSR_SRC_FSX:
+               set = 1;
+       case OMAP_MCBSP_FSR_SRC_FSR:
+               sel_bit = 4;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       if (set)
+               omap_ctrl_writel(omap_ctrl_readl(reg) | (1 << sel_bit), reg);
+       else
+               omap_ctrl_writel(omap_ctrl_readl(reg) & ~(1 << sel_bit), reg);
+
+       return 0;
+}
+
 static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
                                         int clk_id, unsigned int freq,
                                         int dir)
@@ -534,6 +568,13 @@ 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:
+       case OMAP_MCBSP_CLKR_SRC_CLKX:
+       case OMAP_MCBSP_FSR_SRC_FSR:
+       case OMAP_MCBSP_FSR_SRC_FSX:
+               err = omap_mcbsp_dai_set_rcvr_src(mcbsp_data, clk_id);
+               break;
        default:
                err = -ENODEV;
        }

diff --git a/sound/soc/omap/omap-mcbsp.h b/sound/soc/omap/omap-mcbsp.h
index c8147aace813431deedee6fd0b1bdc814277b952..647d2f981ab00a00f0d2e4f2789a8853a4ca1fb3 100644 (file)
--- a/sound/soc/omap/omap-mcbsp.h
+++ b/sound/soc/omap/omap-mcbsp.h
@@ -32,6 +32,10 @@ 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 */