linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: lee.jones@linaro.org (Lee Jones)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 02/13] mtd: st_spi_fsm: Obtain and use EMI clock
Date: Mon, 15 Dec 2014 11:59:09 +0000	[thread overview]
Message-ID: <1418644760-18773-3-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1418644760-18773-1-git-send-email-lee.jones@linaro.org>

ST's Common Clk Framework is now available. This patch ensures the FSM
makes use of it by obtaining and enabling the EMI clock. If system fails
to provide the EMI clock, we bomb out.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/mtd/devices/st_spi_fsm.c | 40 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/devices/st_spi_fsm.c b/drivers/mtd/devices/st_spi_fsm.c
index 6e4d3bfe..fac0fe9 100644
--- a/drivers/mtd/devices/st_spi_fsm.c
+++ b/drivers/mtd/devices/st_spi_fsm.c
@@ -24,6 +24,7 @@
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/of.h>
+#include <linux/clk.h>
 
 #include "serial_flash_cmds.h"
 
@@ -262,6 +263,7 @@ struct stfsm {
 	struct mtd_info		mtd;
 	struct mutex		lock;
 	struct flash_info       *info;
+	struct clk              *clk;
 
 	uint32_t                configuration;
 	uint32_t                fifo_dir_delay;
@@ -1906,8 +1908,7 @@ static void stfsm_set_freq(struct stfsm *fsm, uint32_t spi_freq)
 	uint32_t emi_freq;
 	uint32_t clk_div;
 
-	/* TODO: Make this dynamic */
-	emi_freq = STFSM_DEFAULT_EMI_FREQ;
+	emi_freq = clk_get_rate(fsm->clk);
 
 	/*
 	 * Calculate clk_div - values between 2 and 128
@@ -2057,6 +2058,18 @@ static int stfsm_probe(struct platform_device *pdev)
 		return PTR_ERR(fsm->base);
 	}
 
+	fsm->clk = devm_clk_get(&pdev->dev, NULL);
+	if (IS_ERR(fsm->clk)) {
+		dev_err(fsm->dev, "Couldn't find EMI clock.\n");
+		return PTR_ERR(fsm->clk);
+	}
+
+	ret = clk_prepare_enable(fsm->clk);
+	if (ret) {
+		dev_err(fsm->dev, "Failed to enable EMI clock.\n");
+		return ret;
+	}
+
 	mutex_init(&fsm->lock);
 
 	ret = stfsm_init(fsm);
@@ -2121,6 +2134,28 @@ static int stfsm_remove(struct platform_device *pdev)
 	return mtd_device_unregister(&fsm->mtd);
 }
 
+#ifdef CONFIG_PM_SLEEP
+static int stfsmfsm_suspend(struct device *dev)
+{
+	struct stfsm *fsm = dev_get_drvdata(dev);
+
+	clk_disable_unprepare(fsm->clk);
+
+	return 0;
+}
+
+static int stfsmfsm_resume(struct device *dev)
+{
+	struct stfsm *fsm = dev_get_drvdata(dev);
+
+	clk_prepare_enable(fsm->clk);
+
+	return 0;
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(stfsm_pm_ops, stfsmfsm_suspend, stfsmfsm_resume);
+
 static const struct of_device_id stfsm_match[] = {
 	{ .compatible = "st,spi-fsm", },
 	{},
@@ -2134,6 +2169,7 @@ static struct platform_driver stfsm_driver = {
 		.name	= "st-spi-fsm",
 		.owner	= THIS_MODULE,
 		.of_match_table = stfsm_match,
+		.pm     = &stfsm_pm_ops,
 	},
 };
 module_platform_driver(stfsm_driver);
-- 
1.9.1

  parent reply	other threads:[~2014-12-15 11:59 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-15 11:59 [PATCH v3 00/13] mtd: st_spi_fsm: Align with ST's internal development Lee Jones
2014-12-15 11:59 ` [PATCH v3 01/13] mtd: st_spi_fsm: Extend fsm_clear_fifo to handle unwanted bytes Lee Jones
2014-12-15 11:59 ` Lee Jones [this message]
2014-12-15 11:59 ` [PATCH v3 03/13] mtd: st_spi_fsm: dt-bindings: Deprecate generic compatible string Lee Jones
2015-01-13  5:02   ` Brian Norris
2014-12-15 11:59 ` [PATCH v3 04/13] mtd: st_spi_fsm: Fetch boot device locations from DT match tables Lee Jones
2015-01-13  4:55   ` Brian Norris
2015-01-21 12:56     ` Lee Jones
2014-12-15 11:59 ` [PATCH v3 05/13] mtd: st_spi_fsm: Fix [-Wsign-compare] build warning Lee Jones
2014-12-15 11:59 ` [PATCH v3 06/13] mtd: st_spi_fsm: Add support for Micron N25Q512A Lee Jones
2014-12-15 11:59 ` [PATCH v3 07/13] mtd: st_spi_fsm: Add support for N25Q512 and N25Q00A devices Lee Jones
2014-12-15 11:59 ` [PATCH v3 08/13] mtd: st_spi_fsm: Update the JEDEC probe to handle extended READIDs Lee Jones
2015-01-13  5:07   ` Brian Norris
2015-01-21 13:02     ` Lee Jones
2015-02-06  2:11       ` Brian Norris
2015-02-10  9:04         ` Lee Jones
2015-02-24  4:44           ` Brian Norris
2015-02-24 10:14             ` Lee Jones
2014-12-15 11:59 ` [PATCH v3 09/13] mtd: st_spi_fsm: Update Spansion device entries Lee Jones
2014-12-15 11:59 ` [PATCH v3 10/13] mtd: st_spi_fsm: Improve busy wait handling Lee Jones
2014-12-15 11:59 ` [PATCH v3 11/13] mtd: st_spi_fsm: General tidy-up Lee Jones
2015-01-13  4:04   ` Brian Norris
2014-12-15 11:59 ` [PATCH v3 12/13] ARM: STi: stih416: Use new platform specific compatible string Lee Jones
2014-12-15 11:59 ` [PATCH v3 13/13] ARM: STi: stih416: Supply EMI clock reference to FSM SPI NOR Lee Jones
2015-01-13  5:14 ` [PATCH v3 00/13] mtd: st_spi_fsm: Align with ST's internal development Brian Norris
2015-01-21 12:49   ` Lee Jones
2015-02-06  1:59     ` Brian Norris

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=1418644760-18773-3-git-send-email-lee.jones@linaro.org \
    --to=lee.jones@linaro.org \
    --cc=linux-arm-kernel@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;
as well as URLs for NNTP newsgroup(s).