| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20200131183433.11041-2-dmurphy@ti.com>
Date: Fri, 31 Jan 2020 12:34:31 -0600
From: Dan Murphy <dmurphy@...com>
To: <linux-kernel@...r.kernel.org>, <mkl@...gutronix.de>,
<linux-can@...r.kernel.org>, <wg@...ndegger.com>,
<sriram.dash@...sung.com>
CC: <davem@...emloft.net>, Dan Murphy <dmurphy@...com>
Subject: [PATCH linux-master 1/3] can: tcan4x5x: Move clock init to TCAN driver
Move the clock discovery and initialization from the m_can framework to
the registrar. This allows for registrars to have unique clock
initialization. The TCAN device only needs the CAN clock reference.
Signed-off-by: Dan Murphy <dmurphy@...com>
---
drivers/net/can/m_can/tcan4x5x.c | 78 ++++++++++++++++++++++++--------
1 file changed, 59 insertions(+), 19 deletions(-)
diff --git a/drivers/net/can/m_can/tcan4x5x.c b/drivers/net/can/m_can/tcan4x5x.c
index eacd428e07e9..9821babef55e 100644
--- a/drivers/net/can/m_can/tcan4x5x.c
+++ b/drivers/net/can/m_can/tcan4x5x.c
@@ -124,6 +124,8 @@ struct tcan4x5x_priv {
struct gpio_desc *device_state_gpio;
struct regulator *power;
+ struct clk *cclk;
+
/* Register based ip */
int mram_start;
int reg_offset;
@@ -429,6 +431,27 @@ static struct m_can_ops tcan4x5x_ops = {
.clear_interrupts = tcan4x5x_clear_interrupts,
};
+static int tcan4x5x_get_clock(struct tcan4x5x_priv *priv,
+ struct m_can_classdev *m_can_dev)
+{
+ int freq;
+
+ priv->cclk = devm_clk_get(m_can_dev->dev, "cclk");
+ if (IS_ERR(priv->cclk)) {
+ dev_err(m_can_dev->dev, "no CAN clock source defined\n");
+ freq = TCAN4X5X_EXT_CLK_DEF;
+ priv->cclk = NULL;
+
+ } else {
+ freq = clk_get_rate(priv->cclk);
+ /* Sanity check */
+ if (freq < 20000000 || freq > TCAN4X5X_EXT_CLK_DEF)
+ return -ERANGE;
+ }
+
+ return freq;
+}
+
static int tcan4x5x_can_probe(struct spi_device *spi)
{
struct tcan4x5x_priv *priv;
@@ -451,17 +474,9 @@ static int tcan4x5x_can_probe(struct spi_device *spi)
mcan_class->device_data = priv;
- m_can_class_get_clocks(mcan_class);
- if (IS_ERR(mcan_class->cclk)) {
- dev_err(&spi->dev, "no CAN clock source defined\n");
- freq = TCAN4X5X_EXT_CLK_DEF;
- } else {
- freq = clk_get_rate(mcan_class->cclk);
- }
-
- /* Sanity check */
- if (freq < 20000000 || freq > TCAN4X5X_EXT_CLK_DEF)
- return -ERANGE;
+ freq = tcan4x5x_get_clock(priv, mcan_class);
+ if (freq < 0)
+ return freq;
priv->reg_offset = TCAN4X5X_MCAN_OFFSET;
priv->mram_start = TCAN4X5X_MRAM_START;
@@ -483,14 +498,14 @@ static int tcan4x5x_can_probe(struct spi_device *spi)
spi->bits_per_word = 32;
ret = spi_setup(spi);
if (ret)
- goto out_clk;
+ return ret;
priv->regmap = devm_regmap_init(&spi->dev, &tcan4x5x_bus,
&spi->dev, &tcan4x5x_regmap);
ret = tcan4x5x_power_enable(priv->power, 1);
if (ret)
- goto out_clk;
+ return ret;
ret = tcan4x5x_parse_config(mcan_class);
if (ret)
@@ -509,12 +524,6 @@ static int tcan4x5x_can_probe(struct spi_device *spi)
out_power:
tcan4x5x_power_enable(priv->power, 0);
-out_clk:
- if (!IS_ERR(mcan_class->cclk)) {
- clk_disable_unprepare(mcan_class->cclk);
- clk_disable_unprepare(mcan_class->hclk);
- }
-
dev_err(&spi->dev, "Probe failed, err=%d\n", ret);
return ret;
}
@@ -530,6 +539,37 @@ static int tcan4x5x_can_remove(struct spi_device *spi)
return 0;
}
+static int __maybe_unused tcan4x5x_runtime_suspend(struct device *dev)
+{
+ struct net_device *ndev = dev_get_drvdata(dev);
+ struct m_can_classdev *mcan_class = netdev_priv(ndev);
+ struct tcan4x5x_priv *priv = mcan_class->device_data;
+
+ m_can_class_suspend(dev);
+
+ if (priv->cclk)
+ clk_disable_unprepare(priv->cclk);
+
+ return 0;
+}
+
+static int __maybe_unused tcan4x5x_runtime_resume(struct device *dev)
+{
+ struct net_device *ndev = dev_get_drvdata(dev);
+ struct m_can_classdev *mcan_class = netdev_priv(ndev);
+ struct tcan4x5x_priv *priv = mcan_class->device_data;
+
+ if (priv->cclk)
+ return clk_prepare_enable(priv->cclk);
+
+ return 0;
+}
+
+static const struct dev_pm_ops m_can_pmops = {
+ SET_RUNTIME_PM_OPS(tcan4x5x_runtime_suspend,
+ tcan4x5x_runtime_resume, NULL)
+};
+
static const struct of_device_id tcan4x5x_of_match[] = {
{ .compatible = "ti,tcan4x5x", },
{ }
--
2.25.0
Powered by blists - more mailing lists