[PATCH 2/3] ASoC: DaVinci: Added selection of clk input pin for McBSP

2010-07-06 Thread Raffaele Recalcati 
From: Raffaele Recalcati raffaele.recalc...@bticino.it

When McBSP peripheral gets the clock from an external pin,
there are three possible chooses, MCBSP_CLKX, MCBSP_CLKR
and MCBSP_CLKS.
evm-dm365 uses MCBSP_CLKR, instead in bmx board I have a different
hardware connection and I use MCBSP_CLKS, so I have added
this possibility.

This patch has been developed against the:
http://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git
git tree and has been tested on bmx board (similar to dm365 evm)

Signed-off-by: Raffaele Recalcati raffaele.recalc...@bticino.it
Signed-off-by: Davide Bonfanti davide.bonfa...@bticino.it
---
 arch/arm/mach-davinci/include/mach/asp.h |8 
 sound/soc/davinci/davinci-i2s.c  |   28 +++-
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-davinci/include/mach/asp.h 
b/arch/arm/mach-davinci/include/mach/asp.h
index 834725f..314570d 100644
--- a/arch/arm/mach-davinci/include/mach/asp.h
+++ b/arch/arm/mach-davinci/include/mach/asp.h
@@ -63,6 +63,9 @@ struct snd_platform_data {
unsigned sram_size_playback;
unsigned sram_size_capture;
 
+   /* To be used when cpu gets clock from external pin */
+   int clk_input_pin;
+
/* McASP specific fields */
int tdm_slots;
u8 op_mode;
@@ -78,6 +81,11 @@ enum {
MCASP_VERSION_2,/* DA8xx/OMAPL1x */
 };
 
+enum {
+   MCBSP_CLKR = 0, /* DM365 */
+   MCBSP_CLKS,
+};
+
 #define INACTIVE_MODE  0
 #define TX_MODE1
 #define RX_MODE2
diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c
index 319e8ca..e478be9 100644
--- a/sound/soc/davinci/davinci-i2s.c
+++ b/sound/soc/davinci/davinci-i2s.c
@@ -152,6 +152,7 @@ struct davinci_mcbsp_dev {
 
unsigned int fmt;
int clk_div;
+   int clk_input_pin;
 };
 
 static inline void davinci_mcbsp_write_reg(struct davinci_mcbsp_dev *dev,
@@ -278,11 +279,26 @@ static int davinci_i2s_set_dai_fmt(struct snd_soc_dai 
*cpu_dai,
DAVINCI_MCBSP_PCR_CLKRM;
break;
case SND_SOC_DAIFMT_CBM_CFS:
-   /* McBSP CLKR pin is the input for the Sample Rate Generator.
-* McBSP FSR and FSX are driven by the Sample Rate Generator. */
-   pcr = DAVINCI_MCBSP_PCR_SCLKME |
-   DAVINCI_MCBSP_PCR_FSXM |
-   DAVINCI_MCBSP_PCR_FSRM;
+   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.
+*/
+   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:
+   printk(KERN_ERR %s:bad clk_input_pin\n, __func__);
+   return -EINVAL;
+   }
+
break;
case SND_SOC_DAIFMT_CBM_CFM:
/* codec is master */
@@ -436,6 +452,7 @@ static int davinci_i2s_hw_params(struct snd_pcm_substream 
*substream,
srgr |= clk_div;
break;
case SND_SOC_DAIFMT_CBM_CFS:
+   /* Clock given on CLKS */
srgr = DAVINCI_MCBSP_SRGR_FSGM;
clk_div = dev-clk_div - 1;
srgr |= DAVINCI_MCBSP_SRGR_FWID(mcbsp_word_length * 8 - 1);
@@ -626,6 +643,7 @@ static int davinci_i2s_probe(struct platform_device *pdev)
pdata-sram_size_playback;
dev-dma_params[SNDRV_PCM_STREAM_CAPTURE].sram_size =
pdata-sram_size_capture;
+   dev-clk_input_pin = pdata-clk_input_pin;
}
dev-clk = clk_get(pdev-dev, NULL);
if (IS_ERR(dev-clk)) {
-- 
1.7.0.4

___
Davinci-linux-open-source mailing list
Davinci-linux-open-source@linux.davincidsp.com
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source

Re: [PATCH 2/3] ASoC: DaVinci: Added selection of clk input pin for McBSP

2010-07-06 Thread Mark Brown 
On Wed, Jun 30, 2010 at 03:47:57PM +0200, Raffaele Recalcati wrote:

 + /* To be used when cpu gets clock from external pin */
 + int clk_input_pin;
 +

As previously indicated please say how to use this.

 + default:
 + printk(KERN_ERR %s:bad clk_input_pin\n, __func__);

Use dev_err().
___
Davinci-linux-open-source mailing list
Davinci-linux-open-source@linux.davincidsp.com
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source

[PATCH 2/3] ASoC: DaVinci: Added selection of clk input pin for McBSP

2010-07-06 Thread Raffaele Recalcati 
From: Raffaele Recalcati raffaele.recalc...@bticino.it

When McBSP peripheral gets the clock from an external pin,
there are three possible chooses, MCBSP_CLKX, MCBSP_CLKR
and MCBSP_CLKS.
evm-dm365 uses MCBSP_CLKR, instead in bmx board I have a different
hardware connection and I use MCBSP_CLKS, so I have added
this possibility.

This patch has been developed against the:
http://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git
git tree and has been tested on bmx board (similar to dm365 evm)

Signed-off-by: Raffaele Recalcati raffaele.recalc...@bticino.it
Signed-off-by: Davide Bonfanti davide.bonfa...@bticino.it
---
 arch/arm/mach-davinci/include/mach/asp.h |   15 +++
 sound/soc/davinci/davinci-i2s.c  |   29 -
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-davinci/include/mach/asp.h 
b/arch/arm/mach-davinci/include/mach/asp.h
index 834725f..0847d21 100644
--- a/arch/arm/mach-davinci/include/mach/asp.h
+++ b/arch/arm/mach-davinci/include/mach/asp.h
@@ -63,6 +63,16 @@ struct snd_platform_data {
unsigned sram_size_playback;
unsigned sram_size_capture;
 
+   /*
+* 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. The dm365_clk_input_pin enum is available for dm365
+*/
+   int clk_input_pin;
+
/* McASP specific fields */
int tdm_slots;
u8 op_mode;
@@ -78,6 +88,11 @@ enum {
MCASP_VERSION_2,/* DA8xx/OMAPL1x */
 };
 
+enum dm365_clk_input_pin {
+   MCBSP_CLKR = 0, /* DM365 */
+   MCBSP_CLKS,
+};
+
 #define INACTIVE_MODE  0
 #define TX_MODE1
 #define RX_MODE2
diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c
index c8f038c..ba5644b 100644
--- a/sound/soc/davinci/davinci-i2s.c
+++ b/sound/soc/davinci/davinci-i2s.c
@@ -122,6 +122,7 @@ static const unsigned char 
double_fmt[SNDRV_PCM_FORMAT_S32_LE + 1] = {
 };
 
 struct davinci_mcbsp_dev {
+   struct device *dev;
struct davinci_pcm_dma_params   dma_params[2];
void __iomem*base;
 #define MOD_DSP_A  0
@@ -153,6 +154,7 @@ struct davinci_mcbsp_dev {
 
unsigned int fmt;
int clk_div;
+   int clk_input_pin;
 };
 
 static inline void davinci_mcbsp_write_reg(struct davinci_mcbsp_dev *dev,
@@ -279,11 +281,26 @@ static int davinci_i2s_set_dai_fmt(struct snd_soc_dai 
*cpu_dai,
DAVINCI_MCBSP_PCR_CLKRM;
break;
case SND_SOC_DAIFMT_CBM_CFS:
-   /* McBSP CLKR pin is the input for the Sample Rate Generator.
-* McBSP FSR and FSX are driven by the Sample Rate Generator. */
-   pcr = DAVINCI_MCBSP_PCR_SCLKME |
-   DAVINCI_MCBSP_PCR_FSXM |
-   DAVINCI_MCBSP_PCR_FSRM;
+   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.
+*/
+   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;
+   }
+
break;
case SND_SOC_DAIFMT_CBM_CFM:
/* codec is master */
@@ -644,6 +661,7 @@ static int davinci_i2s_probe(struct platform_device *pdev)
pdata-sram_size_playback;
dev-dma_params[SNDRV_PCM_STREAM_CAPTURE].sram_size =
pdata-sram_size_capture;
+   dev-clk_input_pin = pdata-clk_input_pin;
}
dev-clk = clk_get(pdev-dev, NULL);
if (IS_ERR(dev-clk)) {
@@ -676,6 +694,7 @@ static int davinci_i2s_probe(struct platform_device *pdev)
goto err_free_mem;
}
dev-dma_params[SNDRV_PCM_STREAM_CAPTURE].channel = res-start;
+   dev-dev = pdev-dev;
 
davinci_i2s_dai.private_data = dev;
davinci_i2s_dai.capture.dma_data = dev-dma_params;
-- 
1.7.0.4

___
Davinci-linux-open-source mailing list
Davinci-linux-open-source@linux.davincidsp.com

RE: [PATCH 2/3] ASoC: DaVinci: Added selection of clk input pin for McBSP

2010-07-05 Thread Sudhakar Rajashekhara 
Hi,

On Fri, Jul 02, 2010 at 22:42:26, Raffaele Recalcati wrote:
 From: Raffaele Recalcati raffaele.recalc...@bticino.it
 
 When McBSP peripheral gets the clock from an external pin,
 there are three possible chooses, MCBSP_CLKX, MCBSP_CLKR
 and MCBSP_CLKS.
 evm-dm365 uses MCBSP_CLKR, instead in bmx board I have a different
 hardware connection and I use MCBSP_CLKS, so I have added
 this possibility.
 
 This patch has been developed against the:
 
 http://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git
 git tree and has been tested on bmx board (similar to dm365 evm)
 
 Signed-off-by: Raffaele Recalcati raffaele.recalc...@bticino.it
 Signed-off-by: Davide Bonfanti davide.bonfa...@bticino.it
 ---
  arch/arm/mach-davinci/include/mach/asp.h |   15 +++
  sound/soc/davinci/davinci-i2s.c  |   27 ++-
  2 files changed, 37 insertions(+), 5 deletions(-)
 
 diff --git a/arch/arm/mach-davinci/include/mach/asp.h 
 b/arch/arm/mach-davinci/include/mach/asp.h
 index 834725f..0847d21 100644
 --- a/arch/arm/mach-davinci/include/mach/asp.h
 +++ b/arch/arm/mach-davinci/include/mach/asp.h
 @@ -153,6 +153,7 @@ struct davinci_mcbsp_dev {

[...]

  
   unsigned int fmt;
   int clk_div;
 + int clk_input_pin;
  };
  
  static inline void davinci_mcbsp_write_reg(struct davinci_mcbsp_dev *dev,
 @@ -279,11 +280,26 @@ static int davinci_i2s_set_dai_fmt(struct snd_soc_dai 
 *cpu_dai,
   DAVINCI_MCBSP_PCR_CLKRM;
   break;
   case SND_SOC_DAIFMT_CBM_CFS:
 - /* McBSP CLKR pin is the input for the Sample Rate Generator.
 -  * McBSP FSR and FSX are driven by the Sample Rate Generator. */
 - pcr = DAVINCI_MCBSP_PCR_SCLKME |
 - DAVINCI_MCBSP_PCR_FSXM |
 - DAVINCI_MCBSP_PCR_FSRM;
 + 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.
 +  */
 + 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(pdev-dev, bad clk_input_pin\n);

The above line results on compilation error as pdev is not defined in this 
function.

Regards,
Sudhakar


___
Davinci-linux-open-source mailing list
Davinci-linux-open-source@linux.davincidsp.com
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source

[PATCH 2/3] ASoC: DaVinci: Added selection of clk input pin for McBSP

2010-07-02 Thread Raffaele Recalcati 
From: Raffaele Recalcati raffaele.recalc...@bticino.it

When McBSP peripheral gets the clock from an external pin,
there are three possible chooses, MCBSP_CLKX, MCBSP_CLKR
and MCBSP_CLKS.
evm-dm365 uses MCBSP_CLKR, instead in bmx board I have a different
hardware connection and I use MCBSP_CLKS, so I have added
this possibility.

This patch has been developed against the:
http://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git
git tree and has been tested on bmx board (similar to dm365 evm)

Signed-off-by: Raffaele Recalcati raffaele.recalc...@bticino.it
Signed-off-by: Davide Bonfanti davide.bonfa...@bticino.it
---
 arch/arm/mach-davinci/include/mach/asp.h |   15 +++
 sound/soc/davinci/davinci-i2s.c  |   27 ++-
 2 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-davinci/include/mach/asp.h 
b/arch/arm/mach-davinci/include/mach/asp.h
index 834725f..0847d21 100644
--- a/arch/arm/mach-davinci/include/mach/asp.h
+++ b/arch/arm/mach-davinci/include/mach/asp.h
@@ -63,6 +63,16 @@ struct snd_platform_data {
unsigned sram_size_playback;
unsigned sram_size_capture;
 
+   /*
+* 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. The dm365_clk_input_pin enum is available for dm365
+*/
+   int clk_input_pin;
+
/* McASP specific fields */
int tdm_slots;
u8 op_mode;
@@ -78,6 +88,11 @@ enum {
MCASP_VERSION_2,/* DA8xx/OMAPL1x */
 };
 
+enum dm365_clk_input_pin {
+   MCBSP_CLKR = 0, /* DM365 */
+   MCBSP_CLKS,
+};
+
 #define INACTIVE_MODE  0
 #define TX_MODE1
 #define RX_MODE2
diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c
index a893538..17f594f 100644
--- a/sound/soc/davinci/davinci-i2s.c
+++ b/sound/soc/davinci/davinci-i2s.c
@@ -153,6 +153,7 @@ struct davinci_mcbsp_dev {
 
unsigned int fmt;
int clk_div;
+   int clk_input_pin;
 };
 
 static inline void davinci_mcbsp_write_reg(struct davinci_mcbsp_dev *dev,
@@ -279,11 +280,26 @@ static int davinci_i2s_set_dai_fmt(struct snd_soc_dai 
*cpu_dai,
DAVINCI_MCBSP_PCR_CLKRM;
break;
case SND_SOC_DAIFMT_CBM_CFS:
-   /* McBSP CLKR pin is the input for the Sample Rate Generator.
-* McBSP FSR and FSX are driven by the Sample Rate Generator. */
-   pcr = DAVINCI_MCBSP_PCR_SCLKME |
-   DAVINCI_MCBSP_PCR_FSXM |
-   DAVINCI_MCBSP_PCR_FSRM;
+   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.
+*/
+   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(pdev-dev, bad clk_input_pin\n);
+   return -EINVAL;
+   }
+
break;
case SND_SOC_DAIFMT_CBM_CFM:
/* codec is master */
@@ -645,6 +661,7 @@ static int davinci_i2s_probe(struct platform_device *pdev)
pdata-sram_size_playback;
dev-dma_params[SNDRV_PCM_STREAM_CAPTURE].sram_size =
pdata-sram_size_capture;
+   dev-clk_input_pin = pdata-clk_input_pin;
}
dev-clk = clk_get(pdev-dev, NULL);
if (IS_ERR(dev-clk)) {
-- 
1.7.0.4

___
Davinci-linux-open-source mailing list
Davinci-linux-open-source@linux.davincidsp.com
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source