* [PATCH 1/2] ASoC: dt-bindings: fsl_spdif: Add new compatible string for i.MX8QM @ 2020-10-15 5:28 Shengjiu Wang 2020-10-15 5:28 ` [PATCH 2/2] ASoC: fsl_spdif: Add support for i.MX8QM platform Shengjiu Wang ` (2 more replies) 0 siblings, 3 replies; 5+ messages in thread From: Shengjiu Wang @ 2020-10-15 5:28 UTC (permalink / raw) To: timur, nicoleotsuka, Xiubo.Lee, festevam, broonie, perex, tiwai, alsa-devel, lgirdwood, robh+dt, devicetree Cc: linuxppc-dev, linux-kernel Add new compatible string "fsl,imx8qm-spdif" for supporting spdif module on i.MX8QM. Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> --- Documentation/devicetree/bindings/sound/fsl,spdif.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/sound/fsl,spdif.yaml b/Documentation/devicetree/bindings/sound/fsl,spdif.yaml index 2ac671f5cb9b..50449b6d1048 100644 --- a/Documentation/devicetree/bindings/sound/fsl,spdif.yaml +++ b/Documentation/devicetree/bindings/sound/fsl,spdif.yaml @@ -20,6 +20,7 @@ properties: - fsl,imx35-spdif - fsl,vf610-spdif - fsl,imx6sx-spdif + - fsl,imx8qm-spdif reg: maxItems: 1 -- 2.27.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] ASoC: fsl_spdif: Add support for i.MX8QM platform 2020-10-15 5:28 [PATCH 1/2] ASoC: dt-bindings: fsl_spdif: Add new compatible string for i.MX8QM Shengjiu Wang @ 2020-10-15 5:28 ` Shengjiu Wang 2020-10-17 1:23 ` Nicolin Chen 2020-10-19 21:14 ` [PATCH 1/2] ASoC: dt-bindings: fsl_spdif: Add new compatible string for i.MX8QM Rob Herring 2020-10-26 23:46 ` Mark Brown 2 siblings, 1 reply; 5+ messages in thread From: Shengjiu Wang @ 2020-10-15 5:28 UTC (permalink / raw) To: timur, nicoleotsuka, Xiubo.Lee, festevam, broonie, perex, tiwai, alsa-devel, lgirdwood, robh+dt, devicetree Cc: linuxppc-dev, linux-kernel On i.MX8QM, there are separate interrupts for TX and RX. As the EDMA can't be configured to swing back to first FIFO after writing the second FIFO, so we need to force the burst size to be 2 on i.MX8QM. And EDMA don't support to shift the data from S24_LE to S16_LE, so the supported TX format is also different on i.MX8QM. Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> --- sound/soc/fsl/fsl_spdif.c | 57 ++++++++++++++++++++++++++++++++------- 1 file changed, 47 insertions(+), 10 deletions(-) diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c index f41496cf5b63..5fa178f3f497 100644 --- a/sound/soc/fsl/fsl_spdif.c +++ b/sound/soc/fsl/fsl_spdif.c @@ -49,10 +49,18 @@ static u8 srpc_dpll_locked[] = { 0x0, 0x1, 0x2, 0x3, 0x4, 0xa, 0xb }; * @imx: for imx platform * @shared_root_clock: flag of sharing a clock source with others; * so the driver shouldn't set root clock rate + * @interrupts: interrupt number + * @tx_burst: tx maxburst size + * @rx_burst: rx maxburst size + * @tx_formats: tx supported data format */ struct fsl_spdif_soc_data { bool imx; bool shared_root_clock; + u32 interrupts; + u32 tx_burst; + u32 rx_burst; + u64 tx_formats; }; /* @@ -128,16 +136,38 @@ struct fsl_spdif_priv { static struct fsl_spdif_soc_data fsl_spdif_vf610 = { .imx = false, .shared_root_clock = false, + .interrupts = 1, + .tx_burst = FSL_SPDIF_TXFIFO_WML, + .rx_burst = FSL_SPDIF_RXFIFO_WML, + .tx_formats = FSL_SPDIF_FORMATS_PLAYBACK, }; static struct fsl_spdif_soc_data fsl_spdif_imx35 = { .imx = true, .shared_root_clock = false, + .interrupts = 1, + .tx_burst = FSL_SPDIF_TXFIFO_WML, + .rx_burst = FSL_SPDIF_RXFIFO_WML, + .tx_formats = FSL_SPDIF_FORMATS_PLAYBACK, }; static struct fsl_spdif_soc_data fsl_spdif_imx6sx = { .imx = true, .shared_root_clock = true, + .interrupts = 1, + .tx_burst = FSL_SPDIF_TXFIFO_WML, + .rx_burst = FSL_SPDIF_RXFIFO_WML, + .tx_formats = FSL_SPDIF_FORMATS_PLAYBACK, + +}; + +static struct fsl_spdif_soc_data fsl_spdif_imx8qm = { + .imx = true, + .shared_root_clock = true, + .interrupts = 2, + .tx_burst = 2, /* Applied for EDMA */ + .rx_burst = 2, /* Applied for EDMA */ + .tx_formats = SNDRV_PCM_FMTBIT_S24_LE, /* Applied for EDMA */ }; /* Check if clk is a root clock that does not share clock source with others */ @@ -1283,6 +1313,8 @@ static int fsl_spdif_probe(struct platform_device *pdev) /* Initialize this copy of the CPU DAI driver structure */ memcpy(&spdif_priv->cpu_dai_drv, &fsl_spdif_dai, sizeof(fsl_spdif_dai)); spdif_priv->cpu_dai_drv.name = dev_name(&pdev->dev); + spdif_priv->cpu_dai_drv.playback.formats = + spdif_priv->soc->tx_formats; /* Get the addresses and IRQ */ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); @@ -1297,15 +1329,19 @@ static int fsl_spdif_probe(struct platform_device *pdev) return PTR_ERR(spdif_priv->regmap); } - irq = platform_get_irq(pdev, 0); - if (irq < 0) - return irq; + for (i = 0; i < spdif_priv->soc->interrupts; i++) { + irq = platform_get_irq(pdev, i); + if (irq < 0) { + dev_err(&pdev->dev, "no irq for node %s\n", pdev->name); + return irq; + } - ret = devm_request_irq(&pdev->dev, irq, spdif_isr, 0, - dev_name(&pdev->dev), spdif_priv); - if (ret) { - dev_err(&pdev->dev, "could not claim irq %u\n", irq); - return ret; + ret = devm_request_irq(&pdev->dev, irq, spdif_isr, 0, + dev_name(&pdev->dev), spdif_priv); + if (ret) { + dev_err(&pdev->dev, "could not claim irq %u\n", irq); + return ret; + } } /* Get system clock for rx clock rate calculation */ @@ -1354,8 +1390,8 @@ static int fsl_spdif_probe(struct platform_device *pdev) spdif_priv->dpll_locked = false; - spdif_priv->dma_params_tx.maxburst = FSL_SPDIF_TXFIFO_WML; - spdif_priv->dma_params_rx.maxburst = FSL_SPDIF_RXFIFO_WML; + spdif_priv->dma_params_tx.maxburst = spdif_priv->soc->tx_burst; + spdif_priv->dma_params_rx.maxburst = spdif_priv->soc->rx_burst; spdif_priv->dma_params_tx.addr = res->start + REG_SPDIF_STL; spdif_priv->dma_params_rx.addr = res->start + REG_SPDIF_SRL; @@ -1468,6 +1504,7 @@ static const struct of_device_id fsl_spdif_dt_ids[] = { { .compatible = "fsl,imx35-spdif", .data = &fsl_spdif_imx35, }, { .compatible = "fsl,vf610-spdif", .data = &fsl_spdif_vf610, }, { .compatible = "fsl,imx6sx-spdif", .data = &fsl_spdif_imx6sx, }, + { .compatible = "fsl,imx8qm-spdif", .data = &fsl_spdif_imx8qm, }, {} }; MODULE_DEVICE_TABLE(of, fsl_spdif_dt_ids); -- 2.27.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] ASoC: fsl_spdif: Add support for i.MX8QM platform 2020-10-15 5:28 ` [PATCH 2/2] ASoC: fsl_spdif: Add support for i.MX8QM platform Shengjiu Wang @ 2020-10-17 1:23 ` Nicolin Chen 0 siblings, 0 replies; 5+ messages in thread From: Nicolin Chen @ 2020-10-17 1:23 UTC (permalink / raw) To: Shengjiu Wang Cc: devicetree, alsa-devel, timur, Xiubo.Lee, lgirdwood, linuxppc-dev, tiwai, robh+dt, broonie, festevam, linux-kernel On Thu, Oct 15, 2020 at 01:28:48PM +0800, Shengjiu Wang wrote: > On i.MX8QM, there are separate interrupts for TX and RX. > > As the EDMA can't be configured to swing back to first FIFO > after writing the second FIFO, so we need to force the burst > size to be 2 on i.MX8QM. And EDMA don't support to shift > the data from S24_LE to S16_LE, so the supported TX format > is also different on i.MX8QM. > > Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> One small nit, yet I am okay if you don't resend. So: Acked-by: Nicolin Chen <nicoleotsuka@gmail.com> > /* Check if clk is a root clock that does not share clock source with others */ > @@ -1283,6 +1313,8 @@ static int fsl_spdif_probe(struct platform_device *pdev) > /* Initialize this copy of the CPU DAI driver structure */ > memcpy(&spdif_priv->cpu_dai_drv, &fsl_spdif_dai, sizeof(fsl_spdif_dai)); > spdif_priv->cpu_dai_drv.name = dev_name(&pdev->dev); > + spdif_priv->cpu_dai_drv.playback.formats = > + spdif_priv->soc->tx_formats; Kernel no longer has strict 80-character limit now, and it seems to fits 80 characters? ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] ASoC: dt-bindings: fsl_spdif: Add new compatible string for i.MX8QM 2020-10-15 5:28 [PATCH 1/2] ASoC: dt-bindings: fsl_spdif: Add new compatible string for i.MX8QM Shengjiu Wang 2020-10-15 5:28 ` [PATCH 2/2] ASoC: fsl_spdif: Add support for i.MX8QM platform Shengjiu Wang @ 2020-10-19 21:14 ` Rob Herring 2020-10-26 23:46 ` Mark Brown 2 siblings, 0 replies; 5+ messages in thread From: Rob Herring @ 2020-10-19 21:14 UTC (permalink / raw) To: Shengjiu Wang Cc: devicetree, alsa-devel, timur, Xiubo.Lee, festevam, broonie, lgirdwood, tiwai, nicoleotsuka, robh+dt, linuxppc-dev, linux-kernel On Thu, 15 Oct 2020 13:28:47 +0800, Shengjiu Wang wrote: > Add new compatible string "fsl,imx8qm-spdif" for supporting spdif > module on i.MX8QM. > > Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> > --- > Documentation/devicetree/bindings/sound/fsl,spdif.yaml | 1 + > 1 file changed, 1 insertion(+) > Acked-by: Rob Herring <robh@kernel.org> ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] ASoC: dt-bindings: fsl_spdif: Add new compatible string for i.MX8QM 2020-10-15 5:28 [PATCH 1/2] ASoC: dt-bindings: fsl_spdif: Add new compatible string for i.MX8QM Shengjiu Wang 2020-10-15 5:28 ` [PATCH 2/2] ASoC: fsl_spdif: Add support for i.MX8QM platform Shengjiu Wang 2020-10-19 21:14 ` [PATCH 1/2] ASoC: dt-bindings: fsl_spdif: Add new compatible string for i.MX8QM Rob Herring @ 2020-10-26 23:46 ` Mark Brown 2 siblings, 0 replies; 5+ messages in thread From: Mark Brown @ 2020-10-26 23:46 UTC (permalink / raw) To: Xiubo.Lee, timur, lgirdwood, Shengjiu Wang, perex, devicetree, tiwai, festevam, robh+dt, alsa-devel, nicoleotsuka Cc: linuxppc-dev, linux-kernel On Thu, 15 Oct 2020 13:28:47 +0800, Shengjiu Wang wrote: > Add new compatible string "fsl,imx8qm-spdif" for supporting spdif > module on i.MX8QM. Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/2] ASoC: dt-bindings: fsl_spdif: Add new compatible string for i.MX8QM commit: 87b2fc1139a13cf81d0a95fb2cbaba7daeee8908 [2/2] ASoC: fsl_spdif: Add support for i.MX8QM platform commit: 516232e3609f485be04445b03723fbaed64a5321 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-10-26 23:50 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-10-15 5:28 [PATCH 1/2] ASoC: dt-bindings: fsl_spdif: Add new compatible string for i.MX8QM Shengjiu Wang 2020-10-15 5:28 ` [PATCH 2/2] ASoC: fsl_spdif: Add support for i.MX8QM platform Shengjiu Wang 2020-10-17 1:23 ` Nicolin Chen 2020-10-19 21:14 ` [PATCH 1/2] ASoC: dt-bindings: fsl_spdif: Add new compatible string for i.MX8QM Rob Herring 2020-10-26 23:46 ` Mark Brown
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).