From: Dan Murphy <dmurphy@ti.com> To: linux-kernel@vger.kernel.org, mkl@pengutronix.de, linux-can@vger.kernel.org, wg@grandegger.com, sriram.dash@samsung.com Cc: davem@davemloft.net, Dan Murphy <dmurphy@ti.com> Subject: [PATCH linux-master 1/3] can: tcan4x5x: Move clock init to TCAN driver Date: Fri, 31 Jan 2020 12:34:31 -0600 [thread overview] Message-ID: <20200131183433.11041-2-dmurphy@ti.com> (raw) In-Reply-To: <20200131183433.11041-1-dmurphy@ti.com> 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@ti.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
WARNING: multiple messages have this Message-ID (diff)
From: Dan Murphy <dmurphy@ti.com> To: <linux-kernel@vger.kernel.org>, <mkl@pengutronix.de>, <linux-can@vger.kernel.org>, <wg@grandegger.com>, <sriram.dash@samsung.com> Cc: <davem@davemloft.net>, Dan Murphy <dmurphy@ti.com> Subject: [PATCH linux-master 1/3] can: tcan4x5x: Move clock init to TCAN driver Date: Fri, 31 Jan 2020 12:34:31 -0600 [thread overview] Message-ID: <20200131183433.11041-2-dmurphy@ti.com> (raw) In-Reply-To: <20200131183433.11041-1-dmurphy@ti.com> 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@ti.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
next prev parent reply other threads:[~2020-01-31 18:34 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-01-31 18:34 [PATCH linux-master 0/3] MCAN updates for clock discovery Dan Murphy 2020-01-31 18:34 ` Dan Murphy 2020-01-31 18:34 ` Dan Murphy [this message] 2020-01-31 18:34 ` [PATCH linux-master 1/3] can: tcan4x5x: Move clock init to TCAN driver Dan Murphy 2020-02-21 14:25 ` Dan Murphy 2020-02-21 14:25 ` Dan Murphy 2020-02-21 14:43 ` Marc Kleine-Budde 2020-02-25 17:45 ` Dan Murphy 2020-02-25 17:45 ` Dan Murphy 2020-02-25 20:48 ` Marc Kleine-Budde 2020-01-31 18:34 ` [PATCH linux-master 2/3] can: m_can_platform: Move clock discovery and init to platform Dan Murphy 2020-01-31 18:34 ` Dan Murphy 2020-01-31 18:34 ` [PATCH linux-master 3/3] can: m_can: Remove unused clock function from the framework Dan Murphy 2020-01-31 18:34 ` Dan Murphy 2020-02-19 13:07 ` [PATCH linux-master 0/3] MCAN updates for clock discovery Dan Murphy 2020-02-19 13:07 ` Dan Murphy
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=20200131183433.11041-2-dmurphy@ti.com \ --to=dmurphy@ti.com \ --cc=davem@davemloft.net \ --cc=linux-can@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mkl@pengutronix.de \ --cc=sriram.dash@samsung.com \ --cc=wg@grandegger.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.