Skip to contentSkip to conversation

ASoC: fsl-ssi: Add support for CBM_CFS 16/24 bit

RFC PATCH In review Michael Trimarchi 2 participants 3 messages Jul 28, 2014 – Jul 31, 2014

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 ASoC: fsl-ssi: Add support for CBM_CFS 16/24 bit

---
 sound/soc/fsl/fsl_ssi.c | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)
sound/soc/fsl/fsl_ssi.c +25 -2
index 9bfef55..743e50d 100644
@@ -724,10 +724,19 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream *substream,
 		regmap_update_bits(regs, CCSR_SSI_SRCCR, CCSR_SSI_SxCCR_WL_MASK,
 				wl);
 
-	if (!fsl_ssi_is_ac97(ssi_private))
+	if (!fsl_ssi_is_ac97(ssi_private)) {
+		u8 i2smode;
+
+		if (ssi_private->i2s_mode == (CCSR_SSI_SCR_I2S_MODE_NORMAL |
+		    CCSR_SSI_SCR_NET) && sample_size >= 24)
+			i2smode = CCSR_SSI_SCR_I2S_MODE_MASTER;
+		else
+			i2smode = ssi_private->i2s_mode;
+
 		regmap_update_bits(regs, CCSR_SSI_SCR,
 				CCSR_SSI_SCR_NET | CCSR_SSI_SCR_I2S_MODE_MASK,
-				channels == 1 ? 0 : ssi_private->i2s_mode);
+				channels == 1 ? 0 : i2smode);
+	}
 
 	return 0;
 }
@@ -789,6 +798,15 @@ static int _fsl_ssi_set_dai_fmt(struct fsl_ssi_private *ssi_private,
 					CCSR_SSI_SxCCR_DC_MASK,
 					CCSR_SSI_SxCCR_DC(2));
 			break;
+		case SND_SOC_DAIFMT_CBM_CFS:
+			ssi_private->i2s_mode |= CCSR_SSI_SCR_I2S_MODE_NORMAL;
+			regmap_update_bits(regs, CCSR_SSI_STCCR,
+					CCSR_SSI_SxCCR_DC_MASK,
+					CCSR_SSI_SxCCR_DC(2));
+			regmap_update_bits(regs, CCSR_SSI_SRCCR,
+					CCSR_SSI_SxCCR_DC_MASK,
+					CCSR_SSI_SxCCR_DC(2));
+			break;
 		case SND_SOC_DAIFMT_CBM_CFM:
 			ssi_private->i2s_mode |= CCSR_SSI_SCR_I2S_MODE_SLAVE;
 			break;
@@ -853,6 +871,11 @@ static int _fsl_ssi_set_dai_fmt(struct fsl_ssi_private *ssi_private,
 	case SND_SOC_DAIFMT_CBM_CFM:
 		scr &= ~CCSR_SSI_SCR_SYS_CLK_EN;
 		break;
+	case SND_SOC_DAIFMT_CBM_CFS:
+		strcr &= ~CCSR_SSI_STCR_TXDIR;
+		strcr |= CCSR_SSI_STCR_TFDIR;
+		scr &= ~CCSR_SSI_SCR_SYS_CLK_EN;
+		break;
 	default:
 		return -EINVAL;
 	}
Signature · 1 line
1.8.1.2
#1 lore raw

Hi,

Quoted 1 line · Michael Trimarchi

A commit description what you are doing in this patch and how your setup looks like would be good.

Quoted 9 lines
---
 sound/soc/fsl/fsl_ssi.c | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)
sound/soc/fsl/fsl_ssi.c +0 -0
index 9bfef55..743e50d 100644

