interconnect: qcom: rpm: drop bogus pm domain attach

Any power domain would already have been attached by the platform bus
code so drop the bogus power domain attach which always succeeds from
probe.

This effectively reverts commit 7de109c0abe9 ("interconnect: icc-rpm:
Add support for bus power domain").

Fixes: 7de109c0abe9 ("interconnect: icc-rpm: Add support for bus power domain")
Cc: Yassine Oudjana <y.oudjana@protonmail.com>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Tested-by: Konrad Dybcio <konrad.dybcio@linaro.org> # MSM8996 Sony Kagura
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20230313084953.24088-3-johan+linaro@kernel.org
Signed-off-by: Georgi Djakov <djakov@kernel.org>

diff --git a/drivers/interconnect/qcom/icc-rpm.c b/drivers/interconnect/qcom/icc-rpm.c
index 4180a06681b2b9aca3134ee1aeb57e2c0ca6df20..c80819557923ede900d8e190b32a1cda51091210 100644 (file)
--- a/drivers/interconnect/qcom/icc-rpm.c
+++ b/drivers/interconnect/qcom/icc-rpm.c
@@ -11,7 +11,6 @@
 #include <linux/of_device.h>
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
-#include <linux/pm_domain.h>
 #include <linux/regmap.h>
 #include <linux/slab.h>
 
@@ -496,12 +495,6 @@ regmap_done:
        if (ret)
                return ret;
 
-       if (desc->has_bus_pd) {
-               ret = dev_pm_domain_attach(dev, true);
-               if (ret)
-                       return ret;
-       }
-
        provider = &qp->provider;
        provider->dev = dev;
        provider->set = qcom_icc_set;

diff --git a/drivers/interconnect/qcom/icc-rpm.h b/drivers/interconnect/qcom/icc-rpm.h
index a49af844ab13e5faa92bbf33c5b1298e428ff5bd..02257b0d3d5c6100f97c46e56f5b7786968fb4fa 100644 (file)
--- a/drivers/interconnect/qcom/icc-rpm.h
+++ b/drivers/interconnect/qcom/icc-rpm.h
@@ -91,7 +91,6 @@ struct qcom_icc_desc {
        size_t num_nodes;
        const char * const *clocks;
        size_t num_clocks;
-       bool has_bus_pd;
        enum qcom_icc_type type;
        const struct regmap_config *regmap_cfg;
        unsigned int qos_offset;

diff --git a/drivers/interconnect/qcom/msm8996.c b/drivers/interconnect/qcom/msm8996.c
index 25a1a32bc611facde621e72729c798e4623040b1..14efd2761b7ab80cdd3af0c741c1aca8582e885c 100644 (file)
--- a/drivers/interconnect/qcom/msm8996.c
+++ b/drivers/interconnect/qcom/msm8996.c
@@ -1823,7 +1823,6 @@ static const struct qcom_icc_desc msm8996_a0noc = {
        .num_nodes = ARRAY_SIZE(a0noc_nodes),
        .clocks = bus_a0noc_clocks,
        .num_clocks = ARRAY_SIZE(bus_a0noc_clocks),
-       .has_bus_pd = true,
        .regmap_cfg = &msm8996_a0noc_regmap_config
 };