Commit 0c9fdcdb authored by Shawn Guo's avatar Shawn Guo Committed by Bjorn Andersson

soc: qcom: geni: shield geni_icc_get() for ACPI boot

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: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Link: https://lore.kernel.org/r/20210114112928.11368-1-shawn.guo@linaro.orgSigned-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent a38fd874
...@@ -760,6 +760,9 @@ int geni_icc_get(struct geni_se *se, const char *icc_ddr) ...@@ -760,6 +760,9 @@ int geni_icc_get(struct geni_se *se, const char *icc_ddr)
int i, err; int i, err;
const char *icc_names[] = {"qup-core", "qup-config", icc_ddr}; 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++) { for (i = 0; i < ARRAY_SIZE(se->icc_paths); i++) {
if (!icc_names[i]) if (!icc_names[i])
continue; continue;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment