Merge tag 'rproc-v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc...

[sfrench/cifs-2.6.git] / drivers / remoteproc / imx_dsp_rproc.c

diff --git a/drivers/remoteproc/imx_dsp_rproc.c b/drivers/remoteproc/imx_dsp_rproc.c
index 56a799cb8b363adbcbc435e617434f9f1df4859e..087506e2150805d268ba669e307302828f0a331d 100644 (file)
--- a/drivers/remoteproc/imx_dsp_rproc.c
+++ b/drivers/remoteproc/imx_dsp_rproc.c
@@ -103,12 +103,10 @@ enum imx_dsp_rp_mbox_messages {
  * @tx_ch: mailbox tx channel handle
  * @rx_ch: mailbox rx channel handle
  * @rxdb_ch: mailbox rx doorbell channel handle
- * @pd_dev: power domain device
- * @pd_dev_link: power domain device link
+ * @pd_list: power domain list
  * @ipc_handle: System Control Unit ipc handle
  * @rproc_work: work for processing virtio interrupts
  * @pm_comp: completion primitive to sync for suspend response
- * @num_domains: power domain number
  * @flags: control flags
  */
 struct imx_dsp_rproc {
@@ -121,12 +119,10 @@ struct imx_dsp_rproc {
        struct mbox_chan                        *tx_ch;
        struct mbox_chan                        *rx_ch;
        struct mbox_chan                        *rxdb_ch;
-       struct device                           **pd_dev;
-       struct device_link                      **pd_dev_link;
+       struct dev_pm_domain_list               *pd_list;
        struct imx_sc_ipc                       *ipc_handle;
        struct work_struct                      rproc_work;
        struct completion                       pm_comp;
-       int                                     num_domains;
        u32                                     flags;
 };
 
@@ -955,74 +951,14 @@ static const struct rproc_ops imx_dsp_rproc_ops = {
 static int imx_dsp_attach_pm_domains(struct imx_dsp_rproc *priv)
 {
        struct device *dev = priv->rproc->dev.parent;
-       int ret, i;
-
-       priv->num_domains = of_count_phandle_with_args(dev->of_node,
-                                                      "power-domains",
-                                                      "#power-domain-cells");
-
-       /* If only one domain, then no need to link the device */
-       if (priv->num_domains <= 1)
-               return 0;
-
-       priv->pd_dev = devm_kmalloc_array(dev, priv->num_domains,
-                                         sizeof(*priv->pd_dev),
-                                         GFP_KERNEL);
-       if (!priv->pd_dev)
-               return -ENOMEM;
-
-       priv->pd_dev_link = devm_kmalloc_array(dev, priv->num_domains,
-                                              sizeof(*priv->pd_dev_link),
-                                              GFP_KERNEL);
-       if (!priv->pd_dev_link)
-               return -ENOMEM;
-
-       for (i = 0; i < priv->num_domains; i++) {
-               priv->pd_dev[i] = dev_pm_domain_attach_by_id(dev, i);
-               if (IS_ERR(priv->pd_dev[i])) {
-                       ret = PTR_ERR(priv->pd_dev[i]);
-                       goto detach_pm;
-               }
-
-               /*
-                * device_link_add will check priv->pd_dev[i], if it is
-                * NULL, then will break.
-                */
-               priv->pd_dev_link[i] = device_link_add(dev,
-                                                      priv->pd_dev[i],
-                                                      DL_FLAG_STATELESS |
-                                                      DL_FLAG_PM_RUNTIME);
-               if (!priv->pd_dev_link[i]) {
-                       dev_pm_domain_detach(priv->pd_dev[i], false);
-                       ret = -EINVAL;
-                       goto detach_pm;
-               }
-       }
-
-       return 0;
-
-detach_pm:
-       while (--i >= 0) {
-               device_link_del(priv->pd_dev_link[i]);
-               dev_pm_domain_detach(priv->pd_dev[i], false);
-       }
-
-       return ret;
-}
-
-static int imx_dsp_detach_pm_domains(struct imx_dsp_rproc *priv)
-{
-       int i;
+       int ret;
 
-       if (priv->num_domains <= 1)
+       /* A single PM domain is already attached. */
+       if (dev->pm_domain)
                return 0;
 
-       for (i = 0; i < priv->num_domains; i++) {
-               device_link_del(priv->pd_dev_link[i]);
-               dev_pm_domain_detach(priv->pd_dev[i], false);
-       }
-
-       return 0;
+       ret = dev_pm_domain_attach_list(dev, NULL, &priv->pd_list);
+       return ret < 0 ? ret : 0;
 }
 
 /**
@@ -1154,7 +1090,7 @@ static int imx_dsp_rproc_probe(struct platform_device *pdev)
        return 0;
 
 err_detach_domains:
-       imx_dsp_detach_pm_domains(priv);
+       dev_pm_domain_detach_list(priv->pd_list);
 
        return ret;
 }
@@ -1166,7 +1102,7 @@ static void imx_dsp_rproc_remove(struct platform_device *pdev)
 
        pm_runtime_disable(&pdev->dev);
        rproc_del(rproc);
-       imx_dsp_detach_pm_domains(priv);
+       dev_pm_domain_detach_list(priv->pd_list);
 }
 
 /* pm runtime functions */