Message ID | 1445983540-27155-4-git-send-email-b45815@freescale.com |
---|---|
State | Not Applicable |
Headers | show |
On Thu, Oct 29, 2015 at 11:08:10PM +0200, Andy Shevchenko wrote: > On Wed, Oct 28, 2015 at 12:05 AM, Han Xu <b45815@freescale.com> wrote: > > From: Adrian Alonso <aalonso@freescale.com> > > > > supports APBH DMA on i.MX7D by add extra clock clk_io > > [] > > > MODULE_DEVICE_TABLE(of, mxs_dma_dt_ids); > > @@ -440,6 +448,13 @@ static int mxs_dma_alloc_chan_resources(struct dma_chan *chan) > > if (ret) > > goto err_clk; > > > > + /* enable the extra clk_io clock for i.MX7D */ > > + if (mxs_dma->dev_id == IMX7D_DMA) { > > + ret = clk_prepare_enable(mxs_dma->clk_io); > > + if (ret) > > + goto err_clk_unprepare; > > Perhaps err_clk. > it is err_clk_unprepare > > + } > > + > > mxs_dma_reset_chan(chan); > > > > dma_async_tx_descriptor_init(&mxs_chan->desc, chan); > > @@ -450,6 +465,8 @@ static int mxs_dma_alloc_chan_resources(struct dma_chan *chan) > > > > return 0; > > > > +err_clk_unprepare: > > + clk_disable_unprepare(mxs_dma->clk); > > err_clk: > > free_irq(mxs_chan->chan_irq, mxs_dma); > > err_irq: > > @@ -471,6 +488,9 @@ static void mxs_dma_free_chan_resources(struct dma_chan *chan) > > dma_free_coherent(mxs_dma->dma_device.dev, CCW_BLOCK_SIZE, > > mxs_chan->ccw, mxs_chan->ccw_phys); > > > > + if (mxs_dma->dev_id == IMX7D_DMA) > > + clk_disable_unprepare(mxs_dma->clk_io); > > + > > clk_disable_unprepare(mxs_dma->clk); > > } > > > > @@ -701,9 +721,15 @@ static int mxs_dma_init(struct mxs_dma_engine *mxs_dma) > > if (ret) > > return ret; > > > > + if (mxs_dma->dev_id == IMX7D_DMA) { > > + ret = clk_prepare_enable(mxs_dma->clk_io); > > + if (ret) > > + goto err_clk_bch; > > + } > > + > > ret = stmp_reset_block(mxs_dma->base); > > if (ret) > > - goto err_out; > > + goto err_clk_io; > > > > /* enable apbh burst */ > > if (dma_is_apbh(mxs_dma)) { > > @@ -717,7 +743,10 @@ static int mxs_dma_init(struct mxs_dma_engine *mxs_dma) > > writel(MXS_DMA_CHANNELS_MASK << MXS_DMA_CHANNELS, > > mxs_dma->base + HW_APBHX_CTRL1 + STMP_OFFSET_REG_SET); > > > > -err_out: > > +err_clk_io: > > + if (mxs_dma->dev_id == IMX7D_DMA) > > + clk_disable_unprepare(mxs_dma->clk_io); > > +err_clk_bch: > > clk_disable_unprepare(mxs_dma->clk); > > return ret; > > } > > @@ -803,9 +832,19 @@ static int __init mxs_dma_probe(struct platform_device *pdev) > > if (IS_ERR(mxs_dma->base)) > > return PTR_ERR(mxs_dma->base); > > > > - mxs_dma->clk = devm_clk_get(&pdev->dev, NULL); > > - if (IS_ERR(mxs_dma->clk)) > > - return PTR_ERR(mxs_dma->clk); > > + if (mxs_dma->dev_id == IMX7D_DMA) { > > + mxs_dma->clk = devm_clk_get(&pdev->dev, "dma_apbh_bch"); > > + if (IS_ERR(mxs_dma->clk)) > > + return PTR_ERR(mxs_dma->clk); > > + mxs_dma->clk_io = devm_clk_get(&pdev->dev, "dma_apbh_io"); > > + if (IS_ERR(mxs_dma->clk_io)) > > + return PTR_ERR(mxs_dma->clk_io); > > + > > Redundant empty line. > > > + } else { > > + mxs_dma->clk = devm_clk_get(&pdev->dev, NULL); > > + if (IS_ERR(mxs_dma->clk)) > > + return PTR_ERR(mxs_dma->clk); > > + } > > > > -- > With Best Regards, > Andy Shevchenko
On Wed, Oct 28, 2015 at 12:05 AM, Han Xu <b45815@freescale.com> wrote: > From: Adrian Alonso <aalonso@freescale.com> > > supports APBH DMA on i.MX7D by add extra clock clk_io [] > MODULE_DEVICE_TABLE(of, mxs_dma_dt_ids); > @@ -440,6 +448,13 @@ static int mxs_dma_alloc_chan_resources(struct dma_chan *chan) > if (ret) > goto err_clk; > > + /* enable the extra clk_io clock for i.MX7D */ > + if (mxs_dma->dev_id == IMX7D_DMA) { > + ret = clk_prepare_enable(mxs_dma->clk_io); > + if (ret) > + goto err_clk_unprepare; Perhaps err_clk. > + } > + > mxs_dma_reset_chan(chan); > > dma_async_tx_descriptor_init(&mxs_chan->desc, chan); > @@ -450,6 +465,8 @@ static int mxs_dma_alloc_chan_resources(struct dma_chan *chan) > > return 0; > > +err_clk_unprepare: > + clk_disable_unprepare(mxs_dma->clk); > err_clk: > free_irq(mxs_chan->chan_irq, mxs_dma); > err_irq: > @@ -471,6 +488,9 @@ static void mxs_dma_free_chan_resources(struct dma_chan *chan) > dma_free_coherent(mxs_dma->dma_device.dev, CCW_BLOCK_SIZE, > mxs_chan->ccw, mxs_chan->ccw_phys); > > + if (mxs_dma->dev_id == IMX7D_DMA) > + clk_disable_unprepare(mxs_dma->clk_io); > + > clk_disable_unprepare(mxs_dma->clk); > } > > @@ -701,9 +721,15 @@ static int mxs_dma_init(struct mxs_dma_engine *mxs_dma) > if (ret) > return ret; > > + if (mxs_dma->dev_id == IMX7D_DMA) { > + ret = clk_prepare_enable(mxs_dma->clk_io); > + if (ret) > + goto err_clk_bch; > + } > + > ret = stmp_reset_block(mxs_dma->base); > if (ret) > - goto err_out; > + goto err_clk_io; > > /* enable apbh burst */ > if (dma_is_apbh(mxs_dma)) { > @@ -717,7 +743,10 @@ static int mxs_dma_init(struct mxs_dma_engine *mxs_dma) > writel(MXS_DMA_CHANNELS_MASK << MXS_DMA_CHANNELS, > mxs_dma->base + HW_APBHX_CTRL1 + STMP_OFFSET_REG_SET); > > -err_out: > +err_clk_io: > + if (mxs_dma->dev_id == IMX7D_DMA) > + clk_disable_unprepare(mxs_dma->clk_io); > +err_clk_bch: > clk_disable_unprepare(mxs_dma->clk); > return ret; > } > @@ -803,9 +832,19 @@ static int __init mxs_dma_probe(struct platform_device *pdev) > if (IS_ERR(mxs_dma->base)) > return PTR_ERR(mxs_dma->base); > > - mxs_dma->clk = devm_clk_get(&pdev->dev, NULL); > - if (IS_ERR(mxs_dma->clk)) > - return PTR_ERR(mxs_dma->clk); > + if (mxs_dma->dev_id == IMX7D_DMA) { > + mxs_dma->clk = devm_clk_get(&pdev->dev, "dma_apbh_bch"); > + if (IS_ERR(mxs_dma->clk)) > + return PTR_ERR(mxs_dma->clk); > + mxs_dma->clk_io = devm_clk_get(&pdev->dev, "dma_apbh_io"); > + if (IS_ERR(mxs_dma->clk_io)) > + return PTR_ERR(mxs_dma->clk_io); > + Redundant empty line. > + } else { > + mxs_dma->clk = devm_clk_get(&pdev->dev, NULL); > + if (IS_ERR(mxs_dma->clk)) > + return PTR_ERR(mxs_dma->clk); > + }
On Thu, Oct 29, 2015 at 11:08:10PM +0200, Andy Shevchenko wrote: > On Wed, Oct 28, 2015 at 12:05 AM, Han Xu <b45815@freescale.com> wrote: > > From: Adrian Alonso <aalonso@freescale.com> > > > > supports APBH DMA on i.MX7D by add extra clock clk_io > > [] > any comments here? > > MODULE_DEVICE_TABLE(of, mxs_dma_dt_ids); > > @@ -440,6 +448,13 @@ static int mxs_dma_alloc_chan_resources(struct dma_chan *chan) > > if (ret) > > goto err_clk; > > > > + /* enable the extra clk_io clock for i.MX7D */ > > + if (mxs_dma->dev_id == IMX7D_DMA) { > > + ret = clk_prepare_enable(mxs_dma->clk_io); > > + if (ret) > > + goto err_clk_unprepare; > > Perhaps err_clk. > > > + } > > + > > mxs_dma_reset_chan(chan); > > > > dma_async_tx_descriptor_init(&mxs_chan->desc, chan); > > @@ -450,6 +465,8 @@ static int mxs_dma_alloc_chan_resources(struct dma_chan *chan) > > > > return 0; > > > > +err_clk_unprepare: > > + clk_disable_unprepare(mxs_dma->clk); > > err_clk: > > free_irq(mxs_chan->chan_irq, mxs_dma); > > err_irq: > > @@ -471,6 +488,9 @@ static void mxs_dma_free_chan_resources(struct dma_chan *chan) > > dma_free_coherent(mxs_dma->dma_device.dev, CCW_BLOCK_SIZE, > > mxs_chan->ccw, mxs_chan->ccw_phys); > > > > + if (mxs_dma->dev_id == IMX7D_DMA) > > + clk_disable_unprepare(mxs_dma->clk_io); > > + > > clk_disable_unprepare(mxs_dma->clk); > > } > > > > @@ -701,9 +721,15 @@ static int mxs_dma_init(struct mxs_dma_engine *mxs_dma) > > if (ret) > > return ret; > > > > + if (mxs_dma->dev_id == IMX7D_DMA) { > > + ret = clk_prepare_enable(mxs_dma->clk_io); > > + if (ret) > > + goto err_clk_bch; > > + } > > + > > ret = stmp_reset_block(mxs_dma->base); > > if (ret) > > - goto err_out; > > + goto err_clk_io; > > > > /* enable apbh burst */ > > if (dma_is_apbh(mxs_dma)) { > > @@ -717,7 +743,10 @@ static int mxs_dma_init(struct mxs_dma_engine *mxs_dma) > > writel(MXS_DMA_CHANNELS_MASK << MXS_DMA_CHANNELS, > > mxs_dma->base + HW_APBHX_CTRL1 + STMP_OFFSET_REG_SET); > > > > -err_out: > > +err_clk_io: > > + if (mxs_dma->dev_id == IMX7D_DMA) > > + clk_disable_unprepare(mxs_dma->clk_io); > > +err_clk_bch: > > clk_disable_unprepare(mxs_dma->clk); > > return ret; > > } > > @@ -803,9 +832,19 @@ static int __init mxs_dma_probe(struct platform_device *pdev) > > if (IS_ERR(mxs_dma->base)) > > return PTR_ERR(mxs_dma->base); > > > > - mxs_dma->clk = devm_clk_get(&pdev->dev, NULL); > > - if (IS_ERR(mxs_dma->clk)) > > - return PTR_ERR(mxs_dma->clk); > > + if (mxs_dma->dev_id == IMX7D_DMA) { > > + mxs_dma->clk = devm_clk_get(&pdev->dev, "dma_apbh_bch"); > > + if (IS_ERR(mxs_dma->clk)) > > + return PTR_ERR(mxs_dma->clk); > > + mxs_dma->clk_io = devm_clk_get(&pdev->dev, "dma_apbh_io"); > > + if (IS_ERR(mxs_dma->clk_io)) > > + return PTR_ERR(mxs_dma->clk_io); > > + > > Redundant empty line. > > > + } else { > > + mxs_dma->clk = devm_clk_get(&pdev->dev, NULL); > > + if (IS_ERR(mxs_dma->clk)) > > + return PTR_ERR(mxs_dma->clk); > > + } > > > > -- > With Best Regards, > Andy Shevchenko
On Thu, Oct 29, 2015 at 11:03 PM, Han Xu <han.xu@freescale.com> wrote: > On Thu, Oct 29, 2015 at 11:08:10PM +0200, Andy Shevchenko wrote: >> On Wed, Oct 28, 2015 at 12:05 AM, Han Xu <b45815@freescale.com> wrote: >> > From: Adrian Alonso <aalonso@freescale.com> >> > >> > supports APBH DMA on i.MX7D by add extra clock clk_io >> >> [] >> >> > MODULE_DEVICE_TABLE(of, mxs_dma_dt_ids); >> > @@ -440,6 +448,13 @@ static int mxs_dma_alloc_chan_resources(struct dma_chan *chan) >> > if (ret) >> > goto err_clk; >> > >> > + /* enable the extra clk_io clock for i.MX7D */ >> > + if (mxs_dma->dev_id == IMX7D_DMA) { >> > + ret = clk_prepare_enable(mxs_dma->clk_io); >> > + if (ret) >> > + goto err_clk_unprepare; >> >> Perhaps err_clk. >> > it is err_clk_unprepare Ah, you are right. >> > + } >> > + >> > mxs_dma_reset_chan(chan); >> > >> > dma_async_tx_descriptor_init(&mxs_chan->desc, chan); >> > @@ -450,6 +465,8 @@ static int mxs_dma_alloc_chan_resources(struct dma_chan *chan) >> > >> > return 0; >> > >> > +err_clk_unprepare: >> > + clk_disable_unprepare(mxs_dma->clk); >> > err_clk: >> > free_irq(mxs_chan->chan_irq, mxs_dma);
diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c index b8a4822e..f1878d2 100644 --- a/drivers/dma/mxs-dma.c +++ b/drivers/dma/mxs-dma.c @@ -1,5 +1,5 @@ /* - * Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2011-2015 Freescale Semiconductor, Inc. All Rights Reserved. * * Refer to drivers/dma/imx-sdma.c * @@ -28,7 +28,6 @@ #include <linux/of_device.h> #include <linux/of_dma.h> #include <linux/list.h> - #include <asm/irq.h> #include "dmaengine.h" @@ -135,6 +134,7 @@ enum mxs_dma_devtype { enum mxs_dma_id { IMX23_DMA, IMX28_DMA, + IMX7D_DMA, }; struct mxs_dma_engine { @@ -142,6 +142,7 @@ struct mxs_dma_engine { enum mxs_dma_devtype type; void __iomem *base; struct clk *clk; + struct clk *clk_io; struct dma_device dma_device; struct device_dma_parameters dma_parms; struct mxs_dma_chan mxs_chans[MXS_DMA_CHANNELS]; @@ -167,6 +168,9 @@ static struct mxs_dma_type mxs_dma_types[] = { }, { .id = IMX28_DMA, .type = MXS_DMA_APBX, + }, { + .id = IMX7D_DMA, + .type = MXS_DMA_APBH, } }; @@ -184,6 +188,9 @@ static const struct platform_device_id mxs_dma_ids[] = { .name = "imx28-dma-apbx", .driver_data = (kernel_ulong_t) &mxs_dma_types[3], }, { + .name = "imx7d-dma-apbh", + .driver_data = (kernel_ulong_t) &mxs_dma_types[4], + }, { /* end of list */ } }; @@ -193,6 +200,7 @@ static const struct of_device_id mxs_dma_dt_ids[] = { { .compatible = "fsl,imx23-dma-apbx", .data = &mxs_dma_ids[1], }, { .compatible = "fsl,imx28-dma-apbh", .data = &mxs_dma_ids[2], }, { .compatible = "fsl,imx28-dma-apbx", .data = &mxs_dma_ids[3], }, + { .compatible = "fsl,imx7d-dma-apbh", .data = &mxs_dma_ids[4], }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, mxs_dma_dt_ids); @@ -440,6 +448,13 @@ static int mxs_dma_alloc_chan_resources(struct dma_chan *chan) if (ret) goto err_clk; + /* enable the extra clk_io clock for i.MX7D */ + if (mxs_dma->dev_id == IMX7D_DMA) { + ret = clk_prepare_enable(mxs_dma->clk_io); + if (ret) + goto err_clk_unprepare; + } + mxs_dma_reset_chan(chan); dma_async_tx_descriptor_init(&mxs_chan->desc, chan); @@ -450,6 +465,8 @@ static int mxs_dma_alloc_chan_resources(struct dma_chan *chan) return 0; +err_clk_unprepare: + clk_disable_unprepare(mxs_dma->clk); err_clk: free_irq(mxs_chan->chan_irq, mxs_dma); err_irq: @@ -471,6 +488,9 @@ static void mxs_dma_free_chan_resources(struct dma_chan *chan) dma_free_coherent(mxs_dma->dma_device.dev, CCW_BLOCK_SIZE, mxs_chan->ccw, mxs_chan->ccw_phys); + if (mxs_dma->dev_id == IMX7D_DMA) + clk_disable_unprepare(mxs_dma->clk_io); + clk_disable_unprepare(mxs_dma->clk); } @@ -701,9 +721,15 @@ static int mxs_dma_init(struct mxs_dma_engine *mxs_dma) if (ret) return ret; + if (mxs_dma->dev_id == IMX7D_DMA) { + ret = clk_prepare_enable(mxs_dma->clk_io); + if (ret) + goto err_clk_bch; + } + ret = stmp_reset_block(mxs_dma->base); if (ret) - goto err_out; + goto err_clk_io; /* enable apbh burst */ if (dma_is_apbh(mxs_dma)) { @@ -717,7 +743,10 @@ static int mxs_dma_init(struct mxs_dma_engine *mxs_dma) writel(MXS_DMA_CHANNELS_MASK << MXS_DMA_CHANNELS, mxs_dma->base + HW_APBHX_CTRL1 + STMP_OFFSET_REG_SET); -err_out: +err_clk_io: + if (mxs_dma->dev_id == IMX7D_DMA) + clk_disable_unprepare(mxs_dma->clk_io); +err_clk_bch: clk_disable_unprepare(mxs_dma->clk); return ret; } @@ -803,9 +832,19 @@ static int __init mxs_dma_probe(struct platform_device *pdev) if (IS_ERR(mxs_dma->base)) return PTR_ERR(mxs_dma->base); - mxs_dma->clk = devm_clk_get(&pdev->dev, NULL); - if (IS_ERR(mxs_dma->clk)) - return PTR_ERR(mxs_dma->clk); + if (mxs_dma->dev_id == IMX7D_DMA) { + mxs_dma->clk = devm_clk_get(&pdev->dev, "dma_apbh_bch"); + if (IS_ERR(mxs_dma->clk)) + return PTR_ERR(mxs_dma->clk); + mxs_dma->clk_io = devm_clk_get(&pdev->dev, "dma_apbh_io"); + if (IS_ERR(mxs_dma->clk_io)) + return PTR_ERR(mxs_dma->clk_io); + + } else { + mxs_dma->clk = devm_clk_get(&pdev->dev, NULL); + if (IS_ERR(mxs_dma->clk)) + return PTR_ERR(mxs_dma->clk); + } dma_cap_set(DMA_SLAVE, mxs_dma->dma_device.cap_mask); dma_cap_set(DMA_CYCLIC, mxs_dma->dma_device.cap_mask);