dmaengine:sirf:take clock and enable it while probing
PATCH 1/1 dmaengine:sirf:take clock and enable it while probing
From: Barry Song <[email protected]>
there is hardcode which enabled the clock of dmaengine before, this patch takes the clock by standard clock API and enable it in probe.
--- drivers/dma/sirf-dma.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-)
drivers/dma/sirf-dma.c +11 -0
@@ -16,6 +16,7 @@#include <linux/of_address.h> #include <linux/of_device.h> #include <linux/of_platform.h> +#include <linux/clk.h> #include <linux/sirfsoc_dma.h> #include "dmaengine.h"
@@ -78,6 +79,7 @@ struct sirfsoc_dma {struct sirfsoc_dma_chan channels[SIRFSOC_DMA_CHANNELS ];void __iomem *base;int irq; +struct clk *clk;bool is_marco; };
@@ -639,6 +641,12 @@ static int sirfsoc_dma_probe(struct platform_device *op)return -EINVAL ; } + sdma->clk =devm_clk_get (dev,NULL ); +if (IS_ERR (sdma->clk)) { +dev_err (dev,"failed to get a clock.\n" ); +return PTR_ERR (sdma->clk); + } + ret =of_address_to_resource (dn,0 , &res);if (ret) {dev_err (dev,"Error parsing memory region!\n" );
@@ -698,6 +706,8 @@ static int sirfsoc_dma_probe(struct platform_device *op)tasklet_init (&sdma->tasklet, sirfsoc_dma_tasklet, (unsigned long )sdma); +clk_prepare_enable (sdma->clk); +/* Register DMA engine */ dev_set_drvdata (dev, sdma); ret =dma_async_device_register (dma);
@@ -720,6 +730,7 @@ static int sirfsoc_dma_remove(struct platform_device *op)struct device *dev = &op->dev;struct sirfsoc_dma *sdma =dev_get_drvdata (dev); +clk_disable_unprepare (sdma->clk);dma_async_device_unregister (&sdma->dma);free_irq (sdma->irq, sdma);irq_dispose_mapping (sdma->irq);
Signature · 6 lines
1.7.5.4 Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom More information can be found at www.csr.com. Follow CSR on Twitter at http://twitter.com/CSR_PLC and read our blog at www.csr.com/blog
PATCH 1/1 dmaengine:sirf:take clock and enable it while probing
Quoted 32 lines · Barry Song
From: Barry Song <[email protected]>
there is hardcode which enabled the clock of dmaengine before, this patch takes the clock by standard clock API and enable it in probe.
Signed-off-by Barry Song <[email protected]>--- drivers/dma/sirf-dma.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-)drivers/dma/sirf-dma.c +2
-0@@ -16,6 +16,7 @@#include <linux/of_address.h> #include <linux/of_device.h> #include <linux/of_platform.h> +#include <linux/clk.h> #include <linux/sirfsoc_dma.h> #include "dmaengine.h" @@ -78,6 +79,7 @@ struct sirfsoc_dma {struct sirfsoc_dma_chan channels[SIRFSOC_DMA_CHANNELS ];void __iomem *base;int irq; +struct clk *clk;bool is_marco; };
drivers/dma/sirf-dma.c static int sirfsoc_dma_probe(struct platform_device *op) · line 644
Quoted 4 lines
drivers/dma/sirf-dma.c +1
-0@@ -639,6 +641,12 @@ static int sirfsoc_dma_probe(struct platform_device *op)return -EINVAL ; } + sdma->clk =devm_clk_get (dev,NULL );
NULL? Arent you supposed to send a avlid non global string with. It may work now but do you really want to go that path?
drivers/dma/sirf-dma.c static int sirfsoc_dma_probe(struct platform_device *op) · line 709
Quoted 13 lines
drivers/dma/sirf-dma.c +6
-0+if (IS_ERR (sdma->clk)) { +dev_err (dev,"failed to get a clock.\n" ); +return PTR_ERR (sdma->clk); + } + ret =of_address_to_resource (dn,0 , &res);if (ret) {dev_err (dev,"Error parsing memory region!\n" );@@ -698,6 +706,8 @@ static int sirfsoc_dma_probe(struct platform_device *op)tasklet_init (&sdma->tasklet, sirfsoc_dma_tasklet, (unsigned long )sdma); +clk_prepare_enable (sdma->clk);
shouldnt you be enabling clock when you start a txn. Keeping clock on in probe doesnt seem too smart
Quoted 19 lines
drivers/dma/sirf-dma.c +2
-0+/* Register DMA engine */ dev_set_drvdata (dev, sdma); ret =dma_async_device_register (dma);@@ -720,6 +730,7 @@ static int sirfsoc_dma_remove(struct platform_device *op)struct device *dev = &op->dev;struct sirfsoc_dma *sdma =dev_get_drvdata (dev); +clk_disable_unprepare (sdma->clk);dma_async_device_unregister (&sdma->dma);free_irq (sdma->irq, sdma);irq_dispose_mapping (sdma->irq);Signature · 6 lines
1.7.5.4 Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom More information can be found at www.csr.com. Follow CSR on Twitter at http://twitter.com/CSR_PLC and read our blog at www.csr.com/blog
PATCH 1/1 dmaengine:sirf:take clock and enable it while probing
Hi Vinod,
2013/3/21 Vinod Koul <[email protected]>:
Quoted 32 lines · Barry Song
Quoted 31 lines
From: Barry Song <[email protected]>
there is hardcode which enabled the clock of dmaengine before, this patch takes the clock by standard clock API and enable it in probe.
Signed-off-by Barry Song <[email protected]>--- drivers/dma/sirf-dma.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-)drivers/dma/sirf-dma.c +2
-0@@ -16,6 +16,7 @@#include <linux/of_address.h> #include <linux/of_device.h> #include <linux/of_platform.h> +#include <linux/clk.h> #include <linux/sirfsoc_dma.h> #include "dmaengine.h" @@ -78,6 +79,7 @@ struct sirfsoc_dma {struct sirfsoc_dma_chan channels[SIRFSOC_DMA_CHANNELS ];void __iomem *base;int irq; +struct clk *clk;bool is_marco; };
Quoted 7 lines
drivers/dma/sirf-dma.c static int sirfsoc_dma_probe(struct platform_device *op) · line 644
Quoted 5 lines
drivers/dma/sirf-dma.c +1
-0@@ -639,6 +641,12 @@ static int sirfsoc_dma_probe(struct platform_device *op)return -EINVAL ; } + sdma->clk =devm_clk_get (dev,NULL );NULL? Arent you supposed to send a avlid non global string with. It may work now but do you really want to go that path?
yes. the NULL is right. the binding between clock and device has been mapped.
Quoted 11 lines
Quoted 11 lines
drivers/dma/sirf-dma.c +5
-0+if (IS_ERR (sdma->clk)) { +dev_err (dev,"failed to get a clock.\n" ); +return PTR_ERR (sdma->clk); + } + ret =of_address_to_resource (dn,0 , &res);if (ret) {dev_err (dev,"Error parsing memory region!\n" );@@ -698,6 +706,8 @@ static int sirfsoc_dma_probe(struct platform_device *op)
Quoted 5 lines
drivers/dma/sirf-dma.c static int sirfsoc_dma_probe(struct platform_device *op) · line 709
Quoted 3 lines
drivers/dma/sirf-dma.c +1
-0tasklet_init (&sdma->tasklet, sirfsoc_dma_tasklet, (unsigned long )sdma); +clk_prepare_enable (sdma->clk);shouldnt you be enabling clock when you start a txn. Keeping clock on in probe doesnt seem too smart
currently we don't have runtime PM tested and supported yet. so i'd like to handle this in runtime PM callbacks later.
for the moment, i prefer we have enable/disable in probing/removing like most drivers which don't have runtime pm at first.
Quoted 9 lines
Quoted 9 lines
drivers/dma/sirf-dma.c +1
-0+/* Register DMA engine */ dev_set_drvdata (dev, sdma); ret =dma_async_device_register (dma);@@ -720,6 +730,7 @@ static int sirfsoc_dma_remove(struct platform_device *op)struct device *dev = &op->dev;struct sirfsoc_dma *sdma =dev_get_drvdata (dev);
Quoted 8 lines
Quoted 8 lines
drivers/dma/sirf-dma.c +1
-1+clk_disable_unprepare (sdma->clk);dma_async_device_unregister (&sdma->dma);free_irq (sdma->irq, sdma);irq_dispose_mapping (sdma->irq); --1.7.5.4
-barry
PATCH 1/1 dmaengine:sirf:take clock and enable it while probing
In reply to Barry SongQuoted 7 lines · Barry Song
From: Barry Song <[email protected]>
there is hardcode which enabled the clock of dmaengine before, this patch takes the clock by standard clock API and enable it in probe.
Signed-off-by Barry Song <[email protected]>
Applied thanks
Quoted 61 lines
--- drivers/dma/sirf-dma.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-)drivers/dma/sirf-dma.c +11
-0@@ -16,6 +16,7 @@#include <linux/of_address.h> #include <linux/of_device.h> #include <linux/of_platform.h> +#include <linux/clk.h> #include <linux/sirfsoc_dma.h> #include "dmaengine.h" @@ -78,6 +79,7 @@ struct sirfsoc_dma {struct sirfsoc_dma_chan channels[SIRFSOC_DMA_CHANNELS ];void __iomem *base;int irq; +struct clk *clk;bool is_marco; };@@ -639,6 +641,12 @@ static int sirfsoc_dma_probe(struct platform_device *op)return -EINVAL ; } + sdma->clk =devm_clk_get (dev,NULL ); +if (IS_ERR (sdma->clk)) { +dev_err (dev,"failed to get a clock.\n" ); +return PTR_ERR (sdma->clk); + } + ret =of_address_to_resource (dn,0 , &res);if (ret) {dev_err (dev,"Error parsing memory region!\n" );@@ -698,6 +706,8 @@ static int sirfsoc_dma_probe(struct platform_device *op)tasklet_init (&sdma->tasklet, sirfsoc_dma_tasklet, (unsigned long )sdma); +clk_prepare_enable (sdma->clk); +/* Register DMA engine */ dev_set_drvdata (dev, sdma); ret =dma_async_device_register (dma);@@ -720,6 +730,7 @@ static int sirfsoc_dma_remove(struct platform_device *op)struct device *dev = &op->dev;struct sirfsoc_dma *sdma =dev_get_drvdata (dev); +clk_disable_unprepare (sdma->clk);dma_async_device_unregister (&sdma->dma);free_irq (sdma->irq, sdma);irq_dispose_mapping (sdma->irq);Signature · 6 lines
1.7.5.4 Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom More information can be found at www.csr.com. Follow CSR on Twitter at http://twitter.com/CSR_PLC and read our blog at www.csr.com/blog