From: Lee Jones <lee.jones@linaro.org>
To: linux-kernel@vger.kernel.org
Cc: computersforpeace@gmail.com, linux-mtd@lists.infradead.org,
kernel@stlinux.com, Lee Jones <lee.jones@linaro.org>
Subject: [PATCH 09/47] mtd: nand: stm_nand_bch: supply clock support
Date: Thu, 1 May 2014 10:56:16 +0100 [thread overview]
Message-ID: <1398938214-17847-10-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1398938214-17847-1-git-send-email-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.
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 62a41de..8e28da0 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 */
@@ -270,6 +274,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__);
@@ -384,6 +426,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;
@@ -413,6 +458,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;
}
--
1.8.3.2
next prev parent reply other threads:[~2014-05-01 10:09 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-01 9:56 [PATCH 00/47] mtd: nand: Add new driver supporting ST's BCH h/w Lee Jones
2014-05-01 9:56 ` [PATCH 01/47] ARM: sti: Add BCH (NAND Flash) Controller support for STiH41x (Orly) SoCs Lee Jones
2014-05-01 9:56 ` [PATCH 02/47] mtd: nand: stm_nand_bch: provide Device Tree documentation Lee Jones
2014-05-01 9:56 ` [PATCH 03/47] mtd: nand: add shared register defines for ST's NAND Controller drivers Lee Jones
2014-05-01 9:56 ` [PATCH 04/47] mtd: nand: adding ST's BCH NAND Controller driver Lee Jones
2014-05-01 9:56 ` [PATCH 05/47] mtd: nand: add ONFI NAND Timing Mode Specifications Lee Jones
2014-05-01 9:56 ` [PATCH 06/47] mtd: nand: stm_nand_bch: IRQ support for ST's BCH NAND Controller driver Lee Jones
2014-05-01 9:56 ` [PATCH 07/47] mtd: nand: stm_nand_bch: change between BCH and Hamming modes Lee Jones
2014-05-01 9:56 ` [PATCH 08/47] mtd: nand: stm_nand_bch: initialise the BCH Controller Lee Jones
2014-05-01 9:56 ` Lee Jones [this message]
2014-05-01 9:56 ` [PATCH 10/47] mtd: nand: stm_nand_bch: introduce and initialise some important data structures Lee Jones
2014-05-01 9:56 ` [PATCH 11/47] mtd: nand: stm_nand_bch: initialise the Hamming Controller Lee Jones
2014-05-01 9:56 ` [PATCH 12/47] mtd: nand: stm_nand_bch: add Power Management Lee Jones
2014-05-01 9:56 ` [PATCH 13/47] mtd: nand: stm_nand_bch: scan for NAND devices Lee Jones
2014-05-01 9:56 ` [PATCH 14/47] mtd: nand: stm_nand_bch: provide Device Tree support Lee Jones
2014-05-01 9:56 ` [PATCH 15/47] mtd: nand: stm_nand_bch: configure BCH and FLEX by ONFI timing mode Lee Jones
2014-05-01 9:56 ` [PATCH 16/47] mtd: nand: stm_nand_bch: add compatible page size check Lee Jones
2014-05-01 9:56 ` [PATCH 17/47] mtd: nand: stm_nand_bch: derive some working variables for latter use Lee Jones
2014-05-01 9:56 ` [PATCH 18/47] mtd: nand: stm_nand_bch: automatically set EEC mode if requested Lee Jones
2014-05-01 9:56 ` [PATCH 19/47] mtd: nand: stm_nand_bch: ensure configuration is compatible with this driver Lee Jones
2014-05-01 9:56 ` [PATCH 20/47] mtd: nand: stm_nand_bch: configure BCH read/write/erase programs Lee Jones
2014-05-01 9:56 ` [PATCH 21/47] mtd: nand: stm_nand_bch: initialise working buffers Lee Jones
2014-05-01 9:56 ` [PATCH 22/47] mtd: nand: stm_nand_bch: provide shared BCH operations Lee Jones
2014-05-01 9:56 ` [PATCH 23/47] mtd: nand: stm_nand_bch: erase one block (BCH) Lee Jones
2014-05-01 9:56 ` [PATCH 24/47] mtd: nand: stm_nand_bch: check erased page for zeros Lee Jones
2014-05-01 9:56 ` [PATCH 25/47] mtd: nand: stm_nand_bch: provide read functionality (BCH) Lee Jones
2014-05-01 9:56 ` [PATCH 26/47] mtd: nand: stm_nand_bch: provide write " Lee Jones
2014-05-01 9:56 ` [PATCH 27/47] mtd: nand: stm_nand_bch: find IBBT signature Lee Jones
2014-05-01 9:56 ` [PATCH 28/47] mtd: nand: stm_nand_bch: bad block marking helpers Lee Jones
2014-05-01 9:56 ` [PATCH 29/47] mtd: nand: stm_nand_bch: populate IBBT BCH Header Lee Jones
2014-05-01 9:56 ` [PATCH 30/47] mtd: nand: stm_nand_bch: write IBBT to Flash Lee Jones
2014-05-01 9:56 ` [PATCH 31/47] mtd: nand: stm_nand_bch: update flash-resident BBT(s) Lee Jones
2014-05-01 9:56 ` [PATCH 32/47] mtd: nand: stm_nand_bch: add Hamming-FLEX operations Lee Jones
2014-05-01 9:56 ` [PATCH 33/47] mtd: nand: stm_nand_bch: read and write raw (FLEX) Lee Jones
2014-05-01 9:56 ` [PATCH 34/47] mtd: nand: stm_nand_bch: scan block for BBM(s) according to specified BBT options Lee Jones
2014-05-01 9:56 ` [PATCH 35/47] mtd: nand: stm_nand_bch: scan for BBMs and build memory-resident BBT Lee Jones
2014-05-01 9:56 ` [PATCH 36/47] mtd: nand: stm_nand_bch: search for and load flash-resident BBT Lee Jones
2014-05-01 9:56 ` [PATCH 37/47] mtd: nand: stm_nand_bch: " Lee Jones
2014-05-01 9:56 ` [PATCH 38/47] mtd: nand: stm_nand_bch: dump bad blocks Lee Jones
2014-05-01 9:56 ` [PATCH 39/47] mtd: nand: stm_nand_bch: parse partitions and register an MTD device Lee Jones
2014-05-01 9:56 ` [PATCH 40/47] mtd: nand: stm_nand_bch: fetch the bit-flips threshold Lee Jones
2014-05-01 9:56 ` [PATCH 41/47] mtd: nand: stm_nand_bch: MTD erase (BCH) Lee Jones
2014-05-01 9:56 ` [PATCH 42/47] mtd: nand: stm_nand_bch: MTD mark and check for bad blocks (BCH) Lee Jones
2014-05-01 9:56 ` [PATCH 43/47] mtd: nand: stm_nand_bch: read and write buffers (FLEX) Lee Jones
2014-05-01 9:56 ` [PATCH 44/47] mtd: nand: mtd_nand_bch: add remaining FLEX functions Lee Jones
2014-05-01 9:56 ` [PATCH 45/47] mtd: nand: stm_nand_bch: catch unhandled calls to read and write to the OOB Lee Jones
2014-05-01 9:56 ` [PATCH 46/47] mtd: nand: stm_nand_bch: finalise setup by calling and_scan_tail() Lee Jones
2014-05-01 9:56 ` [PATCH 47/47] mtd: nand: catch unsupported framework call-backs Lee Jones
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=1398938214-17847-10-git-send-email-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=computersforpeace@gmail.com \
--cc=kernel@stlinux.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®