sound/soc/fsl/fsl_ssi.c static int fsl_ssi_hw_params(struct snd_pcm_substream *substream, · line 731

Quoted 9 lines
sound/soc/fsl/fsl_ssi.c +5 -1
@@ -724,10 +724,19 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream *substream,
 		regmap_update_bits(regs, CCSR_SSI_SRCCR, CCSR_SSI_SxCCR_WL_MASK,
 				wl);
 
-	if (!fsl_ssi_is_ac97(ssi_private))
+	if (!fsl_ssi_is_ac97(ssi_private)) {
+		u8 i2smode;
+
+		if (ssi_private->i2s_mode == (CCSR_SSI_SCR_I2S_MODE_NORMAL |
+		    CCSR_SSI_SCR_NET) && sample_size >= 24)

This condition seems a bit fragile using the i2s_mode variable.

I don't know about this bitclock master mode, why is this condition necessary, what is the difference with sample_size >= 24?

Regards,

Markus

Quoted 44 lines
sound/soc/fsl/fsl_ssi.c +20 -1
+			i2smode = CCSR_SSI_SCR_I2S_MODE_MASTER;
+		else
+			i2smode = ssi_private->i2s_mode;
+
 		regmap_update_bits(regs, CCSR_SSI_SCR,
 				CCSR_SSI_SCR_NET | CCSR_SSI_SCR_I2S_MODE_MASK,
-				channels == 1 ? 0 : ssi_private->i2s_mode);
+				channels == 1 ? 0 : i2smode);
+	}
 
 	return 0;
 }
@@ -789,6 +798,15 @@ static int _fsl_ssi_set_dai_fmt(struct fsl_ssi_private *ssi_private,
 					CCSR_SSI_SxCCR_DC_MASK,
 					CCSR_SSI_SxCCR_DC(2));
 			break;
+		case SND_SOC_DAIFMT_CBM_CFS:
+			ssi_private->i2s_mode |= CCSR_SSI_SCR_I2S_MODE_NORMAL;
+			regmap_update_bits(regs, CCSR_SSI_STCCR,
+					CCSR_SSI_SxCCR_DC_MASK,
+					CCSR_SSI_SxCCR_DC(2));
+			regmap_update_bits(regs, CCSR_SSI_SRCCR,
+					CCSR_SSI_SxCCR_DC_MASK,
+					CCSR_SSI_SxCCR_DC(2));
+			break;
 		case SND_SOC_DAIFMT_CBM_CFM:
 			ssi_private->i2s_mode |= CCSR_SSI_SCR_I2S_MODE_SLAVE;
 			break;
@@ -853,6 +871,11 @@ static int _fsl_ssi_set_dai_fmt(struct fsl_ssi_private *ssi_private,
 	case SND_SOC_DAIFMT_CBM_CFM:
 		scr &= ~CCSR_SSI_SCR_SYS_CLK_EN;
 		break;
+	case SND_SOC_DAIFMT_CBM_CFS:
+		strcr &= ~CCSR_SSI_STCR_TXDIR;
+		strcr |= CCSR_SSI_STCR_TFDIR;
+		scr &= ~CCSR_SSI_SCR_SYS_CLK_EN;
+		break;
 	default:
 		return -EINVAL;
 	}
Signature · 1 line
1.8.1.2
Signature · 4 lines
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
#2 lore raw

Hi

Il 29/lug/2014 08:18 "Markus Pargmann" <[email protected]> ha scritto:

Quoted 13 lines

Hi,

Quoted 1 line · Michael Trimarchi

A commit description what you are doing in this patch and how your setup looks like would be good.

Quoted 4 lines
---
 sound/soc/fsl/fsl_ssi.c | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)
Quoted 5 lines

