#include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
 #include <linux/regulator/consumer.h>
 #include <linux/regmap.h>
 
 struct flexcan_priv {
        struct can_priv can;
        struct can_rx_offload offload;
+       struct device *dev;
 
        struct flexcan_regs __iomem *regs;
        struct flexcan_mb __iomem *tx_mb;
        priv->write(reg_ctrl, ®s->ctrl);
 }
 
+static int flexcan_clks_enable(const struct flexcan_priv *priv)
+{
+       int err;
+
+       err = clk_prepare_enable(priv->clk_ipg);
+       if (err)
+               return err;
+
+       err = clk_prepare_enable(priv->clk_per);
+       if (err)
+               clk_disable_unprepare(priv->clk_ipg);
+
+       return err;
+}
+
+static void flexcan_clks_disable(const struct flexcan_priv *priv)
+{
+       clk_disable_unprepare(priv->clk_per);
+       clk_disable_unprepare(priv->clk_ipg);
+}
+
 static inline int flexcan_transceiver_enable(const struct flexcan_priv *priv)
 {
        if (!priv->reg_xceiver)
        const struct flexcan_priv *priv = netdev_priv(dev);
        int err;
 
-       err = clk_prepare_enable(priv->clk_ipg);
-       if (err)
+       err = pm_runtime_get_sync(priv->dev);
+       if (err < 0)
                return err;
 
-       err = clk_prepare_enable(priv->clk_per);
-       if (err)
-               goto out_disable_ipg;
-
        err = __flexcan_get_berr_counter(dev, bec);
 
-       clk_disable_unprepare(priv->clk_per);
- out_disable_ipg:
-       clk_disable_unprepare(priv->clk_ipg);
+       pm_runtime_put(priv->dev);
 
        return err;
 }
        struct flexcan_priv *priv = netdev_priv(dev);
        int err;
 
-       err = clk_prepare_enable(priv->clk_ipg);
-       if (err)
+       err = pm_runtime_get_sync(priv->dev);
+       if (err < 0)
                return err;
 
-       err = clk_prepare_enable(priv->clk_per);
-       if (err)
-               goto out_disable_ipg;
-
        err = open_candev(dev);
        if (err)
-               goto out_disable_per;
+               goto out_runtime_put;
 
        err = request_irq(dev->irq, flexcan_irq, IRQF_SHARED, dev->name, dev);
        if (err)
        free_irq(dev->irq, dev);
  out_close:
        close_candev(dev);
- out_disable_per:
-       clk_disable_unprepare(priv->clk_per);
- out_disable_ipg:
-       clk_disable_unprepare(priv->clk_ipg);
+ out_runtime_put:
+       pm_runtime_put(priv->dev);
 
        return err;
 }
 
        can_rx_offload_del(&priv->offload);
        free_irq(dev->irq, dev);
-       clk_disable_unprepare(priv->clk_per);
-       clk_disable_unprepare(priv->clk_ipg);
 
        close_candev(dev);
+       pm_runtime_put(priv->dev);
 
        can_led_event(dev, CAN_LED_EVENT_STOP);
 
        struct flexcan_regs __iomem *regs = priv->regs;
        u32 reg, err;
 
-       err = clk_prepare_enable(priv->clk_ipg);
+       err = flexcan_clks_enable(priv);
        if (err)
                return err;
 
-       err = clk_prepare_enable(priv->clk_per);
-       if (err)
-               goto out_disable_ipg;
-
        /* select "bus clock", chip must be disabled */
        err = flexcan_chip_disable(priv);
        if (err)
-               goto out_disable_per;
+               goto out_clks_disable;
+
        reg = priv->read(®s->ctrl);
        reg |= FLEXCAN_CTRL_CLK_SRC;
        priv->write(reg, ®s->ctrl);
        }
 
        err = register_candev(dev);
+       if (err)
+               goto out_chip_disable;
 
