From: Dan Murphy <dmurphy@xxxxxx> Move the clock discovery and init to the platform driver as the platform driver needs an additional clock to the CAN clock to be initilialized and managed. Signed-off-by: Dan Murphy <dmurphy@xxxxxx> Link: http://lore.kernel.org/r/20200131183433.11041-3-dmurphy@xxxxxx Signed-off-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx> --- drivers/net/can/m_can/m_can_platform.c | 35 ++++++++++++++++++++------ 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/drivers/net/can/m_can/m_can_platform.c b/drivers/net/can/m_can/m_can_platform.c index 161cb9be018c..b5b7b77909d3 100644 --- a/drivers/net/can/m_can/m_can_platform.c +++ b/drivers/net/can/m_can/m_can_platform.c @@ -12,6 +12,9 @@ struct m_can_plat_priv { void __iomem *base; void __iomem *mram_base; + + struct clk *hclk; + struct clk *cclk; }; static u32 iomap_read_reg(struct m_can_classdev *cdev, int reg) @@ -53,6 +56,22 @@ static struct m_can_ops m_can_plat_ops = { .read_fifo = iomap_read_fifo, }; +static int m_can_plat_get_clocks(struct m_can_plat_priv *priv, + struct m_can_classdev *mcan_class) +{ + int ret = 0; + + priv->hclk = devm_clk_get(mcan_class->dev, "hclk"); + + priv->cclk = devm_clk_get(mcan_class->dev, "cclk"); + if (IS_ERR(priv->cclk)) { + dev_err(mcan_class->dev, "no clock found\n"); + ret = -ENODEV; + } + + return ret; +} + static int m_can_plat_probe(struct platform_device *pdev) { struct m_can_classdev *mcan_class; @@ -74,7 +93,7 @@ static int m_can_plat_probe(struct platform_device *pdev) mcan_class->device_data = priv; - ret = m_can_class_get_clocks(mcan_class); + ret = m_can_plat_get_clocks(priv, mcan_class); if (ret) goto probe_fail; @@ -104,7 +123,7 @@ static int m_can_plat_probe(struct platform_device *pdev) mcan_class->net->irq = irq; mcan_class->pm_clock_support = 1; - mcan_class->can.clock.freq = clk_get_rate(mcan_class->cclk); + mcan_class->can.clock.freq = clk_get_rate(priv->cclk); mcan_class->dev = &pdev->dev; mcan_class->ops = &m_can_plat_ops; @@ -150,9 +169,10 @@ static int __maybe_unused m_can_runtime_suspend(struct device *dev) { struct net_device *ndev = dev_get_drvdata(dev); struct m_can_classdev *mcan_class = netdev_priv(ndev); + struct m_can_plat_priv *priv = mcan_class->device_data; - clk_disable_unprepare(mcan_class->cclk); - clk_disable_unprepare(mcan_class->hclk); + clk_disable_unprepare(priv->cclk); + clk_disable_unprepare(priv->hclk); return 0; } @@ -161,15 +181,16 @@ static int __maybe_unused m_can_runtime_resume(struct device *dev) { struct net_device *ndev = dev_get_drvdata(dev); struct m_can_classdev *mcan_class = netdev_priv(ndev); + struct m_can_plat_priv *priv = mcan_class->device_data; int err; - err = clk_prepare_enable(mcan_class->hclk); + err = clk_prepare_enable(priv->hclk); if (err) return err; - err = clk_prepare_enable(mcan_class->cclk); + err = clk_prepare_enable(priv->cclk); if (err) - clk_disable_unprepare(mcan_class->hclk); + clk_disable_unprepare(priv->hclk); return err; } -- 2.28.0
