NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

interconnect: qcom: rpm: drop bogus pm domain attach

Browse source 
[ Upstream commit 72b2720c18ecde92e6a36c4ac897dd5848e3f379 ]

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 7de109c0ab ("interconnect: icc-rpm:
Add support for bus power domain").

Fixes: 7de109c0ab ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Johan Hovold 2023-03-13 09:49:53 +01:00 • committed by Greg Kroah-Hartman
parent 2d0f63077f
commit 55a32fd96e
3 changed files with 0 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
drivers/interconnect/qcom/icc-rpm.c
View file

@ -11,7 +11,6 @@
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/pm_domain.h>
#include <linux/regmap.h> #include <linux/regmap.h>
#include <linux/slab.h> #include <linux/slab.h>
@ -499,12 +498,6 @@ regmap_done:
if (ret) if (ret)
return ret; return ret;
if (desc->has_bus_pd) {
ret = dev_pm_domain_attach(dev, true);
if (ret)
return ret;
}
provider = &qp->provider; provider = &qp->provider;
provider->dev = dev; provider->dev = dev;
provider->set = qcom_icc_set; provider->set = qcom_icc_set;

1
drivers/interconnect/qcom/icc-rpm.h
View file

@ -91,7 +91,6 @@ struct qcom_icc_desc {
size_t num_nodes; size_t num_nodes;
const char * const *clocks; const char * const *clocks;
size_t num_clocks; size_t num_clocks;
bool has_bus_pd;
enum qcom_icc_type type; enum qcom_icc_type type;
const struct regmap_config *regmap_cfg; const struct regmap_config *regmap_cfg;
unsigned int qos_offset; unsigned int qos_offset;

1
drivers/interconnect/qcom/msm8996.c
View file

@ -1823,7 +1823,6 @@ static const struct qcom_icc_desc msm8996_a0noc = {
.num_nodes = ARRAY_SIZE(a0noc_nodes), .num_nodes = ARRAY_SIZE(a0noc_nodes),
.clocks = bus_a0noc_clocks, .clocks = bus_a0noc_clocks,
.num_clocks = ARRAY_SIZE(bus_a0noc_clocks), .num_clocks = ARRAY_SIZE(bus_a0noc_clocks),
.has_bus_pd = true,
.regmap_cfg = &msm8996_a0noc_regmap_config .regmap_cfg = &msm8996_a0noc_regmap_config
}; };