diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2021-01-14 19:29:28 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-28 13:41:49 +0200 |
| commit | 77ac7b25a80e7a303c803230cc1595d976bfd1ae (patch) | |
| tree | 223711807d71688e2550f099c196e5e208fecb35 | |
| parent | 1b490f73c55b832c8d1ed1abfc7467639465fc5a (diff) | |
| download | linux-stable-77ac7b25a80e7a303c803230cc1595d976bfd1ae.tar.gz linux-stable-77ac7b25a80e7a303c803230cc1595d976bfd1ae.tar.bz2 linux-stable-77ac7b25a80e7a303c803230cc1595d976bfd1ae.zip | |
soc: qcom: geni: shield geni_icc_get() for ACPI boot
[ Upstream commit 0c9fdcdba68208270ae85d39600ea97da1718344 ]
Currently, GENI devices like i2c-qcom-geni fails to probe in ACPI boot,
if interconnect support is enabled. That's because interconnect driver
only supports DT right now. As interconnect is not necessarily required
for basic function of GENI devices, let's shield geni_icc_get() call,
and then all other ICC calls become nop due to NULL icc_path, so that
GENI devices keep working for ACPI boot.
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Link: https://lore.kernel.org/r/20210114112928.11368-1-shawn.guo@linaro.org
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/soc/qcom/qcom-geni-se.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/soc/qcom/qcom-geni-se.c b/drivers/soc/qcom/qcom-geni-se.c index 1fd29f93ff6d..5bdfb1565c14 100644 --- a/drivers/soc/qcom/qcom-geni-se.c +++ b/drivers/soc/qcom/qcom-geni-se.c @@ -756,6 +756,9 @@ int geni_icc_get(struct geni_se *se, const char *icc_ddr) int i, err; const char *icc_names[] = {"qup-core", "qup-config", icc_ddr}; + if (has_acpi_companion(se->dev)) + return 0; + for (i = 0; i < ARRAY_SIZE(se->icc_paths); i++) { if (!icc_names[i]) continue; |