From: "Clément Péron" <peron.clem@gmail.com> To: Vinod Koul <vkoul@kernel.org>, Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Maxime Ripard <maxime.ripard@bootlin.com>, Chen-Yu Tsai <wens@csie.org>, Dan Williams <dan.j.williams@intel.com> Cc: dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, "Jernej Skrabec" <jernej.skrabec@siol.net>, "Clément Péron" <peron.clem@gmail.com> Subject: [PATCH v3 2/7] dmaengine: sun6i: Add a quirk for additional mbus clock Date: Mon, 27 May 2019 22:14:54 +0200 [thread overview] Message-ID: <20190527201459.20130-3-peron.clem@gmail.com> (raw) In-Reply-To: <20190527201459.20130-1-peron.clem@gmail.com> From: Jernej Skrabec <jernej.skrabec@siol.net> H6 DMA controller needs additional mbus clock to be enabled. Add a quirk for it and handle it accordingly. Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> Signed-off-by: Clément Péron <peron.clem@gmail.com> --- drivers/dma/sun6i-dma.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/drivers/dma/sun6i-dma.c b/drivers/dma/sun6i-dma.c index 0cd13f17fc11..7d9606997251 100644 --- a/drivers/dma/sun6i-dma.c +++ b/drivers/dma/sun6i-dma.c @@ -129,6 +129,7 @@ struct sun6i_dma_config { u32 dst_burst_lengths; u32 src_addr_widths; u32 dst_addr_widths; + bool has_mbus_clk; }; /* @@ -182,6 +183,7 @@ struct sun6i_dma_dev { struct dma_device slave; void __iomem *base; struct clk *clk; + struct clk *clk_mbus; int irq; spinlock_t lock; struct reset_control *rstc; @@ -1208,6 +1210,14 @@ static int sun6i_dma_probe(struct platform_device *pdev) return PTR_ERR(sdc->clk); } + if (sdc->cfg->has_mbus_clk) { + sdc->clk_mbus = devm_clk_get(&pdev->dev, "mbus"); + if (IS_ERR(sdc->clk_mbus)) { + dev_err(&pdev->dev, "No mbus clock specified\n"); + return PTR_ERR(sdc->clk_mbus); + } + } + sdc->rstc = devm_reset_control_get(&pdev->dev, NULL); if (IS_ERR(sdc->rstc)) { dev_err(&pdev->dev, "No reset controller specified\n"); @@ -1312,11 +1322,19 @@ static int sun6i_dma_probe(struct platform_device *pdev) goto err_reset_assert; } + if (sdc->cfg->has_mbus_clk) { + ret = clk_prepare_enable(sdc->clk_mbus); + if (ret) { + dev_err(&pdev->dev, "Couldn't enable mbus clock\n"); + goto err_clk_disable; + } + } + ret = devm_request_irq(&pdev->dev, sdc->irq, sun6i_dma_interrupt, 0, dev_name(&pdev->dev), sdc); if (ret) { dev_err(&pdev->dev, "Cannot request IRQ\n"); - goto err_clk_disable; + goto err_mbus_clk_disable; } ret = dma_async_device_register(&sdc->slave); @@ -1341,6 +1359,8 @@ static int sun6i_dma_probe(struct platform_device *pdev) dma_async_device_unregister(&sdc->slave); err_irq_disable: sun6i_kill_tasklet(sdc); +err_mbus_clk_disable: + clk_disable_unprepare(sdc->clk_mbus); err_clk_disable: clk_disable_unprepare(sdc->clk); err_reset_assert: @@ -1359,6 +1379,7 @@ static int sun6i_dma_remove(struct platform_device *pdev) sun6i_kill_tasklet(sdc); + clk_disable_unprepare(sdc->clk_mbus); clk_disable_unprepare(sdc->clk); reset_control_assert(sdc->rstc); -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: "Clément Péron" <peron.clem@gmail.com> To: Vinod Koul <vkoul@kernel.org>, Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Maxime Ripard <maxime.ripard@bootlin.com>, Chen-Yu Tsai <wens@csie.org>, Dan Williams <dan.j.williams@intel.com> Cc: devicetree@vger.kernel.org, "Jernej Skrabec" <jernej.skrabec@siol.net>, linux-kernel@vger.kernel.org, "Clément Péron" <peron.clem@gmail.com>, dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 2/7] dmaengine: sun6i: Add a quirk for additional mbus clock Date: Mon, 27 May 2019 22:14:54 +0200 [thread overview] Message-ID: <20190527201459.20130-3-peron.clem@gmail.com> (raw) In-Reply-To: <20190527201459.20130-1-peron.clem@gmail.com> From: Jernej Skrabec <jernej.skrabec@siol.net> H6 DMA controller needs additional mbus clock to be enabled. Add a quirk for it and handle it accordingly. Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> Signed-off-by: Clément Péron <peron.clem@gmail.com> --- drivers/dma/sun6i-dma.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/drivers/dma/sun6i-dma.c b/drivers/dma/sun6i-dma.c index 0cd13f17fc11..7d9606997251 100644 --- a/drivers/dma/sun6i-dma.c +++ b/drivers/dma/sun6i-dma.c @@ -129,6 +129,7 @@ struct sun6i_dma_config { u32 dst_burst_lengths; u32 src_addr_widths; u32 dst_addr_widths; + bool has_mbus_clk; }; /* @@ -182,6 +183,7 @@ struct sun6i_dma_dev { struct dma_device slave; void __iomem *base; struct clk *clk; + struct clk *clk_mbus; int irq; spinlock_t lock; struct reset_control *rstc; @@ -1208,6 +1210,14 @@ static int sun6i_dma_probe(struct platform_device *pdev) return PTR_ERR(sdc->clk); } + if (sdc->cfg->has_mbus_clk) { + sdc->clk_mbus = devm_clk_get(&pdev->dev, "mbus"); + if (IS_ERR(sdc->clk_mbus)) { + dev_err(&pdev->dev, "No mbus clock specified\n"); + return PTR_ERR(sdc->clk_mbus); + } + } + sdc->rstc = devm_reset_control_get(&pdev->dev, NULL); if (IS_ERR(sdc->rstc)) { dev_err(&pdev->dev, "No reset controller specified\n"); @@ -1312,11 +1322,19 @@ static int sun6i_dma_probe(struct platform_device *pdev) goto err_reset_assert; } + if (sdc->cfg->has_mbus_clk) { + ret = clk_prepare_enable(sdc->clk_mbus); + if (ret) { + dev_err(&pdev->dev, "Couldn't enable mbus clock\n"); + goto err_clk_disable; + } + } + ret = devm_request_irq(&pdev->dev, sdc->irq, sun6i_dma_interrupt, 0, dev_name(&pdev->dev), sdc); if (ret) { dev_err(&pdev->dev, "Cannot request IRQ\n"); - goto err_clk_disable; + goto err_mbus_clk_disable; } ret = dma_async_device_register(&sdc->slave); @@ -1341,6 +1359,8 @@ static int sun6i_dma_probe(struct platform_device *pdev) dma_async_device_unregister(&sdc->slave); err_irq_disable: sun6i_kill_tasklet(sdc); +err_mbus_clk_disable: + clk_disable_unprepare(sdc->clk_mbus); err_clk_disable: clk_disable_unprepare(sdc->clk); err_reset_assert: @@ -1359,6 +1379,7 @@ static int sun6i_dma_remove(struct platform_device *pdev) sun6i_kill_tasklet(sdc); + clk_disable_unprepare(sdc->clk_mbus); clk_disable_unprepare(sdc->clk); reset_control_assert(sdc->rstc); -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-05-27 20:15 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-05-27 20:14 [PATCH v3 0/7] Allwinner H6 DMA support Clément Péron 2019-05-27 20:14 ` Clément Péron 2019-05-27 20:14 ` [PATCH v3 1/7] dt-bindings: arm64: allwinner: h6: Add binding for DMA controller Clément Péron 2019-05-27 20:14 ` Clément Péron 2019-06-04 12:27 ` Vinod Koul 2019-06-04 12:27 ` Vinod Koul 2019-05-27 20:14 ` Clément Péron [this message] 2019-05-27 20:14 ` [PATCH v3 2/7] dmaengine: sun6i: Add a quirk for additional mbus clock Clément Péron 2019-06-04 12:27 ` Vinod Koul 2019-06-04 12:27 ` Vinod Koul 2019-05-27 20:14 ` [PATCH v3 3/7] dmaengine: sun6i: Add a quirk for setting DRQ fields Clément Péron 2019-05-27 20:14 ` Clément Péron 2019-06-04 12:28 ` Vinod Koul 2019-06-04 12:28 ` Vinod Koul 2019-05-27 20:14 ` [PATCH v3 4/7] dmaengine: sun6i: Add a quirk for setting mode fields Clément Péron 2019-05-27 20:14 ` Clément Péron 2019-06-04 12:28 ` Vinod Koul 2019-06-04 12:28 ` Vinod Koul 2019-05-27 20:14 ` [PATCH v3 5/7] dmaengine: sun6i: Add support for H6 DMA Clément Péron 2019-05-27 20:14 ` Clément Péron 2019-06-04 12:28 ` Vinod Koul 2019-06-04 12:28 ` Vinod Koul 2019-05-27 20:14 ` [PATCH v3 6/7] arm64: dts: allwinner: h6: Add DMA node Clément Péron 2019-05-27 20:14 ` Clément Péron 2019-06-11 8:27 ` Maxime Ripard 2019-06-11 8:27 ` Maxime Ripard 2019-05-27 20:14 ` [PATCH v3 7/7] arm64: defconfig: enable Allwinner DMA drivers Clément Péron 2019-05-27 20:14 ` Clément Péron 2019-06-11 8:28 ` Maxime Ripard 2019-06-11 8:28 ` Maxime Ripard 2019-05-28 11:10 ` [PATCH v3 0/7] Allwinner H6 DMA support Maxime Ripard 2019-05-28 11:10 ` Maxime Ripard 2019-06-09 20:42 ` Clément Péron 2019-06-09 20:42 ` Clément Péron
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190527201459.20130-3-peron.clem@gmail.com \ --to=peron.clem@gmail.com \ --cc=dan.j.williams@intel.com \ --cc=devicetree@vger.kernel.org \ --cc=dmaengine@vger.kernel.org \ --cc=jernej.skrabec@siol.net \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=maxime.ripard@bootlin.com \ --cc=robh+dt@kernel.org \ --cc=vkoul@kernel.org \ --cc=wens@csie.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.