Skip to content

Commit

Permalink
ASoC: fsl_ssi: Rename i2smode to i2s_net
Browse files Browse the repository at this point in the history
Since this i2smode also includes the setting of Network mode, it
should have it in the name. This patch also adds its MASK define.

Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>
Tested-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
Reviewed-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
Acked-by: Timur Tabi <timur@tabi.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Nicolin Chen authored and Mark Brown committed Dec 19, 2017
1 parent 2474e40 commit 8bc84a3
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 12 deletions.
24 changes: 12 additions & 12 deletions sound/soc/fsl/fsl_ssi.c
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ struct fsl_ssi_soc_data {
* @cpu_dai_drv: CPU DAI driver for this device
*
* @dai_fmt: DAI configuration this device is currently used with
* @i2s_mode: I2S and Network mode configuration of SCR register
* @i2s_net: I2S and Network mode configurations of SCR register
* @use_dma: DMA is used or FIQ with stream filter
* @use_dual_fifo: DMA with support for dual FIFO mode
* @has_ipg_clk_name: If "ipg" is in the clock name list of device tree
Expand Down Expand Up @@ -245,7 +245,7 @@ struct fsl_ssi {
struct snd_soc_dai_driver cpu_dai_drv;

unsigned int dai_fmt;
u8 i2s_mode;
u8 i2s_net;
bool use_dma;
bool use_dual_fifo;
bool has_ipg_clk_name;
Expand Down Expand Up @@ -836,16 +836,16 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream *substream,
}

if (!fsl_ssi_is_ac97(ssi)) {
u8 i2smode;
u8 i2s_net;
/* Normal + Network mode to send 16-bit data in 32-bit frames */
if (fsl_ssi_is_i2s_cbm_cfs(ssi) && sample_size == 16)
i2smode = SSI_SCR_I2S_MODE_NORMAL | SSI_SCR_NET;
i2s_net = SSI_SCR_I2S_MODE_NORMAL | SSI_SCR_NET;
else
i2smode = ssi->i2s_mode;
i2s_net = ssi->i2s_net;

regmap_update_bits(regs, REG_SSI_SCR,
SSI_SCR_NET | SSI_SCR_I2S_MODE_MASK,
channels == 1 ? 0 : i2smode);
SSI_SCR_I2S_NET_MASK,
channels == 1 ? 0 : i2s_net);
}

/* In synchronous mode, the SSI uses STCCR for capture */
Expand Down Expand Up @@ -902,7 +902,7 @@ static int _fsl_ssi_set_dai_fmt(struct device *dev,
srcr &= ~mask;

/* Use Network mode as default */
ssi->i2s_mode = SSI_SCR_NET;
ssi->i2s_net = SSI_SCR_NET;
switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
case SND_SOC_DAIFMT_I2S:
regmap_update_bits(regs, REG_SSI_STCCR,
Expand All @@ -912,10 +912,10 @@ static int _fsl_ssi_set_dai_fmt(struct device *dev,
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
case SND_SOC_DAIFMT_CBM_CFS:
case SND_SOC_DAIFMT_CBS_CFS:
ssi->i2s_mode |= SSI_SCR_I2S_MODE_MASTER;
ssi->i2s_net |= SSI_SCR_I2S_MODE_MASTER;
break;
case SND_SOC_DAIFMT_CBM_CFM:
ssi->i2s_mode |= SSI_SCR_I2S_MODE_SLAVE;
ssi->i2s_net |= SSI_SCR_I2S_MODE_SLAVE;
break;
default:
return -EINVAL;
Expand All @@ -940,12 +940,12 @@ static int _fsl_ssi_set_dai_fmt(struct device *dev,
break;
case SND_SOC_DAIFMT_AC97:
/* Data on falling edge of bclk, frame high, 1clk before data */
ssi->i2s_mode |= SSI_SCR_I2S_MODE_NORMAL;
ssi->i2s_net |= SSI_SCR_I2S_MODE_NORMAL;
break;
default:
return -EINVAL;
}
scr |= ssi->i2s_mode;
scr |= ssi->i2s_net;

/* DAI clock inversion */
switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
Expand Down
1 change: 1 addition & 0 deletions sound/soc/fsl/fsl_ssi.h
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
#define SSI_SCR_I2S_MODE_SLAVE 0x00000040
#define SSI_SCR_SYN 0x00000010
#define SSI_SCR_NET 0x00000008
#define SSI_SCR_I2S_NET_MASK (SSI_SCR_NET | SSI_SCR_I2S_MODE_MASK)
#define SSI_SCR_RE 0x00000004
#define SSI_SCR_TE 0x00000002
#define SSI_SCR_SSIEN 0x00000001
Expand Down

0 comments on commit 8bc84a3

Please sign in to comment.