From fc8937a9b755cd608e39d20a71b861449ab0fb21 Mon Sep 17 00:00:00 2001
From: Vipul Kumar <vipul_kumar@mentor.com>
Date: Wed, 5 Dec 2018 11:59:25 +0530
Subject: [PATCH] ASoC: fsl_ssi: fixed compilation errors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
As per commit 2474e4037c4e ("ASoC: fsl_ssi: Replace fsl_ssi_rxtx_reg_val
with fsl_ssi_regvals"), made changes to fix the compilation errors.
sound/soc/fsl/fsl_ssi.c: In function ‘fsl_ssi_hw_params’:
sound/soc/fsl/fsl_ssi.c:817:41: error: ‘struct fsl_ssi’ has no member named ‘rxtx_reg_val’
struct fsl_ssi_rxtx_reg_val *reg = &ssi->rxtx_reg_val;
^~
sound/soc/fsl/fsl_ssi.c:879:7: error: dereferencing pointer to incomplete type ‘struct fsl_ssi_rxtx_reg_val’
reg->rx.srcr &= ~SSI_SRCR_RFEN1;
^~
AR drivers/base/built-in.a
scripts/Makefile.build:305: recipe for target 'sound/soc/fsl/fsl_ssi.o' failed
make[3]: *** [sound/soc/fsl/fsl_ssi.o] Error 1
Signed-off-by: Vipul Kumar <vipul_kumar@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>
---
sound/soc/fsl/fsl_ssi.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 86a5771dbb537..2351316f1275f 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -814,7 +814,7 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream *substream,
u32 scr_val;
int enabled;
u8 i2smode = ssi->i2s_net;
- struct fsl_ssi_rxtx_reg_val *reg = &ssi->rxtx_reg_val;
+ struct fsl_ssi_regvals *reg = ssi->regvals;
if (fsl_ssi_is_i2s_master(ssi)) {
ret = fsl_ssi_set_bclk(substream, dai, hw_params);
@@ -876,17 +876,17 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream *substream,
if (channels == 1) {
ssi->dma_params_tx.fifo_num = 1;
ssi->dma_params_rx.fifo_num = 1;
- reg->rx.srcr &= ~SSI_SRCR_RFEN1;
- reg->tx.stcr &= ~SSI_STCR_TFEN1;
- reg->rx.scr &= ~SSI_SCR_TCH_EN;
- reg->tx.scr &= ~SSI_SCR_TCH_EN;
+ reg[RX].srcr &= ~SSI_SRCR_RFEN1;
+ reg[TX].stcr &= ~SSI_STCR_TFEN1;
+ reg[RX].scr &= ~SSI_SCR_TCH_EN;
+ reg[TX].scr &= ~SSI_SCR_TCH_EN;
} else {
ssi->dma_params_tx.fifo_num = 2;
ssi->dma_params_rx.fifo_num = 2;
- reg->rx.srcr |= SSI_SRCR_RFEN1;
- reg->tx.stcr |= SSI_STCR_TFEN1;
- reg->rx.scr |= SSI_SCR_TCH_EN;
- reg->tx.scr |= SSI_SCR_TCH_EN;
+ reg[RX].srcr |= SSI_SRCR_RFEN1;
+ reg[TX].stcr |= SSI_STCR_TFEN1;
+ reg[RX].scr |= SSI_SCR_TCH_EN;
+ reg[TX].scr |= SSI_SCR_TCH_EN;
}
}
--
GitLab