| Message ID | 1395735604-26706-9-git-send-email-lee.jones@linaro.org |
|---|---|
| State | New |
| Headers | show |
>From: Lee Jones [mailto:lee.jones@linaro.org] > >Add support for clocks when, and only when, they are supplied. It is >not yet compulsory to provide the BCH and EMI clocks, as Common Clk isn't >supported Mainline yet. Until an implementation lands upstream all clocks >located on STM boards default to always-on. > Good to put this information in comments tagged with "FixMe" at relevant place in the code. >Signed-off-by: Lee Jones <lee.jones@linaro.org> >--- > drivers/mtd/nand/stm_nand_bch.c | 49 +++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 49 insertions(+) > >diff --git a/drivers/mtd/nand/stm_nand_bch.c b/drivers/mtd/nand/stm_nand_bch.c >index 1a93f8d..cc0159e 100644 >--- a/drivers/mtd/nand/stm_nand_bch.c >+++ b/drivers/mtd/nand/stm_nand_bch.c >@@ -16,6 +16,7 @@ > #include <linux/module.h> > #include <linux/delay.h> > #include <linux/io.h> >+#include <linux/clk.h> > #include <linux/interrupt.h> > #include <linux/device.h> > #include <linux/platform_device.h> >@@ -28,6 +29,9 @@ > struct nandi_controller { > void __iomem *base; /* Controller base*/ > void __iomem *dma; /* DMA control base */ >+ >+ struct clk *bch_clk; >+ struct clk *emi_clk; > /* IRQ-triggered Completions: */ > struct completion seq_completed; /* SEQ Over */ > struct completion rbn_completed; /* RBn */ >@@ -103,6 +107,44 @@ static void nandi_disable_interrupts(struct nandi_controller *nandi, > writel(val, nandi->base + NANDBCH_INT_EN); > } > >+static void nandi_clk_enable(struct nandi_controller *nandi) >+{ >+ if (nandi->emi_clk) >+ clk_prepare_enable(nandi->emi_clk); >+ if (nandi->bch_clk) >+ clk_prepare_enable(nandi->bch_clk); >+} >+ You are using nandi_clk_enable() only in your PM patch. So better introduce above functions there .. [RFC 11/47] mtd: nand: stm_nand_bch: add Power Management Also, you have some un-related comment changes for nandi_clk_enable() in below patch. All that can be merges into single one. [RFC 14/47] mtd: nand: stm_nand_bch: configure BCH and FLEX by ONFI timing mode >+static void nandi_clk_disable(struct nandi_controller *nandi) >+{ >+ if (nandi->emi_clk) >+ clk_disable_unprepare(nandi->emi_clk); >+ if (nandi->bch_clk) >+ clk_disable_unprepare(nandi->bch_clk); >+} >+ same, please move this to [RFC 11/47] mtd: nand: stm_nand_bch: add Power Management Also as Ezequiel suggested. You can trim down the number of patches by submitting only the main portion of driver first. PM other features can be added as separate patch-set. with regards, pekon -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
diff --git a/drivers/mtd/nand/stm_nand_bch.c b/drivers/mtd/nand/stm_nand_bch.c index 1a93f8d..cc0159e 100644 --- a/drivers/mtd/nand/stm_nand_bch.c +++ b/drivers/mtd/nand/stm_nand_bch.c @@ -16,6 +16,7 @@ #include <linux/module.h> #include <linux/delay.h> #include <linux/io.h> +#include <linux/clk.h> #include <linux/interrupt.h> #include <linux/device.h> #include <linux/platform_device.h> @@ -28,6 +29,9 @@ struct nandi_controller { void __iomem *base; /* Controller base*/ void __iomem *dma; /* DMA control base */ + + struct clk *bch_clk; + struct clk *emi_clk; /* IRQ-triggered Completions: */ struct completion seq_completed; /* SEQ Over */ struct completion rbn_completed; /* RBn */ @@ -103,6 +107,44 @@ static void nandi_disable_interrupts(struct nandi_controller *nandi, writel(val, nandi->base + NANDBCH_INT_EN); } +static void nandi_clk_enable(struct nandi_controller *nandi) +{ + if (nandi->emi_clk) + clk_prepare_enable(nandi->emi_clk); + if (nandi->bch_clk) + clk_prepare_enable(nandi->bch_clk); +} + +static void nandi_clk_disable(struct nandi_controller *nandi) +{ + if (nandi->emi_clk) + clk_disable_unprepare(nandi->emi_clk); + if (nandi->bch_clk) + clk_disable_unprepare(nandi->bch_clk); +} + +static struct clk *nandi_clk_setup(struct nandi_controller *nandi, + char *clkname) +{ + struct clk *clk; + int ret; + + clk = clk_get(nandi->dev, clkname); + if (IS_ERR_OR_NULL(clk)) { + dev_warn(nandi->dev, "Failed to get %s clock\n", clkname); + return NULL; + } + + ret = clk_prepare_enable(clk); + if (ret) { + dev_warn(nandi->dev, "Failed to enable %s clock\n", clkname); + clk_put(clk); + return NULL; + } + + return clk; +} + static void nandi_init_bch(struct nandi_controller *nandi, int emi_bank) { dev_dbg(nandi->dev, "%s\n", __func__); @@ -217,6 +259,9 @@ nandi_init_resources(struct platform_device *pdev) return ERR_PTR(err); } + nandi->emi_clk = nandi_clk_setup(nandi, "emi_clk"); + nandi->bch_clk = nandi_clk_setup(nandi, "bch_clk"); + platform_set_drvdata(pdev, nandi); return nandi; @@ -251,6 +296,10 @@ static int stm_nand_bch_probe(struct platform_device *pdev) static int stm_nand_bch_remove(struct platform_device *pdev) { + struct nandi_controller *nandi = platform_get_drvdata(pdev); + + nandi_clk_disable(nandi); + return 0; }
Add support for clocks when, and only when, they are supplied. It is not yet compulsory to provide the BCH and EMI clocks, as Common Clk isn't supported Mainline yet. Until an implementation lands upstream all clocks located on STM boards default to always-on. Signed-off-by: Lee Jones <lee.jones@linaro.org> --- drivers/mtd/nand/stm_nand_bch.c | 49 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+)