* [PATCH 2/2] ASoC: sunxi: compatibility for sun6i to SPDIF
@ 2016-07-30 14:27 ` codekipper at gmail.com
0 siblings, 0 replies; 45+ messages in thread
From: codekipper @ 2016-07-30 14:27 UTC (permalink / raw)
To: maxime.ripard
Cc: linux-arm-kernel, linux-sunxi, lgirdwood, broonie, linux-kernel,
alsa-devel, be17068, Marcus Cooper
From: Marcus Cooper <codekipper@gmail.com>
The A31 SoC uses the same SPDIF block as found in earlier SoCs, but its
reset is controlled via a separate reset controller.
The DMA also complains when the maxburst is set to 4 so it's been adjusted
to 8 which suites both the older and newer SoCs.
Signed-off-by: Marcus Cooper <codekipper@gmail.com>
---
sound/soc/sunxi/sun4i-spdif.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c
index 0b04fb0..88fbb3a 100644
--- a/sound/soc/sunxi/sun4i-spdif.c
+++ b/sound/soc/sunxi/sun4i-spdif.c
@@ -29,6 +29,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
+#include <linux/reset.h>
#include <sound/dmaengine_pcm.h>
#include <sound/pcm_params.h>
#include <sound/soc.h>
@@ -162,6 +163,7 @@ struct sun4i_spdif_dev {
struct platform_device *pdev;
struct clk *spdif_clk;
struct clk *apb_clk;
+ struct reset_control *rst;
struct snd_soc_dai_driver cpu_dai_drv;
struct regmap *regmap;
struct snd_dmaengine_dai_dma_data dma_params_tx;
@@ -411,6 +413,7 @@ static const struct snd_soc_dapm_route dit_routes[] = {
static const struct of_device_id sun4i_spdif_of_match[] = {
{ .compatible = "allwinner,sun4i-a10-spdif", },
+ { .compatible = "allwinner,sun6i-a31-spdif", },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, sun4i_spdif_of_match);
@@ -482,11 +485,23 @@ static int sun4i_spdif_probe(struct platform_device *pdev)
}
host->dma_params_tx.addr = res->start + SUN4I_SPDIF_TXFIFO;
- host->dma_params_tx.maxburst = 4;
+ 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")) {
+ host->rst = devm_reset_control_get_optional(&pdev->dev, NULL);
+ if (IS_ERR(host->rst) && PTR_ERR(host->rst) == -EPROBE_DEFER) {
+ ret = -EPROBE_DEFER;
+ dev_err(&pdev->dev, "Failed to get reset: %d\n", ret);
+ goto err_disable_apb_clk;
+ }
+ if (!IS_ERR(host->rst))
+ reset_control_deassert(host->rst);
+ }
+
ret = devm_snd_soc_register_component(&pdev->dev,
&sun4i_spdif_component, &sun4i_spdif_dai, 1);
if (ret)
--
2.9.2
^ permalink raw reply related [flat|nested] 45+ messages in thread* [PATCH 2/2] ASoC: sunxi: compatibility for sun6i to SPDIF
@ 2016-07-30 14:27 ` codekipper at gmail.com
0 siblings, 0 replies; 45+ messages in thread
From: codekipper at gmail.com @ 2016-07-30 14:27 UTC (permalink / raw)
To: linux-arm-kernel
From: Marcus Cooper <codekipper@gmail.com>
The A31 SoC uses the same SPDIF block as found in earlier SoCs, but its
reset is controlled via a separate reset controller.
The DMA also complains when the maxburst is set to 4 so it's been adjusted
to 8 which suites both the older and newer SoCs.
Signed-off-by: Marcus Cooper <codekipper@gmail.com>
---
sound/soc/sunxi/sun4i-spdif.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c
index 0b04fb0..88fbb3a 100644
--- a/sound/soc/sunxi/sun4i-spdif.c
+++ b/sound/soc/sunxi/sun4i-spdif.c
@@ -29,6 +29,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
+#include <linux/reset.h>
#include <sound/dmaengine_pcm.h>
#include <sound/pcm_params.h>
#include <sound/soc.h>
@@ -162,6 +163,7 @@ struct sun4i_spdif_dev {
struct platform_device *pdev;
struct clk *spdif_clk;
struct clk *apb_clk;
+ struct reset_control *rst;
struct snd_soc_dai_driver cpu_dai_drv;
struct regmap *regmap;
struct snd_dmaengine_dai_dma_data dma_params_tx;
@@ -411,6 +413,7 @@ static const struct snd_soc_dapm_route dit_routes[] = {
static const struct of_device_id sun4i_spdif_of_match[] = {
{ .compatible = "allwinner,sun4i-a10-spdif", },
+ { .compatible = "allwinner,sun6i-a31-spdif", },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, sun4i_spdif_of_match);
@@ -482,11 +485,23 @@ static int sun4i_spdif_probe(struct platform_device *pdev)
}
host->dma_params_tx.addr = res->start + SUN4I_SPDIF_TXFIFO;
- host->dma_params_tx.maxburst = 4;
+ 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")) {
+ host->rst = devm_reset_control_get_optional(&pdev->dev, NULL);
+ if (IS_ERR(host->rst) && PTR_ERR(host->rst) == -EPROBE_DEFER) {
+ ret = -EPROBE_DEFER;
+ dev_err(&pdev->dev, "Failed to get reset: %d\n", ret);
+ goto err_disable_apb_clk;
+ }
+ if (!IS_ERR(host->rst))
+ reset_control_deassert(host->rst);
+ }
+
ret = devm_snd_soc_register_component(&pdev->dev,
&sun4i_spdif_component, &sun4i_spdif_dai, 1);
if (ret)
--
2.9.2
^ permalink raw reply related [flat|nested] 45+ messages in thread[parent not found: <20160730142716.29377-3-codekipper-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>]
* Re: [PATCH 2/2] ASoC: sunxi: compatibility for sun6i to SPDIF
2016-07-30 14:27 ` codekipper at gmail.com
(?)
@ 2016-07-30 14:40 ` Julian Calaby
-1 siblings, 0 replies; 45+ messages in thread
From: Julian Calaby @ 2016-07-30 14:40 UTC (permalink / raw)
To: Code Kipper
Cc: Maxime Ripard, Mailing List, Arm, linux-sunxi, Liam Girdwood,
Mark Brown, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw, be17068-p0aYb1w59bq9tCD/VL7h6Q
Hi Marcus,
On Sun, Jul 31, 2016 at 12:27 AM, <codekipper-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> From: Marcus Cooper <codekipper-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
>
> The A31 SoC uses the same SPDIF block as found in earlier SoCs, but its
> reset is controlled via a separate reset controller.
>
> The DMA also complains when the maxburst is set to 4 so it's been adjusted
> to 8 which suites both the older and newer SoCs.
>
> Signed-off-by: Marcus Cooper <codekipper-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
> sound/soc/sunxi/sun4i-spdif.c | 17 ++++++++++++++++-
> 1 file changed, 16 insertions(+), 1 deletion(-)
>
> diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c
> index 0b04fb0..88fbb3a 100644
> --- a/sound/soc/sunxi/sun4i-spdif.c
> +++ b/sound/soc/sunxi/sun4i-spdif.c
> @@ -482,11 +485,23 @@ static int sun4i_spdif_probe(struct platform_device *pdev)
> }
>
> host->dma_params_tx.addr = res->start + SUN4I_SPDIF_TXFIFO;
> - host->dma_params_tx.maxburst = 4;
> + 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")) {
Given how much Allwinner likes to shuffle stuff around with each SoC
generation, would it make sense to add a flag for this in some
compatible specific config structure instead of checking against the
compatible?
Thanks,
--
Julian Calaby
Email: julian.calaby-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
Profile: http://www.google.com/profiles/julian.calaby/
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: [linux-sunxi] [PATCH 2/2] ASoC: sunxi: compatibility for sun6i to SPDIF
@ 2016-07-30 14:40 ` Julian Calaby
0 siblings, 0 replies; 45+ messages in thread
From: Julian Calaby @ 2016-07-30 14:40 UTC (permalink / raw)
To: Code Kipper
Cc: Maxime Ripard, Mailing List, Arm, linux-sunxi, Liam Girdwood,
Mark Brown, linux-kernel@vger.kernel.org, alsa-devel, be17068
Hi Marcus,
On Sun, Jul 31, 2016 at 12:27 AM, <codekipper@gmail.com> wrote:
> From: Marcus Cooper <codekipper@gmail.com>
>
> The A31 SoC uses the same SPDIF block as found in earlier SoCs, but its
> reset is controlled via a separate reset controller.
>
> The DMA also complains when the maxburst is set to 4 so it's been adjusted
> to 8 which suites both the older and newer SoCs.
>
> Signed-off-by: Marcus Cooper <codekipper@gmail.com>
> ---
> sound/soc/sunxi/sun4i-spdif.c | 17 ++++++++++++++++-
> 1 file changed, 16 insertions(+), 1 deletion(-)
>
> diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c
> index 0b04fb0..88fbb3a 100644
> --- a/sound/soc/sunxi/sun4i-spdif.c
> +++ b/sound/soc/sunxi/sun4i-spdif.c
> @@ -482,11 +485,23 @@ static int sun4i_spdif_probe(struct platform_device *pdev)
> }
>
> host->dma_params_tx.addr = res->start + SUN4I_SPDIF_TXFIFO;
> - host->dma_params_tx.maxburst = 4;
> + 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")) {
Given how much Allwinner likes to shuffle stuff around with each SoC
generation, would it make sense to add a flag for this in some
compatible specific config structure instead of checking against the
compatible?
Thanks,
--
Julian Calaby
Email: julian.calaby@gmail.com
Profile: http://www.google.com/profiles/julian.calaby/
^ permalink raw reply [flat|nested] 45+ messages in thread* [linux-sunxi] [PATCH 2/2] ASoC: sunxi: compatibility for sun6i to SPDIF
@ 2016-07-30 14:40 ` Julian Calaby
0 siblings, 0 replies; 45+ messages in thread
From: Julian Calaby @ 2016-07-30 14:40 UTC (permalink / raw)
To: linux-arm-kernel
Hi Marcus,
On Sun, Jul 31, 2016 at 12:27 AM, <codekipper@gmail.com> wrote:
> From: Marcus Cooper <codekipper@gmail.com>
>
> The A31 SoC uses the same SPDIF block as found in earlier SoCs, but its
> reset is controlled via a separate reset controller.
>
> The DMA also complains when the maxburst is set to 4 so it's been adjusted
> to 8 which suites both the older and newer SoCs.
>
> Signed-off-by: Marcus Cooper <codekipper@gmail.com>
> ---
> sound/soc/sunxi/sun4i-spdif.c | 17 ++++++++++++++++-
> 1 file changed, 16 insertions(+), 1 deletion(-)
>
> diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c
> index 0b04fb0..88fbb3a 100644
> --- a/sound/soc/sunxi/sun4i-spdif.c
> +++ b/sound/soc/sunxi/sun4i-spdif.c
> @@ -482,11 +485,23 @@ static int sun4i_spdif_probe(struct platform_device *pdev)
> }
>
> host->dma_params_tx.addr = res->start + SUN4I_SPDIF_TXFIFO;
> - host->dma_params_tx.maxburst = 4;
> + 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")) {
Given how much Allwinner likes to shuffle stuff around with each SoC
generation, would it make sense to add a flag for this in some
compatible specific config structure instead of checking against the
compatible?
Thanks,
--
Julian Calaby
Email: julian.calaby at gmail.com
Profile: http://www.google.com/profiles/julian.calaby/
^ permalink raw reply [flat|nested] 45+ messages in thread[parent not found: <CAGRGNgU-7skLeRNOxfVpqNXSaLTLA+vAZrm8=sdo0NJLbopJ7Q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>]
* Re: [PATCH 2/2] ASoC: sunxi: compatibility for sun6i to SPDIF
2016-07-30 14:40 ` Julian Calaby
(?)
@ 2016-07-30 15:21 ` Maxime Ripard
-1 siblings, 0 replies; 45+ messages in thread
From: Maxime Ripard @ 2016-07-30 15:21 UTC (permalink / raw)
To: Julian Calaby
Cc: Code Kipper, Mailing List, Arm, linux-sunxi, Liam Girdwood,
Mark Brown, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw, be17068-p0aYb1w59bq9tCD/VL7h6Q
[-- Attachment #1: Type: text/plain, Size: 1970 bytes --]
On Sun, Jul 31, 2016 at 12:40:48AM +1000, Julian Calaby wrote:
> Hi Marcus,
>
> On Sun, Jul 31, 2016 at 12:27 AM, <codekipper-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> > From: Marcus Cooper <codekipper-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> >
> > The A31 SoC uses the same SPDIF block as found in earlier SoCs, but its
> > reset is controlled via a separate reset controller.
> >
> > The DMA also complains when the maxburst is set to 4 so it's been adjusted
> > to 8 which suites both the older and newer SoCs.
> >
> > Signed-off-by: Marcus Cooper <codekipper-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> > ---
> > sound/soc/sunxi/sun4i-spdif.c | 17 ++++++++++++++++-
> > 1 file changed, 16 insertions(+), 1 deletion(-)
> >
> > diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c
> > index 0b04fb0..88fbb3a 100644
> > --- a/sound/soc/sunxi/sun4i-spdif.c
> > +++ b/sound/soc/sunxi/sun4i-spdif.c
> > @@ -482,11 +485,23 @@ static int sun4i_spdif_probe(struct platform_device *pdev)
> > }
> >
> > host->dma_params_tx.addr = res->start + SUN4I_SPDIF_TXFIFO;
> > - host->dma_params_tx.maxburst = 4;
> > + 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")) {
>
> Given how much Allwinner likes to shuffle stuff around with each SoC
> generation, would it make sense to add a flag for this in some
> compatible specific config structure instead of checking against the
> compatible?
It really depends on the size of the quirks you have to maintain. If
it's just a single one like here, I'd say it's less of a hassle (and
actually easier and conciser to implement).
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: [linux-sunxi] [PATCH 2/2] ASoC: sunxi: compatibility for sun6i to SPDIF
@ 2016-07-30 15:21 ` Maxime Ripard
0 siblings, 0 replies; 45+ messages in thread
From: Maxime Ripard @ 2016-07-30 15:21 UTC (permalink / raw)
To: Julian Calaby
Cc: Code Kipper, Mailing List, Arm, linux-sunxi, Liam Girdwood,
Mark Brown, linux-kernel@vger.kernel.org, alsa-devel, be17068
[-- Attachment #1: Type: text/plain, Size: 1930 bytes --]
On Sun, Jul 31, 2016 at 12:40:48AM +1000, Julian Calaby wrote:
> Hi Marcus,
>
> On Sun, Jul 31, 2016 at 12:27 AM, <codekipper@gmail.com> wrote:
> > From: Marcus Cooper <codekipper@gmail.com>
> >
> > The A31 SoC uses the same SPDIF block as found in earlier SoCs, but its
> > reset is controlled via a separate reset controller.
> >
> > The DMA also complains when the maxburst is set to 4 so it's been adjusted
> > to 8 which suites both the older and newer SoCs.
> >
> > Signed-off-by: Marcus Cooper <codekipper@gmail.com>
> > ---
> > sound/soc/sunxi/sun4i-spdif.c | 17 ++++++++++++++++-
> > 1 file changed, 16 insertions(+), 1 deletion(-)
> >
> > diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c
> > index 0b04fb0..88fbb3a 100644
> > --- a/sound/soc/sunxi/sun4i-spdif.c
> > +++ b/sound/soc/sunxi/sun4i-spdif.c
> > @@ -482,11 +485,23 @@ static int sun4i_spdif_probe(struct platform_device *pdev)
> > }
> >
> > host->dma_params_tx.addr = res->start + SUN4I_SPDIF_TXFIFO;
> > - host->dma_params_tx.maxburst = 4;
> > + 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")) {
>
> Given how much Allwinner likes to shuffle stuff around with each SoC
> generation, would it make sense to add a flag for this in some
> compatible specific config structure instead of checking against the
> compatible?
It really depends on the size of the quirks you have to maintain. If
it's just a single one like here, I'd say it's less of a hassle (and
actually easier and conciser to implement).
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 45+ messages in thread* [linux-sunxi] [PATCH 2/2] ASoC: sunxi: compatibility for sun6i to SPDIF
@ 2016-07-30 15:21 ` Maxime Ripard
0 siblings, 0 replies; 45+ messages in thread
From: Maxime Ripard @ 2016-07-30 15:21 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, Jul 31, 2016 at 12:40:48AM +1000, Julian Calaby wrote:
> Hi Marcus,
>
> On Sun, Jul 31, 2016 at 12:27 AM, <codekipper@gmail.com> wrote:
> > From: Marcus Cooper <codekipper@gmail.com>
> >
> > The A31 SoC uses the same SPDIF block as found in earlier SoCs, but its
> > reset is controlled via a separate reset controller.
> >
> > The DMA also complains when the maxburst is set to 4 so it's been adjusted
> > to 8 which suites both the older and newer SoCs.
> >
> > Signed-off-by: Marcus Cooper <codekipper@gmail.com>
> > ---
> > sound/soc/sunxi/sun4i-spdif.c | 17 ++++++++++++++++-
> > 1 file changed, 16 insertions(+), 1 deletion(-)
> >
> > diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c
> > index 0b04fb0..88fbb3a 100644
> > --- a/sound/soc/sunxi/sun4i-spdif.c
> > +++ b/sound/soc/sunxi/sun4i-spdif.c
> > @@ -482,11 +485,23 @@ static int sun4i_spdif_probe(struct platform_device *pdev)
> > }
> >
> > host->dma_params_tx.addr = res->start + SUN4I_SPDIF_TXFIFO;
> > - host->dma_params_tx.maxburst = 4;
> > + 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")) {
>
> Given how much Allwinner likes to shuffle stuff around with each SoC
> generation, would it make sense to add a flag for this in some
> compatible specific config structure instead of checking against the
> compatible?
It really depends on the size of the quirks you have to maintain. If
it's just a single one like here, I'd say it's less of a hassle (and
actually easier and conciser to implement).
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: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160730/40e41f17/attachment.sig>
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH 2/2] ASoC: sunxi: compatibility for sun6i to SPDIF
2016-07-30 14:27 ` codekipper at gmail.com
@ 2016-07-30 14:52 ` Icenowy Zheng
-1 siblings, 0 replies; 45+ messages in thread
From: Icenowy Zheng @ 2016-07-30 14:52 UTC (permalink / raw)
To: codekipper-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org
Cc: alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org,
lgirdwood-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
be17068-p0aYb1w59bq9tCD/VL7h6Q@public.gmane.org,
linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org,
broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
30.07.2016, 22:45, "codekipper-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org" <codekipper-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>:
> From: Marcus Cooper <codekipper-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
>
> The A31 SoC uses the same SPDIF block as found in earlier SoCs, but its
> reset is controlled via a separate reset controller.
>
> The DMA also complains when the maxburst is set to 4 so it's been adjusted
> to 8 which suites both the older and newer SoCs.
>
> Signed-off-by: Marcus Cooper <codekipper-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
> sound/soc/sunxi/sun4i-spdif.c | 17 ++++++++++++++++-
> 1 file changed, 16 insertions(+), 1 deletion(-)
>
> diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c
> index 0b04fb0..88fbb3a 100644
> --- a/sound/soc/sunxi/sun4i-spdif.c
> +++ b/sound/soc/sunxi/sun4i-spdif.c
> @@ -29,6 +29,7 @@
> #include <linux/module.h>
> #include <linux/platform_device.h>
> #include <linux/pm_runtime.h>
> +#include <linux/reset.h>
> #include <sound/dmaengine_pcm.h>
> #include <sound/pcm_params.h>
> #include <sound/soc.h>
> @@ -162,6 +163,7 @@ struct sun4i_spdif_dev {
> struct platform_device *pdev;
> struct clk *spdif_clk;
> struct clk *apb_clk;
> + struct reset_control *rst;
> struct snd_soc_dai_driver cpu_dai_drv;
> struct regmap *regmap;
> struct snd_dmaengine_dai_dma_data dma_params_tx;
> @@ -411,6 +413,7 @@ static const struct snd_soc_dapm_route dit_routes[] = {
>
> static const struct of_device_id sun4i_spdif_of_match[] = {
> { .compatible = "allwinner,sun4i-a10-spdif", },
> + { .compatible = "allwinner,sun6i-a31-spdif", },
> { /* sentinel */ }
> };
> MODULE_DEVICE_TABLE(of, sun4i_spdif_of_match);
> @@ -482,11 +485,23 @@ static int sun4i_spdif_probe(struct platform_device *pdev)
> }
>
> host->dma_params_tx.addr = res->start + SUN4I_SPDIF_TXFIFO;
> - host->dma_params_tx.maxburst = 4;
> + 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")) {
> + host->rst = devm_reset_control_get_optional(&pdev->dev, NULL);
> + if (IS_ERR(host->rst) && PTR_ERR(host->rst) == -EPROBE_DEFER) {
> + ret = -EPROBE_DEFER;
> + dev_err(&pdev->dev, "Failed to get reset: %d\n", ret);
> + goto err_disable_apb_clk;
> + }
> + if (!IS_ERR(host->rst))
> + reset_control_deassert(host->rst);
> + }
> +
I think you do not need the compatible.
You can just detect whether the reset is present.
> ret = devm_snd_soc_register_component(&pdev->dev,
> &sun4i_spdif_component, &sun4i_spdif_dai, 1);
> if (ret)
> --
> 2.9.2
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
You received this message because you are subscribed to the Google Groups "linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply [flat|nested] 45+ messages in thread* [PATCH 2/2] ASoC: sunxi: compatibility for sun6i to SPDIF
@ 2016-07-30 14:52 ` Icenowy Zheng
0 siblings, 0 replies; 45+ messages in thread
From: Icenowy Zheng @ 2016-07-30 14:52 UTC (permalink / raw)
To: linux-arm-kernel
30.07.2016, 22:45, "codekipper at gmail.com" <codekipper@gmail.com>:
> From: Marcus Cooper <codekipper@gmail.com>
>
> The A31 SoC uses the same SPDIF block as found in earlier SoCs, but its
> reset is controlled via a separate reset controller.
>
> The DMA also complains when the maxburst is set to 4 so it's been adjusted
> to 8 which suites both the older and newer SoCs.
>
> Signed-off-by: Marcus Cooper <codekipper@gmail.com>
> ---
> ?sound/soc/sunxi/sun4i-spdif.c | 17 ++++++++++++++++-
> ?1 file changed, 16 insertions(+), 1 deletion(-)
>
> diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c
> index 0b04fb0..88fbb3a 100644
> --- a/sound/soc/sunxi/sun4i-spdif.c
> +++ b/sound/soc/sunxi/sun4i-spdif.c
> @@ -29,6 +29,7 @@
> ?#include <linux/module.h>
> ?#include <linux/platform_device.h>
> ?#include <linux/pm_runtime.h>
> +#include <linux/reset.h>
> ?#include <sound/dmaengine_pcm.h>
> ?#include <sound/pcm_params.h>
> ?#include <sound/soc.h>
> @@ -162,6 +163,7 @@ struct sun4i_spdif_dev {
> ?????????struct platform_device *pdev;
> ?????????struct clk *spdif_clk;
> ?????????struct clk *apb_clk;
> + struct reset_control *rst;
> ?????????struct snd_soc_dai_driver cpu_dai_drv;
> ?????????struct regmap *regmap;
> ?????????struct snd_dmaengine_dai_dma_data dma_params_tx;
> @@ -411,6 +413,7 @@ static const struct snd_soc_dapm_route dit_routes[] = {
>
> ?static const struct of_device_id sun4i_spdif_of_match[] = {
> ?????????{ .compatible = "allwinner,sun4i-a10-spdif", },
> + { .compatible = "allwinner,sun6i-a31-spdif", },
> ?????????{ /* sentinel */ }
> ?};
> ?MODULE_DEVICE_TABLE(of, sun4i_spdif_of_match);
> @@ -482,11 +485,23 @@ static int sun4i_spdif_probe(struct platform_device *pdev)
> ?????????}
>
> ?????????host->dma_params_tx.addr = res->start + SUN4I_SPDIF_TXFIFO;
> - host->dma_params_tx.maxburst = 4;
> + 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")) {
> + host->rst = devm_reset_control_get_optional(&pdev->dev, NULL);
> + if (IS_ERR(host->rst) && PTR_ERR(host->rst) == -EPROBE_DEFER) {
> + ret = -EPROBE_DEFER;
> + dev_err(&pdev->dev, "Failed to get reset: %d\n", ret);
> + goto err_disable_apb_clk;
> + }
> + if (!IS_ERR(host->rst))
> + reset_control_deassert(host->rst);
> + }
> +
I think you do not need the compatible.
You can just detect whether the reset is present.
> ?????????ret = devm_snd_soc_register_component(&pdev->dev,
> ?????????????????????????????????&sun4i_spdif_component, &sun4i_spdif_dai, 1);
> ?????????if (ret)
> --
> 2.9.2
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 45+ messages in thread[parent not found: <170941469890365-9lNg7JtStwluio3avFS2gg@public.gmane.org>]
* Re: [PATCH 2/2] ASoC: sunxi: compatibility for sun6i to SPDIF
2016-07-30 14:52 ` Icenowy Zheng
(?)
@ 2016-07-30 15:20 ` maxime.ripard at free-electrons.com
-1 siblings, 0 replies; 45+ messages in thread
From: maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8 @ 2016-07-30 15:20 UTC (permalink / raw)
To: Icenowy Zheng
Cc: codekipper-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org,
lgirdwood-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
be17068-p0aYb1w59bq9tCD/VL7h6Q@public.gmane.org,
linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org,
broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
[-- Attachment #1: Type: text/plain, Size: 829 bytes --]
On Sat, Jul 30, 2016 at 10:52:45PM +0800, Icenowy Zheng wrote:
> > + if (of_device_is_compatible(pdev->dev.of_node,
> > + "allwinner,sun6i-a31-spdif")) {
> > + host->rst = devm_reset_control_get_optional(&pdev->dev, NULL);
> > + if (IS_ERR(host->rst) && PTR_ERR(host->rst) == -EPROBE_DEFER) {
> > + ret = -EPROBE_DEFER;
> > + dev_err(&pdev->dev, "Failed to get reset: %d\n", ret);
> > + goto err_disable_apb_clk;
> > + }
> > + if (!IS_ERR(host->rst))
> > + reset_control_deassert(host->rst);
> > + }
> > +
> I think you do not need the compatible.
> You can just detect whether the reset is present.
That would weaken the error check. If we're running on the A31 and are
missing our reset property, it would go unnoticed.
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: [PATCH 2/2] ASoC: sunxi: compatibility for sun6i to SPDIF
@ 2016-07-30 15:20 ` maxime.ripard at free-electrons.com
0 siblings, 0 replies; 45+ messages in thread
From: maxime.ripard @ 2016-07-30 15:20 UTC (permalink / raw)
To: Icenowy Zheng
Cc: codekipper@gmail.com, alsa-devel@alsa-project.org,
lgirdwood@gmail.com, linux-kernel@vger.kernel.org,
be17068@iperbole.bo.it, linux-sunxi@googlegroups.com,
broonie@kernel.org, linux-arm-kernel@lists.infradead.org
[-- Attachment #1: Type: text/plain, Size: 855 bytes --]
On Sat, Jul 30, 2016 at 10:52:45PM +0800, Icenowy Zheng wrote:
> > + if (of_device_is_compatible(pdev->dev.of_node,
> > + "allwinner,sun6i-a31-spdif")) {
> > + host->rst = devm_reset_control_get_optional(&pdev->dev, NULL);
> > + if (IS_ERR(host->rst) && PTR_ERR(host->rst) == -EPROBE_DEFER) {
> > + ret = -EPROBE_DEFER;
> > + dev_err(&pdev->dev, "Failed to get reset: %d\n", ret);
> > + goto err_disable_apb_clk;
> > + }
> > + if (!IS_ERR(host->rst))
> > + reset_control_deassert(host->rst);
> > + }
> > +
> I think you do not need the compatible.
> You can just detect whether the reset is present.
That would weaken the error check. If we're running on the A31 and are
missing our reset property, it would go unnoticed.
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 45+ messages in thread* [PATCH 2/2] ASoC: sunxi: compatibility for sun6i to SPDIF
@ 2016-07-30 15:20 ` maxime.ripard at free-electrons.com
0 siblings, 0 replies; 45+ messages in thread
From: maxime.ripard at free-electrons.com @ 2016-07-30 15:20 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, Jul 30, 2016 at 10:52:45PM +0800, Icenowy Zheng wrote:
> > + if (of_device_is_compatible(pdev->dev.of_node,
> > + "allwinner,sun6i-a31-spdif")) {
> > + host->rst = devm_reset_control_get_optional(&pdev->dev, NULL);
> > + if (IS_ERR(host->rst) && PTR_ERR(host->rst) == -EPROBE_DEFER) {
> > + ret = -EPROBE_DEFER;
> > + dev_err(&pdev->dev, "Failed to get reset: %d\n", ret);
> > + goto err_disable_apb_clk;
> > + }
> > + if (!IS_ERR(host->rst))
> > + reset_control_deassert(host->rst);
> > + }
> > +
> I think you do not need the compatible.
> You can just detect whether the reset is present.
That would weaken the error check. If we're running on the A31 and are
missing our reset property, it would go unnoticed.
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: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160730/16e2204c/attachment.sig>
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: [PATCH 2/2] ASoC: sunxi: compatibility for sun6i to SPDIF
2016-07-30 15:20 ` maxime.ripard at free-electrons.com
@ 2016-07-30 15:23 ` Icenowy Zheng
-1 siblings, 0 replies; 45+ messages in thread
From: Icenowy Zheng @ 2016-07-30 15:23 UTC (permalink / raw)
To: maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org
Cc: codekipper-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org,
lgirdwood-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
be17068-p0aYb1w59bq9tCD/VL7h6Q@public.gmane.org,
linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org,
broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
30.07.2016, 23:20, "maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org" <maxime.ripard@free-electrons.com>:
> On Sat, Jul 30, 2016 at 10:52:45PM +0800, Icenowy Zheng wrote:
>> > + if (of_device_is_compatible(pdev->dev.of_node,
>> > + "allwinner,sun6i-a31-spdif")) {
>> > + host->rst = devm_reset_control_get_optional(&pdev->dev, NULL);
>> > + if (IS_ERR(host->rst) && PTR_ERR(host->rst) == -EPROBE_DEFER) {
>> > + ret = -EPROBE_DEFER;
>> > + dev_err(&pdev->dev, "Failed to get reset: %d\n", ret);
>> > + goto err_disable_apb_clk;
>> > + }
>> > + if (!IS_ERR(host->rst))
>> > + reset_control_deassert(host->rst);
>> > + }
>> > +
>> I think you do not need the compatible.
>> You can just detect whether the reset is present.
>
> That would weaken the error check. If we're running on the A31 and are
> missing our reset property, it would go unnoticed.
The reset property is in the SoC's dtsi file, so it won't be easily missing...
>
> Maxime
>
> --
> Maxime Ripard, Free Electrons
> Embedded Linux and Kernel engineering
> http://free-electrons.com
--
You received this message because you are subscribed to the Google Groups "linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply [flat|nested] 45+ messages in thread* [PATCH 2/2] ASoC: sunxi: compatibility for sun6i to SPDIF
@ 2016-07-30 15:23 ` Icenowy Zheng
0 siblings, 0 replies; 45+ messages in thread
From: Icenowy Zheng @ 2016-07-30 15:23 UTC (permalink / raw)
To: linux-arm-kernel
30.07.2016, 23:20, "maxime.ripard at free-electrons.com" <maxime.ripard@free-electrons.com>:
> On Sat, Jul 30, 2016 at 10:52:45PM +0800, Icenowy Zheng wrote:
>> ?> + if (of_device_is_compatible(pdev->dev.of_node,
>> ?> + "allwinner,sun6i-a31-spdif")) {
>> ?> + host->rst = devm_reset_control_get_optional(&pdev->dev, NULL);
>> ?> + if (IS_ERR(host->rst) && PTR_ERR(host->rst) == -EPROBE_DEFER) {
>> ?> + ret = -EPROBE_DEFER;
>> ?> + dev_err(&pdev->dev, "Failed to get reset: %d\n", ret);
>> ?> + goto err_disable_apb_clk;
>> ?> + }
>> ?> + if (!IS_ERR(host->rst))
>> ?> + reset_control_deassert(host->rst);
>> ?> + }
>> ?> +
>> ?I think you do not need the compatible.
>> ?You can just detect whether the reset is present.
>
> That would weaken the error check. If we're running on the A31 and are
> missing our reset property, it would go unnoticed.
The reset property is in the SoC's dtsi file, so it won't be easily missing...
>
> Maxime
>
> --
> Maxime Ripard, Free Electrons
> Embedded Linux and Kernel engineering
> http://free-electrons.com
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: Re: [PATCH 2/2] ASoC: sunxi: compatibility for sun6i to SPDIF
2016-07-30 15:20 ` maxime.ripard at free-electrons.com
(?)
@ 2016-08-01 13:39 ` Chen-Yu Tsai
-1 siblings, 0 replies; 45+ messages in thread
From: Chen-Yu Tsai @ 2016-08-01 13:39 UTC (permalink / raw)
To: Maxime Ripard
Cc: Icenowy Zheng, codekipper-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org,
lgirdwood-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
be17068-p0aYb1w59bq9tCD/VL7h6Q@public.gmane.org,
linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org,
broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
Hi,
On Sat, Jul 30, 2016 at 11:20 PM, maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org
<maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> wrote:
> On Sat, Jul 30, 2016 at 10:52:45PM +0800, Icenowy Zheng wrote:
>> > + if (of_device_is_compatible(pdev->dev.of_node,
>> > + "allwinner,sun6i-a31-spdif")) {
>> > + host->rst = devm_reset_control_get_optional(&pdev->dev, NULL);
>> > + if (IS_ERR(host->rst) && PTR_ERR(host->rst) == -EPROBE_DEFER) {
>> > + ret = -EPROBE_DEFER;
>> > + dev_err(&pdev->dev, "Failed to get reset: %d\n", ret);
>> > + goto err_disable_apb_clk;
>> > + }
>> > + if (!IS_ERR(host->rst))
>> > + reset_control_deassert(host->rst);
>> > + }
>> > +
>> I think you do not need the compatible.
>> You can just detect whether the reset is present.
>
> That would weaken the error check. If we're running on the A31 and are
> missing our reset property, it would go unnoticed.
We've been doing it this way with the mmc controller and the usb hosts though.
IIRC you once said in the older SoCs, the reset control is tied to the clock
gate in the hardware.
The _optional variant is also funny, though I understand it is a design
of the reset controller framework.
Regards
ChenYu
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: [linux-sunxi] Re: [PATCH 2/2] ASoC: sunxi: compatibility for sun6i to SPDIF
@ 2016-08-01 13:39 ` Chen-Yu Tsai
0 siblings, 0 replies; 45+ messages in thread
From: Chen-Yu Tsai @ 2016-08-01 13:39 UTC (permalink / raw)
To: Maxime Ripard
Cc: Icenowy Zheng, codekipper@gmail.com, alsa-devel@alsa-project.org,
lgirdwood@gmail.com, linux-kernel@vger.kernel.org,
be17068@iperbole.bo.it, linux-sunxi@googlegroups.com,
broonie@kernel.org, linux-arm-kernel@lists.infradead.org
Hi,
On Sat, Jul 30, 2016 at 11:20 PM, maxime.ripard@free-electrons.com
<maxime.ripard@free-electrons.com> wrote:
> On Sat, Jul 30, 2016 at 10:52:45PM +0800, Icenowy Zheng wrote:
>> > + if (of_device_is_compatible(pdev->dev.of_node,
>> > + "allwinner,sun6i-a31-spdif")) {
>> > + host->rst = devm_reset_control_get_optional(&pdev->dev, NULL);
>> > + if (IS_ERR(host->rst) && PTR_ERR(host->rst) == -EPROBE_DEFER) {
>> > + ret = -EPROBE_DEFER;
>> > + dev_err(&pdev->dev, "Failed to get reset: %d\n", ret);
>> > + goto err_disable_apb_clk;
>> > + }
>> > + if (!IS_ERR(host->rst))
>> > + reset_control_deassert(host->rst);
>> > + }
>> > +
>> I think you do not need the compatible.
>> You can just detect whether the reset is present.
>
> That would weaken the error check. If we're running on the A31 and are
> missing our reset property, it would go unnoticed.
We've been doing it this way with the mmc controller and the usb hosts though.
IIRC you once said in the older SoCs, the reset control is tied to the clock
gate in the hardware.
The _optional variant is also funny, though I understand it is a design
of the reset controller framework.
Regards
ChenYu
^ permalink raw reply [flat|nested] 45+ messages in thread* [linux-sunxi] Re: [PATCH 2/2] ASoC: sunxi: compatibility for sun6i to SPDIF
@ 2016-08-01 13:39 ` Chen-Yu Tsai
0 siblings, 0 replies; 45+ messages in thread
From: Chen-Yu Tsai @ 2016-08-01 13:39 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Sat, Jul 30, 2016 at 11:20 PM, maxime.ripard at free-electrons.com
<maxime.ripard@free-electrons.com> wrote:
> On Sat, Jul 30, 2016 at 10:52:45PM +0800, Icenowy Zheng wrote:
>> > + if (of_device_is_compatible(pdev->dev.of_node,
>> > + "allwinner,sun6i-a31-spdif")) {
>> > + host->rst = devm_reset_control_get_optional(&pdev->dev, NULL);
>> > + if (IS_ERR(host->rst) && PTR_ERR(host->rst) == -EPROBE_DEFER) {
>> > + ret = -EPROBE_DEFER;
>> > + dev_err(&pdev->dev, "Failed to get reset: %d\n", ret);
>> > + goto err_disable_apb_clk;
>> > + }
>> > + if (!IS_ERR(host->rst))
>> > + reset_control_deassert(host->rst);
>> > + }
>> > +
>> I think you do not need the compatible.
>> You can just detect whether the reset is present.
>
> That would weaken the error check. If we're running on the A31 and are
> missing our reset property, it would go unnoticed.
We've been doing it this way with the mmc controller and the usb hosts though.
IIRC you once said in the older SoCs, the reset control is tied to the clock
gate in the hardware.
The _optional variant is also funny, though I understand it is a design
of the reset controller framework.
Regards
ChenYu
^ permalink raw reply [flat|nested] 45+ messages in thread[parent not found: <CAGb2v65Hyp8U1OMrfy0Bo9-qC0eO5de+NjWQzch87_2Ty+fBqQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>]
* Re: Re: [PATCH 2/2] ASoC: sunxi: compatibility for sun6i to SPDIF
2016-08-01 13:39 ` Chen-Yu Tsai
@ 2016-08-01 15:02 ` Icenowy Zheng
-1 siblings, 0 replies; 45+ messages in thread
From: Icenowy Zheng @ 2016-08-01 15:02 UTC (permalink / raw)
To: Chen-Yu Tsai, Maxime Ripard
Cc: codekipper-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org,
lgirdwood-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
be17068-p0aYb1w59bq9tCD/VL7h6Q@public.gmane.org,
linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org,
broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
01.08.2016, 21:40, "Chen-Yu Tsai" <wens-jdAy2FN1RRM@public.gmane.org>:
> Hi,
>
> On Sat, Jul 30, 2016 at 11:20 PM, maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org
> <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> wrote:
>> On Sat, Jul 30, 2016 at 10:52:45PM +0800, Icenowy Zheng wrote:
>>> > + if (of_device_is_compatible(pdev->dev.of_node,
>>> > + "allwinner,sun6i-a31-spdif")) {
>>> > + host->rst = devm_reset_control_get_optional(&pdev->dev, NULL);
>>> > + if (IS_ERR(host->rst) && PTR_ERR(host->rst) == -EPROBE_DEFER) {
>>> > + ret = -EPROBE_DEFER;
>>> > + dev_err(&pdev->dev, "Failed to get reset: %d\n", ret);
>>> > + goto err_disable_apb_clk;
>>> > + }
>>> > + if (!IS_ERR(host->rst))
>>> > + reset_control_deassert(host->rst);
>>> > + }
>>> > +
>>> I think you do not need the compatible.
>>> You can just detect whether the reset is present.
>>
>> That would weaken the error check. If we're running on the A31 and are
>> missing our reset property, it would go unnoticed.
>
> We've been doing it this way with the mmc controller and the usb hosts though.
I did the same thing on NAND controller.
> IIRC you once said in the older SoCs, the reset control is tied to the clock
> gate in the hardware.
>
> The _optional variant is also funny, though I understand it is a design
> of the reset controller framework.
>
> Regards
> ChenYu
--
You received this message because you are subscribed to the Google Groups "linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply [flat|nested] 45+ messages in thread* [linux-sunxi] Re: [PATCH 2/2] ASoC: sunxi: compatibility for sun6i to SPDIF
@ 2016-08-01 15:02 ` Icenowy Zheng
0 siblings, 0 replies; 45+ messages in thread
From: Icenowy Zheng @ 2016-08-01 15:02 UTC (permalink / raw)
To: linux-arm-kernel
01.08.2016, 21:40, "Chen-Yu Tsai" <wens@csie.org>:
> Hi,
>
> On Sat, Jul 30, 2016 at 11:20 PM, maxime.ripard at free-electrons.com
> <maxime.ripard@free-electrons.com> wrote:
>> ?On Sat, Jul 30, 2016 at 10:52:45PM +0800, Icenowy Zheng wrote:
>>> ?> + if (of_device_is_compatible(pdev->dev.of_node,
>>> ?> + "allwinner,sun6i-a31-spdif")) {
>>> ?> + host->rst = devm_reset_control_get_optional(&pdev->dev, NULL);
>>> ?> + if (IS_ERR(host->rst) && PTR_ERR(host->rst) == -EPROBE_DEFER) {
>>> ?> + ret = -EPROBE_DEFER;
>>> ?> + dev_err(&pdev->dev, "Failed to get reset: %d\n", ret);
>>> ?> + goto err_disable_apb_clk;
>>> ?> + }
>>> ?> + if (!IS_ERR(host->rst))
>>> ?> + reset_control_deassert(host->rst);
>>> ?> + }
>>> ?> +
>>> ?I think you do not need the compatible.
>>> ?You can just detect whether the reset is present.
>>
>> ?That would weaken the error check. If we're running on the A31 and are
>> ?missing our reset property, it would go unnoticed.
>
> We've been doing it this way with the mmc controller and the usb hosts though.
I did the same thing on NAND controller.
> IIRC you once said in the older SoCs, the reset control is tied to the clock
> gate in the hardware.
>
> The _optional variant is also funny, though I understand it is a design
> of the reset controller framework.
>
> Regards
> ChenYu
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: Re: [PATCH 2/2] ASoC: sunxi: compatibility for sun6i to SPDIF
2016-08-01 13:39 ` Chen-Yu Tsai
(?)
@ 2016-08-22 16:04 ` Maxime Ripard
-1 siblings, 0 replies; 45+ messages in thread
From: Maxime Ripard @ 2016-08-22 16:04 UTC (permalink / raw)
To: Chen-Yu Tsai
Cc: Icenowy Zheng, codekipper-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org,
lgirdwood-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
be17068-p0aYb1w59bq9tCD/VL7h6Q@public.gmane.org,
linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org,
broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
[-- Attachment #1: Type: text/plain, Size: 1508 bytes --]
Hi,
On Mon, Aug 01, 2016 at 09:39:34PM +0800, Chen-Yu Tsai wrote:
> Hi,
>
> On Sat, Jul 30, 2016 at 11:20 PM, maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org
> <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> wrote:
> > On Sat, Jul 30, 2016 at 10:52:45PM +0800, Icenowy Zheng wrote:
> >> > + if (of_device_is_compatible(pdev->dev.of_node,
> >> > + "allwinner,sun6i-a31-spdif")) {
> >> > + host->rst = devm_reset_control_get_optional(&pdev->dev, NULL);
> >> > + if (IS_ERR(host->rst) && PTR_ERR(host->rst) == -EPROBE_DEFER) {
> >> > + ret = -EPROBE_DEFER;
> >> > + dev_err(&pdev->dev, "Failed to get reset: %d\n", ret);
> >> > + goto err_disable_apb_clk;
> >> > + }
> >> > + if (!IS_ERR(host->rst))
> >> > + reset_control_deassert(host->rst);
> >> > + }
> >> > +
> >> I think you do not need the compatible.
> >> You can just detect whether the reset is present.
> >
> > That would weaken the error check. If we're running on the A31 and are
> > missing our reset property, it would go unnoticed.
>
> We've been doing it this way with the mmc controller and the usb hosts though.
> IIRC you once said in the older SoCs, the reset control is tied to the clock
> gate in the hardware.
>
> The _optional variant is also funny, though I understand it is a design
> of the reset controller framework.
Yes, I know. But that doesn't prevent that design from being better.
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 45+ messages in thread* Re: [linux-sunxi] Re: [PATCH 2/2] ASoC: sunxi: compatibility for sun6i to SPDIF
@ 2016-08-22 16:04 ` Maxime Ripard
0 siblings, 0 replies; 45+ messages in thread
From: Maxime Ripard @ 2016-08-22 16:04 UTC (permalink / raw)
To: Chen-Yu Tsai
Cc: Icenowy Zheng, codekipper@gmail.com, alsa-devel@alsa-project.org,
lgirdwood@gmail.com, linux-kernel@vger.kernel.org,
be17068@iperbole.bo.it, linux-sunxi@googlegroups.com,
broonie@kernel.org, linux-arm-kernel@lists.infradead.org
[-- Attachment #1: Type: text/plain, Size: 1488 bytes --]
Hi,
On Mon, Aug 01, 2016 at 09:39:34PM +0800, Chen-Yu Tsai wrote:
> Hi,
>
> On Sat, Jul 30, 2016 at 11:20 PM, maxime.ripard@free-electrons.com
> <maxime.ripard@free-electrons.com> wrote:
> > On Sat, Jul 30, 2016 at 10:52:45PM +0800, Icenowy Zheng wrote:
> >> > + if (of_device_is_compatible(pdev->dev.of_node,
> >> > + "allwinner,sun6i-a31-spdif")) {
> >> > + host->rst = devm_reset_control_get_optional(&pdev->dev, NULL);
> >> > + if (IS_ERR(host->rst) && PTR_ERR(host->rst) == -EPROBE_DEFER) {
> >> > + ret = -EPROBE_DEFER;
> >> > + dev_err(&pdev->dev, "Failed to get reset: %d\n", ret);
> >> > + goto err_disable_apb_clk;
> >> > + }
> >> > + if (!IS_ERR(host->rst))
> >> > + reset_control_deassert(host->rst);
> >> > + }
> >> > +
> >> I think you do not need the compatible.
> >> You can just detect whether the reset is present.
> >
> > That would weaken the error check. If we're running on the A31 and are
> > missing our reset property, it would go unnoticed.
>
> We've been doing it this way with the mmc controller and the usb hosts though.
> IIRC you once said in the older SoCs, the reset control is tied to the clock
> gate in the hardware.
>
> The _optional variant is also funny, though I understand it is a design
> of the reset controller framework.
Yes, I know. But that doesn't prevent that design from being better.
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 45+ messages in thread* [linux-sunxi] Re: [PATCH 2/2] ASoC: sunxi: compatibility for sun6i to SPDIF
@ 2016-08-22 16:04 ` Maxime Ripard
0 siblings, 0 replies; 45+ messages in thread
From: Maxime Ripard @ 2016-08-22 16:04 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Mon, Aug 01, 2016 at 09:39:34PM +0800, Chen-Yu Tsai wrote:
> Hi,
>
> On Sat, Jul 30, 2016 at 11:20 PM, maxime.ripard at free-electrons.com
> <maxime.ripard@free-electrons.com> wrote:
> > On Sat, Jul 30, 2016 at 10:52:45PM +0800, Icenowy Zheng wrote:
> >> > + if (of_device_is_compatible(pdev->dev.of_node,
> >> > + "allwinner,sun6i-a31-spdif")) {
> >> > + host->rst = devm_reset_control_get_optional(&pdev->dev, NULL);
> >> > + if (IS_ERR(host->rst) && PTR_ERR(host->rst) == -EPROBE_DEFER) {
> >> > + ret = -EPROBE_DEFER;
> >> > + dev_err(&pdev->dev, "Failed to get reset: %d\n", ret);
> >> > + goto err_disable_apb_clk;
> >> > + }
> >> > + if (!IS_ERR(host->rst))
> >> > + reset_control_deassert(host->rst);
> >> > + }
> >> > +
> >> I think you do not need the compatible.
> >> You can just detect whether the reset is present.
> >
> > That would weaken the error check. If we're running on the A31 and are
> > missing our reset property, it would go unnoticed.
>
> We've been doing it this way with the mmc controller and the usb hosts though.
> IIRC you once said in the older SoCs, the reset control is tied to the clock
> gate in the hardware.
>
> The _optional variant is also funny, though I understand it is a design
> of the reset controller framework.
Yes, I know. But that doesn't prevent that design from being better.
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: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160822/282d2412/attachment.sig>
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH 2/2] ASoC: sunxi: compatibility for sun6i to SPDIF
2016-07-30 14:27 ` codekipper at gmail.com
(?)
@ 2016-07-30 15:19 ` Maxime Ripard
-1 siblings, 0 replies; 45+ messages in thread
From: Maxime Ripard @ 2016-07-30 15:19 UTC (permalink / raw)
To: codekipper-Re5JQEeQqe8AvxtiuMwx3w
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-sunxi-/JYPxA39Uh5TLH3MbocFFw,
lgirdwood-Re5JQEeQqe8AvxtiuMwx3w, broonie-DgEjT+Ai2ygdnm+yROfE0A,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw, be17068-p0aYb1w59bq9tCD/VL7h6Q
[-- Attachment #1: Type: text/plain, Size: 730 bytes --]
On Sat, Jul 30, 2016 at 04:27:16PM +0200, codekipper-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org wrote:
> From: Marcus Cooper <codekipper-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
>
> The A31 SoC uses the same SPDIF block as found in earlier SoCs, but its
> reset is controlled via a separate reset controller.
>
> The DMA also complains when the maxburst is set to 4 so it's been adjusted
> to 8 which suites both the older and newer SoCs.
>
> Signed-off-by: Marcus Cooper <codekipper-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Acked-by: Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
Thanks,
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PATCH 2/2] ASoC: sunxi: compatibility for sun6i to SPDIF
@ 2016-07-30 15:19 ` Maxime Ripard
0 siblings, 0 replies; 45+ messages in thread
From: Maxime Ripard @ 2016-07-30 15:19 UTC (permalink / raw)
To: codekipper
Cc: linux-arm-kernel, linux-sunxi, lgirdwood, broonie, linux-kernel,
alsa-devel, be17068
[-- Attachment #1: Type: text/plain, Size: 630 bytes --]
On Sat, Jul 30, 2016 at 04:27:16PM +0200, codekipper@gmail.com wrote:
> From: Marcus Cooper <codekipper@gmail.com>
>
> The A31 SoC uses the same SPDIF block as found in earlier SoCs, but its
> reset is controlled via a separate reset controller.
>
> The DMA also complains when the maxburst is set to 4 so it's been adjusted
> to 8 which suites both the older and newer SoCs.
>
> 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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 45+ messages in thread
* [PATCH 2/2] ASoC: sunxi: compatibility for sun6i to SPDIF
@ 2016-07-30 15:19 ` Maxime Ripard
0 siblings, 0 replies; 45+ messages in thread
From: Maxime Ripard @ 2016-07-30 15:19 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, Jul 30, 2016 at 04:27:16PM +0200, codekipper at gmail.com wrote:
> From: Marcus Cooper <codekipper@gmail.com>
>
> The A31 SoC uses the same SPDIF block as found in earlier SoCs, but its
> reset is controlled via a separate reset controller.
>
> The DMA also complains when the maxburst is set to 4 so it's been adjusted
> to 8 which suites both the older and newer SoCs.
>
> 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: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160730/f5d88e16/attachment-0001.sig>
^ permalink raw reply [flat|nested] 45+ messages in thread
* Applied "ASoC: sunxi: compatibility for sun6i to SPDIF" to the asoc tree
2016-07-30 14:27 ` codekipper at gmail.com
(?)
@ 2016-08-12 12:29 ` Mark Brown
-1 siblings, 0 replies; 45+ messages in thread
From: Mark Brown @ 2016-08-12 12:29 UTC (permalink / raw)
To: Marcus Cooper
Cc: Mark Brown, maxime.ripard, alsa-devel, lgirdwood, linux-kernel,
be17068, linux-sunxi
The patch
ASoC: sunxi: compatibility for sun6i to SPDIF
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 2f6963cb52bee440105f732b3411f18e38ed6e52 Mon Sep 17 00:00:00 2001
From: Marcus Cooper <codekipper@gmail.com>
Date: Sat, 30 Jul 2016 17:56:38 +0200
Subject: [PATCH] ASoC: sunxi: compatibility for sun6i to SPDIF
The A31 SoC uses the same SPDIF block as found in earlier SoCs, but its
reset is controlled via a separate reset controller.
The DMA also complains when the maxburst is set to 4 so it's been adjusted
to 8 which suites both the older and newer SoCs.
Signed-off-by: Marcus Cooper <codekipper@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/sunxi/sun4i-spdif.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c
index 0b04fb02125c..88fbb3a1e660 100644
--- a/sound/soc/sunxi/sun4i-spdif.c
+++ b/sound/soc/sunxi/sun4i-spdif.c
@@ -29,6 +29,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
+#include <linux/reset.h>
#include <sound/dmaengine_pcm.h>
#include <sound/pcm_params.h>
#include <sound/soc.h>
@@ -162,6 +163,7 @@ struct sun4i_spdif_dev {
struct platform_device *pdev;
struct clk *spdif_clk;
struct clk *apb_clk;
+ struct reset_control *rst;
struct snd_soc_dai_driver cpu_dai_drv;
struct regmap *regmap;
struct snd_dmaengine_dai_dma_data dma_params_tx;
@@ -411,6 +413,7 @@ static const struct snd_soc_dapm_route dit_routes[] = {
static const struct of_device_id sun4i_spdif_of_match[] = {
{ .compatible = "allwinner,sun4i-a10-spdif", },
+ { .compatible = "allwinner,sun6i-a31-spdif", },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, sun4i_spdif_of_match);
@@ -482,11 +485,23 @@ static int sun4i_spdif_probe(struct platform_device *pdev)
}
host->dma_params_tx.addr = res->start + SUN4I_SPDIF_TXFIFO;
- host->dma_params_tx.maxburst = 4;
+ 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")) {
+ host->rst = devm_reset_control_get_optional(&pdev->dev, NULL);
+ if (IS_ERR(host->rst) && PTR_ERR(host->rst) == -EPROBE_DEFER) {
+ ret = -EPROBE_DEFER;
+ dev_err(&pdev->dev, "Failed to get reset: %d\n", ret);
+ goto err_disable_apb_clk;
+ }
+ if (!IS_ERR(host->rst))
+ reset_control_deassert(host->rst);
+ }
+
ret = devm_snd_soc_register_component(&pdev->dev,
&sun4i_spdif_component, &sun4i_spdif_dai, 1);
if (ret)
--
2.8.1
^ permalink raw reply related [flat|nested] 45+ messages in thread* Applied "ASoC: sunxi: compatibility for sun6i to SPDIF" to the asoc tree
@ 2016-08-12 12:29 ` Mark Brown
0 siblings, 0 replies; 45+ messages in thread
From: Mark Brown @ 2016-08-12 12:29 UTC (permalink / raw)
To: Marcus Cooper
Cc: Mark Brown, maxime.ripard, alsa-devel, lgirdwood, linux-kernel,
be17068, linux-sunxi, broonie, linux-arm-kernel
The patch
ASoC: sunxi: compatibility for sun6i to SPDIF
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 2f6963cb52bee440105f732b3411f18e38ed6e52 Mon Sep 17 00:00:00 2001
From: Marcus Cooper <codekipper@gmail.com>
Date: Sat, 30 Jul 2016 17:56:38 +0200
Subject: [PATCH] ASoC: sunxi: compatibility for sun6i to SPDIF
The A31 SoC uses the same SPDIF block as found in earlier SoCs, but its
reset is controlled via a separate reset controller.
The DMA also complains when the maxburst is set to 4 so it's been adjusted
to 8 which suites both the older and newer SoCs.
Signed-off-by: Marcus Cooper <codekipper@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/sunxi/sun4i-spdif.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c
index 0b04fb02125c..88fbb3a1e660 100644
--- a/sound/soc/sunxi/sun4i-spdif.c
+++ b/sound/soc/sunxi/sun4i-spdif.c
@@ -29,6 +29,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
+#include <linux/reset.h>
#include <sound/dmaengine_pcm.h>
#include <sound/pcm_params.h>
#include <sound/soc.h>
@@ -162,6 +163,7 @@ struct sun4i_spdif_dev {
struct platform_device *pdev;
struct clk *spdif_clk;
struct clk *apb_clk;
+ struct reset_control *rst;
struct snd_soc_dai_driver cpu_dai_drv;
struct regmap *regmap;
struct snd_dmaengine_dai_dma_data dma_params_tx;
@@ -411,6 +413,7 @@ static const struct snd_soc_dapm_route dit_routes[] = {
static const struct of_device_id sun4i_spdif_of_match[] = {
{ .compatible = "allwinner,sun4i-a10-spdif", },
+ { .compatible = "allwinner,sun6i-a31-spdif", },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, sun4i_spdif_of_match);
@@ -482,11 +485,23 @@ static int sun4i_spdif_probe(struct platform_device *pdev)
}
host->dma_params_tx.addr = res->start + SUN4I_SPDIF_TXFIFO;
- host->dma_params_tx.maxburst = 4;
+ 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")) {
+ host->rst = devm_reset_control_get_optional(&pdev->dev, NULL);
+ if (IS_ERR(host->rst) && PTR_ERR(host->rst) == -EPROBE_DEFER) {
+ ret = -EPROBE_DEFER;
+ dev_err(&pdev->dev, "Failed to get reset: %d\n", ret);
+ goto err_disable_apb_clk;
+ }
+ if (!IS_ERR(host->rst))
+ reset_control_deassert(host->rst);
+ }
+
ret = devm_snd_soc_register_component(&pdev->dev,
&sun4i_spdif_component, &sun4i_spdif_dai, 1);
if (ret)
--
2.8.1
^ permalink raw reply related [flat|nested] 45+ messages in thread* Applied "ASoC: sunxi: compatibility for sun6i to SPDIF" to the asoc tree
@ 2016-08-12 12:29 ` Mark Brown
0 siblings, 0 replies; 45+ messages in thread
From: Mark Brown @ 2016-08-12 12:29 UTC (permalink / raw)
To: linux-arm-kernel
The patch
ASoC: sunxi: compatibility for sun6i to SPDIF
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 2f6963cb52bee440105f732b3411f18e38ed6e52 Mon Sep 17 00:00:00 2001
From: Marcus Cooper <codekipper@gmail.com>
Date: Sat, 30 Jul 2016 17:56:38 +0200
Subject: [PATCH] ASoC: sunxi: compatibility for sun6i to SPDIF
The A31 SoC uses the same SPDIF block as found in earlier SoCs, but its
reset is controlled via a separate reset controller.
The DMA also complains when the maxburst is set to 4 so it's been adjusted
to 8 which suites both the older and newer SoCs.
Signed-off-by: Marcus Cooper <codekipper@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/sunxi/sun4i-spdif.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c
index 0b04fb02125c..88fbb3a1e660 100644
--- a/sound/soc/sunxi/sun4i-spdif.c
+++ b/sound/soc/sunxi/sun4i-spdif.c
@@ -29,6 +29,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
+#include <linux/reset.h>
#include <sound/dmaengine_pcm.h>
#include <sound/pcm_params.h>
#include <sound/soc.h>
@@ -162,6 +163,7 @@ struct sun4i_spdif_dev {
struct platform_device *pdev;
struct clk *spdif_clk;
struct clk *apb_clk;
+ struct reset_control *rst;
struct snd_soc_dai_driver cpu_dai_drv;
struct regmap *regmap;
struct snd_dmaengine_dai_dma_data dma_params_tx;
@@ -411,6 +413,7 @@ static const struct snd_soc_dapm_route dit_routes[] = {
static const struct of_device_id sun4i_spdif_of_match[] = {
{ .compatible = "allwinner,sun4i-a10-spdif", },
+ { .compatible = "allwinner,sun6i-a31-spdif", },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, sun4i_spdif_of_match);
@@ -482,11 +485,23 @@ static int sun4i_spdif_probe(struct platform_device *pdev)
}
host->dma_params_tx.addr = res->start + SUN4I_SPDIF_TXFIFO;
- host->dma_params_tx.maxburst = 4;
+ 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")) {
+ host->rst = devm_reset_control_get_optional(&pdev->dev, NULL);
+ if (IS_ERR(host->rst) && PTR_ERR(host->rst) == -EPROBE_DEFER) {
+ ret = -EPROBE_DEFER;
+ dev_err(&pdev->dev, "Failed to get reset: %d\n", ret);
+ goto err_disable_apb_clk;
+ }
+ if (!IS_ERR(host->rst))
+ reset_control_deassert(host->rst);
+ }
+
ret = devm_snd_soc_register_component(&pdev->dev,
&sun4i_spdif_component, &sun4i_spdif_dai, 1);
if (ret)
--
2.8.1
^ permalink raw reply related [flat|nested] 45+ messages in thread