[PATCH] ASoC: pxa-ssp.c fix clock/frame invert

[PATCH] ASoC: pxa-ssp.c fix clock/frame invert

[Daniel Ribeiro]

>From the pxa27x developers manual, Table 8-8 SSPSP Bit Definitions:

SCMODE(0): Data Driven (Falling), Data Sampled (Rising), Idle State (Low)
SCMODE(1): Data Driven (Rising), Data Sampled (Falling), Idle State (Low)
SCMODE(2): Data Driven (Rising), Data Sampled (Falling), Idle State (High)
SCMODE(3): Data Driven (Falling), Data Sampled (Rising), Idle State (High)

SCMODE(3) does not invert the clock polarity compared to the default SCMODE(0).

This patch also adds all possible NF/IF, NB/IB combinations to the DSP_A and
DSP_B modes.

Signed-off-by: Daniel Ribeiro <drwyrm@gmail.com>

---
 sound/soc/pxa/pxa-ssp.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
index 308a657..6768e4e 100644
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -568,7 +568,10 @@ static int pxa_ssp_set_dai_fmt(struct snd_soc_dai *cpu_dai,
 		case SND_SOC_DAIFMT_NB_IF:
 			break;
 		case SND_SOC_DAIFMT_IB_IF:
-			sspsp |= SSPSP_SCMODE(3);
+			sspsp |= SSPSP_SCMODE(2);
+			break;
+		case SND_SOC_DAIFMT_IB_NF:
+			sspsp |= SSPSP_SCMODE(2) | SSPSP_SFRMP;
 			break;
 		default:
 			return -EINVAL;
@@ -585,7 +588,13 @@ static int pxa_ssp_set_dai_fmt(struct snd_soc_dai *cpu_dai,
 		case SND_SOC_DAIFMT_NB_NF:
 			sspsp |= SSPSP_SFRMP;
 			break;
+		case SND_SOC_DAIFMT_NB_IF:
+			break;
 		case SND_SOC_DAIFMT_IB_IF:
+			sspsp |= SSPSP_SCMODE(2);
+			break;
+		case SND_SOC_DAIFMT_IB_NF:
+			sspsp |= SSPSP_SCMODE(2) | SSPSP_SFRMP;
 			break;
 		default:
 			return -EINVAL;
-- 
tg: (577c9c4..) asoc/pxa-ssp-invert-clock.patch (depends on: master)
total: 0 errors, 0 warnings, 24 lines checked

asoc-pxa-ssp-invert-clock.patch has no obvious style problems and is ready for submission.

Re: [PATCH] ASoC: pxa-ssp.c fix clock/frame invert

[Mark Brown]

On Wed, Apr 08, 2009 at 10:51:24AM -0300, Daniel Ribeiro wrote:

> This patch also adds all possible NF/IF, NB/IB combinations to the DSP_A and
> DSP_B modes.

Thanks - it'll be tomorrow or possibly Monday before I get a chance to
test this.

Re: [PATCH] ASoC: pxa-ssp.c fix clock/frame invert

[Mark Brown]

On Wed, Apr 08, 2009 at 10:51:24AM -0300, Daniel Ribeiro wrote:
> >From the pxa27x developers manual, Table 8-8 SSPSP Bit Definitions:
> 
> SCMODE(0): Data Driven (Falling), Data Sampled (Rising), Idle State (Low)
> SCMODE(1): Data Driven (Rising), Data Sampled (Falling), Idle State (Low)
> SCMODE(2): Data Driven (Rising), Data Sampled (Falling), Idle State (High)
> SCMODE(3): Data Driven (Falling), Data Sampled (Rising), Idle State (High)
> 

Applied, thanks.