-       /* disable core and turn off clocks */
- out_chip_disable:
+       /* Disable core and let pm_runtime_put() disable the clocks.
+        * If CONFIG_PM is not enabled, the clocks will stay powered.
+        */
        flexcan_chip_disable(priv);
- out_disable_per:
-       clk_disable_unprepare(priv->clk_per);
- out_disable_ipg:
-       clk_disable_unprepare(priv->clk_ipg);
+       pm_runtime_put(priv->dev);
+
+       return 0;
 
+ out_chip_disable:
+       flexcan_chip_disable(priv);
+ out_clks_disable:
+       flexcan_clks_disable(priv);
        return err;
 }
 
                priv->write = flexcan_write_le;
        }
 
+       priv->dev = &pdev->dev;
        priv->can.clock.freq = clock_freq;
        priv->can.bittiming_const = &flexcan_bittiming_const;
        priv->can.do_set_mode = flexcan_set_mode;
        priv->devtype_data = devtype_data;
        priv->reg_xceiver = reg_xceiver;
 
+       pm_runtime_get_noresume(&pdev->dev);
+       pm_runtime_set_active(&pdev->dev);
+       pm_runtime_enable(&pdev->dev);
+
        err = register_flexcandev(dev);
        if (err) {
                dev_err(&pdev->dev, "registering netdev failed\n");
        struct net_device *dev = platform_get_drvdata(pdev);
 
        unregister_flexcandev(dev);
+       pm_runtime_disable(&pdev->dev);
        free_candev(dev);
 
        return 0;
 {
        struct net_device *dev = dev_get_drvdata(device);
        struct flexcan_priv *priv = netdev_priv(dev);
-       int err;
+       int err = 0;
 
        if (netif_running(dev)) {
                /* if wakeup is enabled, enter stop mode
                        err = flexcan_chip_disable(priv);
                        if (err)
                                return err;
+
+                       err = pm_runtime_force_suspend(device);
                }
                netif_stop_queue(dev);
                netif_device_detach(dev);
        }
        priv->can.state = CAN_STATE_SLEEPING;
 
-       return 0;
+       return err;
 }
 
 static int __maybe_unused flexcan_resume(struct device *device)
 {
        struct net_device *dev = dev_get_drvdata(device);
        struct flexcan_priv *priv = netdev_priv(dev);
-       int err;
+       int err = 0;
 
        priv->can.state = CAN_STATE_ERROR_ACTIVE;
        if (netif_running(dev)) {
                if (device_may_wakeup(device)) {
                        disable_irq_wake(dev->irq);
                } else {
-                       err = flexcan_chip_enable(priv);
+                       err = pm_runtime_force_resume(device);
                        if (err)
                                return err;
+
+                       err = flexcan_chip_enable(priv);
                }
        }
+
+       return err;
+}
+
+static int __maybe_unused flexcan_runtime_suspend(struct device *device)
+{
+       struct net_device *dev = dev_get_drvdata(device);
+       struct flexcan_priv *priv = netdev_priv(dev);
+
+       flexcan_clks_disable(priv);
+
        return 0;
 }
 
+static int __maybe_unused flexcan_runtime_resume(struct device *device)
+{
+       struct net_device *dev = dev_get_drvdata(device);
+       struct flexcan_priv *priv = netdev_priv(dev);
+
+       return flexcan_clks_enable(priv);
+}
+
 static int __maybe_unused flexcan_noirq_suspend(struct device *device)
 {
        struct net_device *dev = dev_get_drvdata(device);
 
 static const struct dev_pm_ops flexcan_pm_ops = {
        SET_SYSTEM_SLEEP_PM_OPS(flexcan_suspend, flexcan_resume)
+       SET_RUNTIME_PM_OPS(flexcan_runtime_suspend, flexcan_runtime_resume, NULL)
        SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(flexcan_noirq_suspend, flexcan_noirq_resume)
 };