ASoC: fsl_sai: Make res a member of struct fsl_sai

The resource info need to be accessed by hw_params()
function for multi fifo case, the start address may
be not the FIFO0. So move it to be a member of
struct fsl_sai.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Link: https://lore.kernel.org/r/1655451877-16382-6-git-send-email-shengjiu.wang@nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index ddfe28cb7df0b0ffa33ef33441e564bf05f695c2..86aa0baba848093dc2adda1998eb10c9c90923a5 100644 (file)
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -1077,7 +1077,6 @@ static int fsl_sai_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        struct fsl_sai *sai;
        struct regmap *gpr;
-       struct resource *res;
        void __iomem *base;
        char tmp[8];
        int irq, ret, i;
@@ -1092,7 +1091,7 @@ static int fsl_sai_probe(struct platform_device *pdev)
 
        sai->is_lsb_first = of_property_read_bool(np, "lsb-first");
 
-       base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
+       base = devm_platform_get_and_ioremap_resource(pdev, 0, &sai->res);
        if (IS_ERR(base))
                return PTR_ERR(base);
 
@@ -1192,8 +1191,8 @@ static int fsl_sai_probe(struct platform_device *pdev)
                                   MCLK_DIR(index));
        }
 
-       sai->dma_params_rx.addr = res->start + FSL_SAI_RDR0;
-       sai->dma_params_tx.addr = res->start + FSL_SAI_TDR0;
+       sai->dma_params_rx.addr = sai->res->start + FSL_SAI_RDR0;
+       sai->dma_params_tx.addr = sai->res->start + FSL_SAI_TDR0;
        sai->dma_params_rx.maxburst = FSL_SAI_MAXBURST_RX;
        sai->dma_params_tx.maxburst = FSL_SAI_MAXBURST_TX;
 

diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h
index c0b6bc42fc3ce7f0784aebe3e03d4731905b39bd..4d657edc9c9f0e5341ca68550316f02ebf5f1417 100644 (file)
--- a/sound/soc/fsl/fsl_sai.h
+++ b/sound/soc/fsl/fsl_sai.h
@@ -258,6 +258,7 @@ struct fsl_sai {
        struct regmap *regmap;
        struct clk *bus_clk;
        struct clk *mclk_clk[FSL_SAI_MCLK_MAX];
+       struct resource *res;
 
        bool is_consumer_mode;
        bool is_lsb_first;