[PATCH 2/2] davinci-mcasp: add option to use AHCLKX pin as clock in

[Urs Fässler]

Add option to select AHCLKX pin as clock input source.

---
 sound/soc/davinci/davinci-mcasp.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/sound/soc/davinci/davinci-mcasp.c
b/sound/soc/davinci/davinci-mcasp.c
index 396cdec..7c0d591 100644
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -85,6 +85,7 @@ struct davinci_mcasp {
        int     sysclk_freq;
        bool    bclk_master;
+       bool    ahclkx_pin;
        /* McASP FIFO related */
        u8      txnumevt;
@@ -429,7 +430,10 @@ static int davinci_mcasp_set_dai_fmt(struct
snd_soc_dai *cpu_dai,
                break;
        case SND_SOC_DAIFMT_CBM_CFS:
                /* codec is clock master and frame slave */
-               mcasp_clr_bits(mcasp, DAVINCI_MCASP_ACLKXCTL_REG, ACLKXE);
+               if (mcasp->ahclkx_pin)
+                       mcasp_set_bits(mcasp, DAVINCI_MCASP_ACLKXCTL_REG, 
ACLKXE);
+               else
+                       mcasp_clr_bits(mcasp, DAVINCI_MCASP_ACLKXCTL_REG, 
ACLKXE);
                mcasp_set_bits(mcasp, DAVINCI_MCASP_TXFMCTL_REG, AFSXE);
                mcasp_clr_bits(mcasp, DAVINCI_MCASP_ACLKRCTL_REG, ACLKRE);
@@ -441,7 +445,10 @@ static int davinci_mcasp_set_dai_fmt(struct
snd_soc_dai *cpu_dai,
                break;
        case SND_SOC_DAIFMT_CBM_CFM:
                /* codec is clock and frame master */
-               mcasp_clr_bits(mcasp, DAVINCI_MCASP_ACLKXCTL_REG, ACLKXE);
+               if (mcasp->ahclkx_pin)
+                       mcasp_set_bits(mcasp, DAVINCI_MCASP_ACLKXCTL_REG, 
ACLKXE);
+               else
+                       mcasp_clr_bits(mcasp, DAVINCI_MCASP_ACLKXCTL_REG, 
ACLKXE);
                mcasp_clr_bits(mcasp, DAVINCI_MCASP_TXFMCTL_REG, AFSXE);
                mcasp_clr_bits(mcasp, DAVINCI_MCASP_ACLKRCTL_REG, ACLKRE);
@@ -542,7 +549,10 @@ static int davinci_mcasp_set_sysclk(struct
snd_soc_dai *dai, int clk_id,
        struct davinci_mcasp *mcasp = snd_soc_dai_get_drvdata(dai);
        if (mcasp->bclk_master) {
-               mcasp_set_bits(mcasp, DAVINCI_MCASP_AHCLKXCTL_REG, AHCLKXE);
+               if (mcasp->ahclkx_pin)
+                       mcasp_clr_bits(mcasp, DAVINCI_MCASP_AHCLKXCTL_REG, 
AHCLKXE);
+               else
+                       mcasp_set_bits(mcasp, DAVINCI_MCASP_AHCLKXCTL_REG, 
AHCLKXE);
                mcasp_set_bits(mcasp, DAVINCI_MCASP_AHCLKRCTL_REG, AHCLKRE);
                mcasp_set_bits(mcasp, DAVINCI_MCASP_PDIR_REG, AHCLKX);
        } else {
@@ -1340,6 +1350,8 @@ static struct davinci_mcasp_pdata
*davinci_mcasp_set_pdata_from_of(
        if (ret >= 0)
                pdata->sram_size_capture = val;
 +      pdata->clk_input_pin = of_property_read_bool(np, "ahclkx-pin");
+
        return  pdata;
  nodata:
@@ -1412,6 +1424,8 @@ static int davinci_mcasp_probe(struct
platform_device *pdev)
                goto err;
        }
 +      mcasp->ahclkx_pin = pdata->clk_input_pin;
+
        mcasp->op_mode = pdata->op_mode;
        /* sanity check for tdm slots parameter */
        if (mcasp->op_mode == DAVINCI_MCASP_IIS_MODE) {
-- 
2.1.4

signature.asc
Description: OpenPGP digital signature