* [PATCH 0/2] ASoC: sun4i-spdif: Changes in preparation of supporting new SoCs @ 2016-12-20 14:49 codekipper at gmail.com 2016-12-20 14:49 ` [PATCH 1/2] ASoC: sun4i-spdif: remove legacy dapm components codekipper at gmail.com 2016-12-20 14:49 ` [PATCH 2/2] ASoC: sun4i-spdif: Add quirks to the spdif driver codekipper at gmail.com 0 siblings, 2 replies; 7+ messages in thread From: codekipper at gmail.com @ 2016-12-20 14:49 UTC (permalink / raw) To: linux-arm-kernel From: Marcus Cooper <codekipper@gmail.com> Hi All, please find attached two patches. First being a cleanup of something that shouldn't be in the code and the second adds the mechanism for supporting newer Allwiner SoCs. There was a third patch in the series and that was bringing in support of SPDIF on the Allwinner H3 but I've not been able to test it so that I hear audio. As soon as I get some hardware with a SPDIF connection I will confirm and push. BR, CK Marcus Cooper (2): ASoC: sun4i-spdif: remove legacy dapm components ASoC: sun4i-spdif: Add quirks to the spdif driver sound/soc/sunxi/sun4i-spdif.c | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) -- 2.11.0 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] ASoC: sun4i-spdif: remove legacy dapm components 2016-12-20 14:49 [PATCH 0/2] ASoC: sun4i-spdif: Changes in preparation of supporting new SoCs codekipper at gmail.com @ 2016-12-20 14:49 ` codekipper at gmail.com 2016-12-20 19:11 ` Maxime Ripard 2016-12-31 19:19 ` Applied "ASoC: sun4i-spdif: remove legacy dapm components" to the asoc tree Mark Brown 2016-12-20 14:49 ` [PATCH 2/2] ASoC: sun4i-spdif: Add quirks to the spdif driver codekipper at gmail.com 1 sibling, 2 replies; 7+ messages in thread From: codekipper at gmail.com @ 2016-12-20 14:49 UTC (permalink / raw) To: linux-arm-kernel From: Marcus Cooper <codekipper@gmail.com> The dapm components are now handled by the ALSA SoC SPDIF DIT driver so can be removed. Signed-off-by: Marcus Cooper <codekipper@gmail.com> --- sound/soc/sunxi/sun4i-spdif.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c index 88fbb3a1e660..048de15d6937 100644 --- a/sound/soc/sunxi/sun4i-spdif.c +++ b/sound/soc/sunxi/sun4i-spdif.c @@ -403,14 +403,6 @@ static struct snd_soc_dai_driver sun4i_spdif_dai = { .name = "spdif", }; -static const struct snd_soc_dapm_widget dit_widgets[] = { - SND_SOC_DAPM_OUTPUT("spdif-out"), -}; - -static const struct snd_soc_dapm_route dit_routes[] = { - { "spdif-out", NULL, "Playback" }, -}; - static const struct of_device_id sun4i_spdif_of_match[] = { { .compatible = "allwinner,sun4i-a10-spdif", }, { .compatible = "allwinner,sun6i-a31-spdif", }, -- 2.11.0 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 1/2] ASoC: sun4i-spdif: remove legacy dapm components 2016-12-20 14:49 ` [PATCH 1/2] ASoC: sun4i-spdif: remove legacy dapm components codekipper at gmail.com @ 2016-12-20 19:11 ` Maxime Ripard 2016-12-31 19:19 ` Applied "ASoC: sun4i-spdif: remove legacy dapm components" to the asoc tree Mark Brown 1 sibling, 0 replies; 7+ messages in thread From: Maxime Ripard @ 2016-12-20 19:11 UTC (permalink / raw) To: linux-arm-kernel On Tue, Dec 20, 2016 at 03:49:13PM +0100, codekipper at gmail.com wrote: > From: Marcus Cooper <codekipper@gmail.com> > > The dapm components are now handled by the ALSA SoC SPDIF DIT driver > so can be removed. > > Signed-off-by: Marcus Cooper <codekipper@gmail.com> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Thanks, Maxime -- Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 801 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20161220/8560510e/attachment.sig> ^ permalink raw reply [flat|nested] 7+ messages in thread
* Applied "ASoC: sun4i-spdif: remove legacy dapm components" to the asoc tree 2016-12-20 14:49 ` [PATCH 1/2] ASoC: sun4i-spdif: remove legacy dapm components codekipper at gmail.com 2016-12-20 19:11 ` Maxime Ripard @ 2016-12-31 19:19 ` Mark Brown 1 sibling, 0 replies; 7+ messages in thread From: Mark Brown @ 2016-12-31 19:19 UTC (permalink / raw) To: linux-arm-kernel The patch ASoC: sun4i-spdif: remove legacy dapm components has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 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 >From 96e53c41e1f81c9e9d1ce38d3f28b95668b71dcf Mon Sep 17 00:00:00 2001 From: Marcus Cooper <codekipper@gmail.com> Date: Tue, 20 Dec 2016 15:49:13 +0100 Subject: [PATCH] ASoC: sun4i-spdif: remove legacy dapm components The dapm components are now handled by the ALSA SoC SPDIF DIT driver so can be removed. Signed-off-by: Marcus Cooper <codekipper@gmail.com> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/sunxi/sun4i-spdif.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c index 88fbb3a1e660..048de15d6937 100644 --- a/sound/soc/sunxi/sun4i-spdif.c +++ b/sound/soc/sunxi/sun4i-spdif.c @@ -403,14 +403,6 @@ static struct snd_soc_dai_driver sun4i_spdif_dai = { .name = "spdif", }; -static const struct snd_soc_dapm_widget dit_widgets[] = { - SND_SOC_DAPM_OUTPUT("spdif-out"), -}; - -static const struct snd_soc_dapm_route dit_routes[] = { - { "spdif-out", NULL, "Playback" }, -}; - static const struct of_device_id sun4i_spdif_of_match[] = { { .compatible = "allwinner,sun4i-a10-spdif", }, { .compatible = "allwinner,sun6i-a31-spdif", }, -- 2.11.0 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] ASoC: sun4i-spdif: Add quirks to the spdif driver 2016-12-20 14:49 [PATCH 0/2] ASoC: sun4i-spdif: Changes in preparation of supporting new SoCs codekipper at gmail.com 2016-12-20 14:49 ` [PATCH 1/2] ASoC: sun4i-spdif: remove legacy dapm components codekipper at gmail.com @ 2016-12-20 14:49 ` codekipper at gmail.com 2016-12-20 19:12 ` Maxime Ripard 2016-12-31 19:19 ` Applied "ASoC: sun4i-spdif: Add quirks to the spdif driver" to the asoc tree Mark Brown 1 sibling, 2 replies; 7+ messages in thread From: codekipper at gmail.com @ 2016-12-20 14:49 UTC (permalink / raw) To: linux-arm-kernel From: Marcus Cooper <codekipper@gmail.com> It has been seen that some newer SoCs have a different TX FIFO address and we already have the difference with the A31 requiring a reset. Add a quirks structure so that these can be managed easily. Signed-off-by: Marcus Cooper <codekipper@gmail.com> --- sound/soc/sunxi/sun4i-spdif.c | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c index 048de15d6937..fec62ee1fc72 100644 --- a/sound/soc/sunxi/sun4i-spdif.c +++ b/sound/soc/sunxi/sun4i-spdif.c @@ -403,9 +403,29 @@ static struct snd_soc_dai_driver sun4i_spdif_dai = { .name = "spdif", }; +struct sun4i_spdif_quirks { + unsigned int reg_dac_txdata; /* TX FIFO offset for DMA config */ + bool has_reset; +}; + +static const struct sun4i_spdif_quirks sun4i_a10_spdif_quirks = { + .reg_dac_txdata = SUN4I_SPDIF_TXFIFO, +}; + +static const struct sun4i_spdif_quirks sun6i_a31_spdif_quirks = { + .reg_dac_txdata = SUN4I_SPDIF_TXFIFO, + .has_reset = true, +}; + static const struct of_device_id sun4i_spdif_of_match[] = { - { .compatible = "allwinner,sun4i-a10-spdif", }, - { .compatible = "allwinner,sun6i-a31-spdif", }, + { + .compatible = "allwinner,sun4i-a10-spdif", + .data = &sun4i_a10_spdif_quirks, + }, + { + .compatible = "allwinner,sun6i-a31-spdif", + .data = &sun6i_a31_spdif_quirks, + }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, sun4i_spdif_of_match); @@ -438,6 +458,7 @@ static int sun4i_spdif_probe(struct platform_device *pdev) { struct sun4i_spdif_dev *host; struct resource *res; + const struct sun4i_spdif_quirks *quirks; int ret; void __iomem *base; @@ -459,6 +480,12 @@ static int sun4i_spdif_probe(struct platform_device *pdev) if (IS_ERR(base)) return PTR_ERR(base); + quirks = of_device_get_match_data(&pdev->dev); + if (quirks == NULL) { + dev_err(&pdev->dev, "Failed to determine the quirks to use\n"); + return -ENODEV; + } + host->regmap = devm_regmap_init_mmio(&pdev->dev, base, &sun4i_spdif_regmap_config); @@ -476,14 +503,13 @@ static int sun4i_spdif_probe(struct platform_device *pdev) goto err_disable_apb_clk; } - host->dma_params_tx.addr = res->start + SUN4I_SPDIF_TXFIFO; + host->dma_params_tx.addr = res->start + quirks->reg_dac_txdata; host->dma_params_tx.maxburst = 8; host->dma_params_tx.addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES; platform_set_drvdata(pdev, host); - if (of_device_is_compatible(pdev->dev.of_node, - "allwinner,sun6i-a31-spdif")) { + if (quirks->has_reset) { host->rst = devm_reset_control_get_optional(&pdev->dev, NULL); if (IS_ERR(host->rst) && PTR_ERR(host->rst) == -EPROBE_DEFER) { ret = -EPROBE_DEFER; -- 2.11.0 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] ASoC: sun4i-spdif: Add quirks to the spdif driver 2016-12-20 14:49 ` [PATCH 2/2] ASoC: sun4i-spdif: Add quirks to the spdif driver codekipper at gmail.com @ 2016-12-20 19:12 ` Maxime Ripard 2016-12-31 19:19 ` Applied "ASoC: sun4i-spdif: Add quirks to the spdif driver" to the asoc tree Mark Brown 1 sibling, 0 replies; 7+ messages in thread From: Maxime Ripard @ 2016-12-20 19:12 UTC (permalink / raw) To: linux-arm-kernel On Tue, Dec 20, 2016 at 03:49:14PM +0100, codekipper at gmail.com wrote: > From: Marcus Cooper <codekipper@gmail.com> > > It has been seen that some newer SoCs have a different TX FIFO > address and we already have the difference with the A31 requiring > a reset. Add a quirks structure so that these can be managed > easily. > > Signed-off-by: Marcus Cooper <codekipper@gmail.com> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Thanks, Maxime -- Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 801 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20161220/f7369346/attachment.sig> ^ permalink raw reply [flat|nested] 7+ messages in thread
* Applied "ASoC: sun4i-spdif: Add quirks to the spdif driver" to the asoc tree 2016-12-20 14:49 ` [PATCH 2/2] ASoC: sun4i-spdif: Add quirks to the spdif driver codekipper at gmail.com 2016-12-20 19:12 ` Maxime Ripard @ 2016-12-31 19:19 ` Mark Brown 1 sibling, 0 replies; 7+ messages in thread From: Mark Brown @ 2016-12-31 19:19 UTC (permalink / raw) To: linux-arm-kernel The patch ASoC: sun4i-spdif: Add quirks to the spdif driver has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 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 >From 7762681a3ada5fca6017e75ea7f9cdac08fc50b9 Mon Sep 17 00:00:00 2001 From: Marcus Cooper <codekipper@gmail.com> Date: Tue, 20 Dec 2016 15:49:14 +0100 Subject: [PATCH] ASoC: sun4i-spdif: Add quirks to the spdif driver It has been seen that some newer SoCs have a different TX FIFO address and we already have the difference with the A31 requiring a reset. Add a quirks structure so that these can be managed easily. Signed-off-by: Marcus Cooper <codekipper@gmail.com> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/sunxi/sun4i-spdif.c | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c index 048de15d6937..fec62ee1fc72 100644 --- a/sound/soc/sunxi/sun4i-spdif.c +++ b/sound/soc/sunxi/sun4i-spdif.c @@ -403,9 +403,29 @@ static struct snd_soc_dai_driver sun4i_spdif_dai = { .name = "spdif", }; +struct sun4i_spdif_quirks { + unsigned int reg_dac_txdata; /* TX FIFO offset for DMA config */ + bool has_reset; +}; + +static const struct sun4i_spdif_quirks sun4i_a10_spdif_quirks = { + .reg_dac_txdata = SUN4I_SPDIF_TXFIFO, +}; + +static const struct sun4i_spdif_quirks sun6i_a31_spdif_quirks = { + .reg_dac_txdata = SUN4I_SPDIF_TXFIFO, + .has_reset = true, +}; + static const struct of_device_id sun4i_spdif_of_match[] = { - { .compatible = "allwinner,sun4i-a10-spdif", }, - { .compatible = "allwinner,sun6i-a31-spdif", }, + { + .compatible = "allwinner,sun4i-a10-spdif", + .data = &sun4i_a10_spdif_quirks, + }, + { + .compatible = "allwinner,sun6i-a31-spdif", + .data = &sun6i_a31_spdif_quirks, + }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, sun4i_spdif_of_match); @@ -438,6 +458,7 @@ static int sun4i_spdif_probe(struct platform_device *pdev) { struct sun4i_spdif_dev *host; struct resource *res; + const struct sun4i_spdif_quirks *quirks; int ret; void __iomem *base; @@ -459,6 +480,12 @@ static int sun4i_spdif_probe(struct platform_device *pdev) if (IS_ERR(base)) return PTR_ERR(base); + quirks = of_device_get_match_data(&pdev->dev); + if (quirks == NULL) { + dev_err(&pdev->dev, "Failed to determine the quirks to use\n"); + return -ENODEV; + } + host->regmap = devm_regmap_init_mmio(&pdev->dev, base, &sun4i_spdif_regmap_config); @@ -476,14 +503,13 @@ static int sun4i_spdif_probe(struct platform_device *pdev) goto err_disable_apb_clk; } - host->dma_params_tx.addr = res->start + SUN4I_SPDIF_TXFIFO; + host->dma_params_tx.addr = res->start + quirks->reg_dac_txdata; host->dma_params_tx.maxburst = 8; host->dma_params_tx.addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES; platform_set_drvdata(pdev, host); - if (of_device_is_compatible(pdev->dev.of_node, - "allwinner,sun6i-a31-spdif")) { + if (quirks->has_reset) { host->rst = devm_reset_control_get_optional(&pdev->dev, NULL); if (IS_ERR(host->rst) && PTR_ERR(host->rst) == -EPROBE_DEFER) { ret = -EPROBE_DEFER; -- 2.11.0 ^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-12-31 19:19 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-12-20 14:49 [PATCH 0/2] ASoC: sun4i-spdif: Changes in preparation of supporting new SoCs codekipper at gmail.com 2016-12-20 14:49 ` [PATCH 1/2] ASoC: sun4i-spdif: remove legacy dapm components codekipper at gmail.com 2016-12-20 19:11 ` Maxime Ripard 2016-12-31 19:19 ` Applied "ASoC: sun4i-spdif: remove legacy dapm components" to the asoc tree Mark Brown 2016-12-20 14:49 ` [PATCH 2/2] ASoC: sun4i-spdif: Add quirks to the spdif driver codekipper at gmail.com 2016-12-20 19:12 ` Maxime Ripard 2016-12-31 19:19 ` Applied "ASoC: sun4i-spdif: Add quirks to the spdif driver" to the asoc tree 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).