davinci-mcasp: use bclk_master flag to decide if the SOC is clock master
Subsystems (3)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/2 davinci-mcasp: use bclk_master flag to decide if the SOC is clock master
--- sound/soc/davinci/davinci-mcasp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(quoted diff) +0 -0
b/sound/soc/davinci/davinci-mcasp.c
index 30b94d4..396cdec 100644
sound/soc/davinci/davinci-mcasp.c +0 -0
@@ -541,7 +541,7 @@ 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 (dir == SND_SOC_CLOCK_OUT) {
+ if (mcasp->bclk_master) {
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);
Signature · 1 line
2.1.4
PATCH 2/2 davinci-mcasp: add option to use AHCLKX pin as clock in
In reply to a message not in the archive--- .../bindings/sound/davinci-mcasp-audio.txt | 1 + sound/soc/davinci/davinci-mcasp.c | 26 +++++++++++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt index 46bc982..22a91d2 100644
Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt +0 -0
@@ -39,6 +39,7 @@ Optional properties: please refer to pinctrl-bindings.txt - fck_parent : Should contain a valid clock name which will be used as
parent
for the McASP fck
+- ahclkx-pin : if set use AHCLKX pin for clock in instead of ACLKX
Example:
diff --git a/sound/soc/davinci/davinci-mcasp.cb/sound/soc/davinci/davinci-mcasp.c
index 396cdec..3730288 100644
sound/soc/davinci/davinci-mcasp.c +1 -0
@@ -85,6 +85,7 @@ struct davinci_mcasp {int sysclk_freq;bool bclk_master; +bool ahclkx_pin;/* McASP FIFO related */ u8 txnumevt;
@@ -429,7 +430,12 @@ 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 +447,12 @@ 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 +553,12 @@ 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 +1356,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 +1430,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) {
Signature · 1 line
2.1.4
Re: [PATCH 2/2] davinci-mcasp: add option to use AHCLKX pin as clock in
Quoted 33 lines · Urs Fässler
Signed-off-by Urs Fässler <[email protected]>--- .../bindings/sound/davinci-mcasp-audio.txt | 1 + sound/soc/davinci/davinci-mcasp.c | 26 +++++++++++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-)diff --git
a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txtb/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txtindex 46bc982..22a91d2 100644Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt +0
-0@@ -39,6 +39,7 @@ Optional properties: please refer to pinctrl-bindings.txt - fck_parent : Should contain a valid clock name which will be used asparent
for the McASP fck
+- ahclkx-pin : if set use AHCLKX pin for clock in instead of ACLKX
Example:
diff --gita/sound/soc/davinci/davinci-mcasp.cb/sound/soc/davinci/davinci-mcasp.c
index 396cdec..3730288 100644sound/soc/davinci/davinci-mcasp.c +1
-0@@ -85,6 +85,7 @@ struct davinci_mcasp {int sysclk_freq;bool bclk_master; +bool ahclkx_pin;/* McASP FIFO related */ u8 txnumevt;@@ -429,7 +430,12 @@ static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai,
sound/soc/davinci/davinci-mcasp.c static int davinci_mcasp_set_dai_fmt(struct · line 439
Quoted 10 lines
sound/soc/davinci/davinci-mcasp.c +6
-1break ;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 );
This is not correct. ACLKXE bit of ACLKXCTL register configures the transmit bit clock source.
With CBM_CFx it has to be set to 0 (codec is providing the bit clock via ACLKX pin)
and when CBS_CFx it need to be 1 (McASP will provide the bit clock)
Quoted 4 lines
sound/soc/davinci/davinci-mcasp.c +0
-0mcasp_set_bits (mcasp,DAVINCI_MCASP_TXFMCTL_REG ,AFSXE );mcasp_clr_bits (mcasp,DAVINCI_MCASP_ACLKRCTL_REG ,ACLKRE );@@ -441,7 +447,12 @@ static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai,
sound/soc/davinci/davinci-mcasp.c static int davinci_mcasp_set_dai_fmt(struct · line 456
Quoted 10 lines
sound/soc/davinci/davinci-mcasp.c +6
-1break ;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 );
same here
sound/soc/davinci/davinci-mcasp.c static int davinci_mcasp_set_sysclk(struct · line 561
Quoted 13 lines
sound/soc/davinci/davinci-mcasp.c +6
-1mcasp_clr_bits (mcasp,DAVINCI_MCASP_TXFMCTL_REG ,AFSXE );mcasp_clr_bits (mcasp,DAVINCI_MCASP_ACLKRCTL_REG ,ACLKRE );@@ -542,7 +553,12 @@ 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 );
not sure why you need to do this...
You can just select the sysclk (AHCLKX) from the machine driver:snd_soc_dai_set_sysclk(cpu_dai, 0, sysclk, SND_SOC_CLOCK_IN);
Quoted 21 lines
sound/soc/davinci/davinci-mcasp.c +2
-0mcasp_set_bits (mcasp,DAVINCI_MCASP_AHCLKRCTL_REG ,AHCLKRE );mcasp_set_bits (mcasp,DAVINCI_MCASP_PDIR_REG ,AHCLKX ); }else {@@ -1340,6 +1356,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 +1430,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 ) {
Signature · 5 lines
Péter _______________________________________________ Alsa-devel mailing list [email protected] http://mailman.alsa-project.org/mailman/listinfo/alsa-devel