From: "Maciej S. Szmigiero" <mail@maciej.szmigiero.name>
To: Nicolin Chen <nicoleotsuka@gmail.com>
Cc: timur@tabi.org, broonie@kernel.org, linux-kernel@vger.kernel.org,
linuxppc-dev@lists.ozlabs.org, alsa-devel@alsa-project.org,
lgirdwood@gmail.com, fabio.estevam@nxp.com, caleb@crome.org,
arnaud.mouiche@invoxia.com, lukma@denx.de, kernel@pengutronix.de
Subject: Re: [PATCH v2 14/16] ASoC: fsl_ssi: Remove cpu_dai_drv from fsl_ssi structure
Date: Sun, 14 Jan 2018 23:42:59 +0100 [thread overview]
Message-ID: <4626cd37-c84c-6187-51ae-73fa419b801e@maciej.szmigiero.name> (raw)
In-Reply-To: <1515652995-15996-15-git-send-email-nicoleotsuka@gmail.com>
On 11.01.2018 07:43, Nicolin Chen wrote:
> The cpu_dai_drv is only used for symmetric_rates. So this patch replaces
> it with a synchronous boolean flag.
You make cpu_dai_drv common to all SSI instances instead of per-instance.
What if you have multiple SSIs in the system with different
symmetric_{rates,samplebits,channels} settings?
Maciej
> Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>
> Tested-by: Caleb Crome <caleb@crome.org>
> ---
> sound/soc/fsl/fsl_ssi.c | 32 ++++++++++++++++----------------
> 1 file changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
> index 213962a..716603c 100644
> --- a/sound/soc/fsl/fsl_ssi.c
> +++ b/sound/soc/fsl/fsl_ssi.c
> @@ -208,11 +208,11 @@ struct fsl_ssi_soc_data {
> *
> * @regs: Pointer to the regmap registers
> * @irq: IRQ of this SSI
> - * @cpu_dai_drv: CPU DAI driver for this device
> *
> * @dai_fmt: DAI configuration this device is currently used with
> * @streams: Mask of current active streams: BIT(TX) and BIT(RX)
> * @i2s_net: I2S and Network mode configurations of SCR register
> + * @synchronous: Use synchronous mode - both of TX and RX use STCK and SFCK
> * @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
> @@ -253,11 +253,11 @@ struct fsl_ssi_soc_data {
> struct fsl_ssi {
> struct regmap *regs;
> int irq;
> - struct snd_soc_dai_driver cpu_dai_drv;
>
> unsigned int dai_fmt;
> u8 streams;
> u8 i2s_net;
> + bool synchronous;
> bool use_dma;
> bool use_dual_fifo;
> bool has_ipg_clk_name;
> @@ -668,7 +668,6 @@ static int fsl_ssi_set_bclk(struct snd_pcm_substream *substream,
> bool tx2, tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
> struct fsl_ssi *ssi = snd_soc_dai_get_drvdata(dai);
> struct regmap *regs = ssi->regs;
> - int synchronous = ssi->cpu_dai_drv.symmetric_rates, ret;
> u32 pm = 999, div2, psr, stccr, mask, afreq, factor, i;
> unsigned long clkrate, baudrate, tmprate;
> unsigned int slots = params_channels(hw_params);
> @@ -676,6 +675,7 @@ static int fsl_ssi_set_bclk(struct snd_pcm_substream *substream,
> u64 sub, savesub = 100000;
> unsigned int freq;
> bool baudclk_is_used;
> + int ret;
>
> /* Override slots and slot_width if being specifically set... */
> if (ssi->slots)
> @@ -754,7 +754,7 @@ static int fsl_ssi_set_bclk(struct snd_pcm_substream *substream,
> mask = SSI_SxCCR_PM_MASK | SSI_SxCCR_DIV2 | SSI_SxCCR_PSR;
>
> /* STCCR is used for RX in synchronous mode */
> - tx2 = tx || synchronous;
> + tx2 = tx || ssi->synchronous;
> regmap_update_bits(regs, REG_SSI_SxCCR(tx2), mask, stccr);
>
> if (!baudclk_is_used) {
> @@ -802,7 +802,7 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream *substream,
> * that should set separate configurations for STCCR and SRCCR
> * despite running in the synchronous mode.
> */
> - if (enabled && ssi->cpu_dai_drv.symmetric_rates)
> + if (enabled && ssi->synchronous)
> return 0;
>
> if (fsl_ssi_is_i2s_master(ssi)) {
> @@ -834,7 +834,7 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream *substream,
> }
>
> /* In synchronous mode, the SSI uses STCCR for capture */
> - tx2 = tx || ssi->cpu_dai_drv.symmetric_rates;
> + tx2 = tx || ssi->synchronous;
> regmap_update_bits(regs, REG_SSI_SxCCR(tx2), SSI_SxCCR_WL_MASK, wl);
>
> return 0;
> @@ -959,7 +959,7 @@ static int _fsl_ssi_set_dai_fmt(struct fsl_ssi *ssi, unsigned int fmt)
> srcr = strcr;
>
> /* Set SYN mode and clear RXDIR bit when using SYN or AC97 mode */
> - if (ssi->cpu_dai_drv.symmetric_rates || fsl_ssi_is_ac97(ssi)) {
> + if (ssi->synchronous || fsl_ssi_is_ac97(ssi)) {
> srcr &= ~SSI_SRCR_RXDIR;
> scr |= SSI_SCR_SYN;
> }
> @@ -1360,6 +1360,7 @@ static void fsl_ssi_imx_clean(struct platform_device *pdev, struct fsl_ssi *ssi)
>
> static int fsl_ssi_probe(struct platform_device *pdev)
> {
> + struct snd_soc_dai_driver *cpu_dai_drv;
> struct fsl_ssi *ssi;
> int ret = 0;
> struct device_node *np = pdev->dev.of_node;
> @@ -1394,14 +1395,12 @@ static int fsl_ssi_probe(struct platform_device *pdev)
> ssi->use_dma = !of_property_read_bool(np, "fsl,fiq-stream-filter");
>
> if (fsl_ssi_is_ac97(ssi)) {
> - memcpy(&ssi->cpu_dai_drv, &fsl_ssi_ac97_dai,
> - sizeof(fsl_ssi_ac97_dai));
> + cpu_dai_drv = &fsl_ssi_ac97_dai;
> fsl_ac97_data = ssi;
> } else {
> - memcpy(&ssi->cpu_dai_drv, &fsl_ssi_dai_template,
> - sizeof(fsl_ssi_dai_template));
> + cpu_dai_drv = &fsl_ssi_dai_template;
> }
> - ssi->cpu_dai_drv.name = dev_name(dev);
> + cpu_dai_drv->name = dev_name(dev);
>
> res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> iomem = devm_ioremap_resource(dev, res);
> @@ -1439,11 +1438,12 @@ static int fsl_ssi_probe(struct platform_device *pdev)
> /* Set software limitations for synchronous mode */
> if (!of_find_property(np, "fsl,ssi-asynchronous", NULL)) {
> if (!fsl_ssi_is_ac97(ssi)) {
> - ssi->cpu_dai_drv.symmetric_rates = 1;
> - ssi->cpu_dai_drv.symmetric_samplebits = 1;
> + cpu_dai_drv->symmetric_rates = 1;
> + cpu_dai_drv->symmetric_samplebits = 1;
> + ssi->synchronous = true;
> }
>
> - ssi->cpu_dai_drv.symmetric_channels = 1;
> + cpu_dai_drv->symmetric_channels = 1;
> }
>
> /* Fetch FIFO depth; Set to 8 for older DT without this property */
> @@ -1498,7 +1498,7 @@ static int fsl_ssi_probe(struct platform_device *pdev)
> }
>
> ret = devm_snd_soc_register_component(dev, &fsl_ssi_component,
> - &ssi->cpu_dai_drv, 1);
> + cpu_dai_drv, 1);
> if (ret) {
> dev_err(dev, "failed to register DAI: %d\n", ret);
> goto error_asoc_register;
>
WARNING: multiple messages have this Message-ID (diff)
From: "Maciej S. Szmigiero" <mail@maciej.szmigiero.name>
To: Nicolin Chen <nicoleotsuka@gmail.com>
Cc: alsa-devel@alsa-project.org, kernel@pengutronix.de,
linux-kernel@vger.kernel.org, lgirdwood@gmail.com,
caleb@crome.org, timur@tabi.org, broonie@kernel.org,
arnaud.mouiche@invoxia.com, lukma@denx.de, fabio.estevam@nxp.com,
linuxppc-dev@lists.ozlabs.org
Subject: Re: [PATCH v2 14/16] ASoC: fsl_ssi: Remove cpu_dai_drv from fsl_ssi structure
Date: Sun, 14 Jan 2018 23:42:59 +0100 [thread overview]
Message-ID: <4626cd37-c84c-6187-51ae-73fa419b801e@maciej.szmigiero.name> (raw)
In-Reply-To: <1515652995-15996-15-git-send-email-nicoleotsuka@gmail.com>
On 11.01.2018 07:43, Nicolin Chen wrote:
> The cpu_dai_drv is only used for symmetric_rates. So this patch replaces
> it with a synchronous boolean flag.
You make cpu_dai_drv common to all SSI instances instead of per-instance.
What if you have multiple SSIs in the system with different
symmetric_{rates,samplebits,channels} settings?
Maciej
> Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>
> Tested-by: Caleb Crome <caleb@crome.org>
> ---
> sound/soc/fsl/fsl_ssi.c | 32 ++++++++++++++++----------------
> 1 file changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
> index 213962a..716603c 100644
> --- a/sound/soc/fsl/fsl_ssi.c
> +++ b/sound/soc/fsl/fsl_ssi.c
> @@ -208,11 +208,11 @@ struct fsl_ssi_soc_data {
> *
> * @regs: Pointer to the regmap registers
> * @irq: IRQ of this SSI
> - * @cpu_dai_drv: CPU DAI driver for this device
> *
> * @dai_fmt: DAI configuration this device is currently used with
> * @streams: Mask of current active streams: BIT(TX) and BIT(RX)
> * @i2s_net: I2S and Network mode configurations of SCR register
> + * @synchronous: Use synchronous mode - both of TX and RX use STCK and SFCK
> * @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
> @@ -253,11 +253,11 @@ struct fsl_ssi_soc_data {
> struct fsl_ssi {
> struct regmap *regs;
> int irq;
> - struct snd_soc_dai_driver cpu_dai_drv;
>
> unsigned int dai_fmt;
> u8 streams;
> u8 i2s_net;
> + bool synchronous;
> bool use_dma;
> bool use_dual_fifo;
> bool has_ipg_clk_name;
> @@ -668,7 +668,6 @@ static int fsl_ssi_set_bclk(struct snd_pcm_substream *substream,
> bool tx2, tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
> struct fsl_ssi *ssi = snd_soc_dai_get_drvdata(dai);
> struct regmap *regs = ssi->regs;
> - int synchronous = ssi->cpu_dai_drv.symmetric_rates, ret;
> u32 pm = 999, div2, psr, stccr, mask, afreq, factor, i;
> unsigned long clkrate, baudrate, tmprate;
> unsigned int slots = params_channels(hw_params);
> @@ -676,6 +675,7 @@ static int fsl_ssi_set_bclk(struct snd_pcm_substream *substream,
> u64 sub, savesub = 100000;
> unsigned int freq;
> bool baudclk_is_used;
> + int ret;
>
> /* Override slots and slot_width if being specifically set... */
> if (ssi->slots)
> @@ -754,7 +754,7 @@ static int fsl_ssi_set_bclk(struct snd_pcm_substream *substream,
> mask = SSI_SxCCR_PM_MASK | SSI_SxCCR_DIV2 | SSI_SxCCR_PSR;
>
> /* STCCR is used for RX in synchronous mode */
> - tx2 = tx || synchronous;
> + tx2 = tx || ssi->synchronous;
> regmap_update_bits(regs, REG_SSI_SxCCR(tx2), mask, stccr);
>
> if (!baudclk_is_used) {
> @@ -802,7 +802,7 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream *substream,
> * that should set separate configurations for STCCR and SRCCR
> * despite running in the synchronous mode.
> */
> - if (enabled && ssi->cpu_dai_drv.symmetric_rates)
> + if (enabled && ssi->synchronous)
> return 0;
>
> if (fsl_ssi_is_i2s_master(ssi)) {
> @@ -834,7 +834,7 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream *substream,
> }
>
> /* In synchronous mode, the SSI uses STCCR for capture */
> - tx2 = tx || ssi->cpu_dai_drv.symmetric_rates;
> + tx2 = tx || ssi->synchronous;
> regmap_update_bits(regs, REG_SSI_SxCCR(tx2), SSI_SxCCR_WL_MASK, wl);
>
> return 0;
> @@ -959,7 +959,7 @@ static int _fsl_ssi_set_dai_fmt(struct fsl_ssi *ssi, unsigned int fmt)
> srcr = strcr;
>
> /* Set SYN mode and clear RXDIR bit when using SYN or AC97 mode */
> - if (ssi->cpu_dai_drv.symmetric_rates || fsl_ssi_is_ac97(ssi)) {
> + if (ssi->synchronous || fsl_ssi_is_ac97(ssi)) {
> srcr &= ~SSI_SRCR_RXDIR;
> scr |= SSI_SCR_SYN;
> }
> @@ -1360,6 +1360,7 @@ static void fsl_ssi_imx_clean(struct platform_device *pdev, struct fsl_ssi *ssi)
>
> static int fsl_ssi_probe(struct platform_device *pdev)
> {
> + struct snd_soc_dai_driver *cpu_dai_drv;
> struct fsl_ssi *ssi;
> int ret = 0;
> struct device_node *np = pdev->dev.of_node;
> @@ -1394,14 +1395,12 @@ static int fsl_ssi_probe(struct platform_device *pdev)
> ssi->use_dma = !of_property_read_bool(np, "fsl,fiq-stream-filter");
>
> if (fsl_ssi_is_ac97(ssi)) {
> - memcpy(&ssi->cpu_dai_drv, &fsl_ssi_ac97_dai,
> - sizeof(fsl_ssi_ac97_dai));
> + cpu_dai_drv = &fsl_ssi_ac97_dai;
> fsl_ac97_data = ssi;
> } else {
> - memcpy(&ssi->cpu_dai_drv, &fsl_ssi_dai_template,
> - sizeof(fsl_ssi_dai_template));
> + cpu_dai_drv = &fsl_ssi_dai_template;
> }
> - ssi->cpu_dai_drv.name = dev_name(dev);
> + cpu_dai_drv->name = dev_name(dev);
>
> res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> iomem = devm_ioremap_resource(dev, res);
> @@ -1439,11 +1438,12 @@ static int fsl_ssi_probe(struct platform_device *pdev)
> /* Set software limitations for synchronous mode */
> if (!of_find_property(np, "fsl,ssi-asynchronous", NULL)) {
> if (!fsl_ssi_is_ac97(ssi)) {
> - ssi->cpu_dai_drv.symmetric_rates = 1;
> - ssi->cpu_dai_drv.symmetric_samplebits = 1;
> + cpu_dai_drv->symmetric_rates = 1;
> + cpu_dai_drv->symmetric_samplebits = 1;
> + ssi->synchronous = true;
> }
>
> - ssi->cpu_dai_drv.symmetric_channels = 1;
> + cpu_dai_drv->symmetric_channels = 1;
> }
>
> /* Fetch FIFO depth; Set to 8 for older DT without this property */
> @@ -1498,7 +1498,7 @@ static int fsl_ssi_probe(struct platform_device *pdev)
> }
>
> ret = devm_snd_soc_register_component(dev, &fsl_ssi_component,
> - &ssi->cpu_dai_drv, 1);
> + cpu_dai_drv, 1);
> if (ret) {
> dev_err(dev, "failed to register DAI: %d\n", ret);
> goto error_asoc_register;
>
next prev parent reply other threads:[~2018-01-14 22:43 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-11 6:42 [PATCH v2 00/16] ASoC: fsl_ssi: Clean up - program flow level Nicolin Chen
2018-01-11 6:42 ` Nicolin Chen
2018-01-11 6:43 ` [PATCH v2 01/16] ASoC: fsl_ssi: Keep ssi->i2s_net updated Nicolin Chen
2018-01-11 6:43 ` Nicolin Chen
2018-02-22 13:17 ` Applied "ASoC: fsl_ssi: Keep ssi->i2s_net updated" to the asoc tree Mark Brown
2018-02-22 13:17 ` Mark Brown
2018-01-11 6:43 ` [PATCH v2 02/16] ASoC: fsl_ssi: Clean up set_dai_tdm_slot() Nicolin Chen
2018-01-11 6:43 ` [PATCH v2 03/16] ASoC: fsl_ssi: Maintain a mask of active streams Nicolin Chen
2018-01-11 6:43 ` Nicolin Chen
2018-01-14 22:34 ` Maciej S. Szmigiero
2018-01-14 22:34 ` Maciej S. Szmigiero
2018-01-14 23:57 ` Nicolin Chen
2018-01-11 6:43 ` [PATCH v2 04/16] ASoC: fsl_ssi: Rename fsl_ssi_disable_val macro Nicolin Chen
2018-01-11 6:43 ` Nicolin Chen
2018-01-14 22:34 ` Maciej S. Szmigiero
2018-01-14 22:34 ` Maciej S. Szmigiero
2018-01-15 0:03 ` Nicolin Chen
2018-01-11 6:43 ` [PATCH v2 05/16] ASoC: fsl_ssi: Clear FIFO directly in fsl_ssi_config() Nicolin Chen
2018-01-11 6:43 ` Nicolin Chen
2018-01-11 6:43 ` [PATCH v2 06/16] ASoC: fsl_ssi: Clean up helper functions of trigger() Nicolin Chen
2018-01-14 22:37 ` Maciej S. Szmigiero
2018-01-14 22:37 ` Maciej S. Szmigiero
2018-01-11 6:43 ` [PATCH v2 07/16] ASoC: fsl_ssi: Add DAIFMT define for AC97 Nicolin Chen
2018-01-11 6:43 ` [PATCH v2 08/16] ASoC: fsl_ssi: Clean up fsl_ssi_setup_regvals() Nicolin Chen
2018-01-11 6:43 ` [PATCH v2 09/16] ASoC: fsl_ssi: Set xFEN0 and xFEN1 together Nicolin Chen
2018-01-11 6:43 ` [PATCH v2 10/16] ASoC: fsl_ssi: Use snd_soc_init_dma_data instead Nicolin Chen
2018-01-11 6:43 ` [PATCH v2 11/16] ASoC: fsl_ssi: Move one-time configurations to probe() Nicolin Chen
2018-01-11 6:43 ` [PATCH v2 12/16] ASoC: fsl_ssi: Setup AC97 in fsl_ssi_hw_init() Nicolin Chen
2018-01-11 6:43 ` [PATCH v2 13/16] ASoC: fsl_ssi: Clean up _fsl_ssi_set_dai_fmt() Nicolin Chen
2018-01-14 22:40 ` Maciej S. Szmigiero
2018-01-14 22:40 ` Maciej S. Szmigiero
2018-01-15 0:11 ` Nicolin Chen
2018-01-15 0:11 ` Nicolin Chen
2018-01-11 6:43 ` [PATCH v2 14/16] ASoC: fsl_ssi: Remove cpu_dai_drv from fsl_ssi structure Nicolin Chen
2018-01-14 22:42 ` Maciej S. Szmigiero [this message]
2018-01-14 22:42 ` Maciej S. Szmigiero
2018-01-15 0:13 ` Nicolin Chen
2018-01-15 0:13 ` Nicolin Chen
2018-01-11 6:43 ` [PATCH v2 15/16] ASoC: fsl_ssi: Move DT related code to a separate probe() Nicolin Chen
2018-01-11 6:43 ` [PATCH v2 16/16] ASoC: fsl_ssi: Use ssi->streams instead of reading register Nicolin Chen
2018-02-22 13:16 ` Applied "ASoC: fsl_ssi: Use ssi->streams instead of reading register" to the asoc tree Mark Brown
2018-02-22 13:16 ` Mark Brown
2018-01-12 17:35 ` [PATCH v2 00/16] ASoC: fsl_ssi: Clean up - program flow level Caleb Crome
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4626cd37-c84c-6187-51ae-73fa419b801e@maciej.szmigiero.name \
--to=mail@maciej.szmigiero.name \
--cc=alsa-devel@alsa-project.org \
--cc=arnaud.mouiche@invoxia.com \
--cc=broonie@kernel.org \
--cc=caleb@crome.org \
--cc=fabio.estevam@nxp.com \
--cc=kernel@pengutronix.de \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=lukma@denx.de \
--cc=nicoleotsuka@gmail.com \
--cc=timur@tabi.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.