sound/soc/fsl/fsl_ssi.c static int fsl_ssi_hw_params(struct

Quoted 5 lines
sound/soc/fsl/fsl_ssi.c +0 -0
index 9bfef55..743e50d 100644
@@ -724,10 +724,19 @@ static int fsl_ssi_hw_params(struct

snd_pcm_substream *substream,

Quoted 1 line

sound/soc/fsl/fsl_ssi.c static int fsl_ssi_hw_params(struct · line 724

Quoted 1 line
sound/soc/fsl/fsl_ssi.c +0 -0
              regmap_update_bits(regs, CCSR_SSI_SRCCR,

CCSR_SSI_SxCCR_WL_MASK,

Quoted 7 lines

sound/soc/fsl/fsl_ssi.c static int fsl_ssi_hw_params(struct snd_pcm_substream *substream,

Quoted 7 lines
sound/soc/fsl/fsl_ssi.c +4 -1
                              wl);
 
-     if (!fsl_ssi_is_ac97(ssi_private))
+     if (!fsl_ssi_is_ac97(ssi_private)) {
+             u8 i2smode;
+
+             if (ssi_private->i2s_mode ==

(CCSR_SSI_SCR_I2S_MODE_NORMAL |

Quoted 7 lines

sound/soc/fsl/fsl_ssi.c static int fsl_ssi_hw_params(struct snd_pcm_substream *substream, · line 731

Quoted 1 line
sound/soc/fsl/fsl_ssi.c +1 -0
+                 CCSR_SSI_SCR_NET) && sample_size >= 24)

This condition seems a bit fragile using the i2s_mode variable.

I don't know about this bitclock master mode, why is this condition necessary, what is the difference with sample_size >= 24?

I will do in better way and cleanup. Problem is how data is packed in 32 bit sample. So 24/32 should be master but 16/32 seems a different story. It packs like 16/16 bit.

I will take a look during the weekend

Michael

Quoted 10 lines

Regards,

Markus

Quoted 6 lines
sound/soc/fsl/fsl_ssi.c +4 -0
+                     i2smode = CCSR_SSI_SCR_I2S_MODE_MASTER;
+             else
+                     i2smode = ssi_private->i2s_mode;
+
              regmap_update_bits(regs, CCSR_SSI_SCR,
                              CCSR_SSI_SCR_NET |

CCSR_SSI_SCR_I2S_MODE_MASK,

Quoted 1 line

sound/soc/fsl/fsl_ssi.c static int fsl_ssi_hw_params(struct · line 730

Quoted 1 line
sound/soc/fsl/fsl_ssi.c +0 -1
-                             channels == 1 ? 0 :

ssi_private->i2s_mode);

Quoted 6 lines

sound/soc/fsl/fsl_ssi.c static int _fsl_ssi_set_dai_fmt(struct

Quoted 6 lines
sound/soc/fsl/fsl_ssi.c +2 -0
+                             channels == 1 ? 0 : i2smode);
+     }
 
      return 0;
 }
@@ -789,6 +798,15 @@ static int _fsl_ssi_set_dai_fmt(struct

fsl_ssi_private *ssi_private,

Quoted 5 lines

sound/soc/fsl/fsl_ssi.c static int _fsl_ssi_set_dai_fmt(struct fsl_ssi_private *ssi_private,

Quoted 5 lines
sound/soc/fsl/fsl_ssi.c +2 -0
                                      CCSR_SSI_SxCCR_DC_MASK,
                                      CCSR_SSI_SxCCR_DC(2));
                      break;
+             case SND_SOC_DAIFMT_CBM_CFS:
+                     ssi_private->i2s_mode |=

CCSR_SSI_SCR_I2S_MODE_NORMAL;

Quoted 9 lines

sound/soc/fsl/fsl_ssi.c static int _fsl_ssi_set_dai_fmt(struct fsl_ssi_private *ssi_private,

Quoted 9 lines
sound/soc/fsl/fsl_ssi.c +7 -0
+                     regmap_update_bits(regs, CCSR_SSI_STCCR,
+                                     CCSR_SSI_SxCCR_DC_MASK,
+                                     CCSR_SSI_SxCCR_DC(2));
+                     regmap_update_bits(regs, CCSR_SSI_SRCCR,
+                                     CCSR_SSI_SxCCR_DC_MASK,
+                                     CCSR_SSI_SxCCR_DC(2));
+                     break;
              case SND_SOC_DAIFMT_CBM_CFM:
                      ssi_private->i2s_mode |=

CCSR_SSI_SCR_I2S_MODE_SLAVE;

Quoted 2 lines

sound/soc/fsl/fsl_ssi.c static int _fsl_ssi_set_dai_fmt(struct

Quoted 2 lines
sound/soc/fsl/fsl_ssi.c +0 -0
                      break;
@@ -853,6 +871,11 @@ static int _fsl_ssi_set_dai_fmt(struct

fsl_ssi_private *ssi_private,

Quoted 21 lines
Quoted 12 lines
sound/soc/fsl/fsl_ssi.c +5 -1
      case SND_SOC_DAIFMT_CBM_CFM:
              scr &= ~CCSR_SSI_SCR_SYS_CLK_EN;
              break;
+     case SND_SOC_DAIFMT_CBM_CFS:
+             strcr &= ~CCSR_SSI_STCR_TXDIR;
+             strcr |= CCSR_SSI_STCR_TFDIR;
+             scr &= ~CCSR_SSI_SCR_SYS_CLK_EN;
+             break;
      default:
              return -EINVAL;
      }
--
Quoted 3 lines

1.8.1.2

--

Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 |http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone:+49-5121-206917-0   |
Amtsgericht Hildesheim, HRA 2686           | Fax:  +49-5121-206917-5555|