Skip to content

Commit 0c9fdcd

Browse files
Shawn Guoandersson
authored andcommitted
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: 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>
1 parent a38fd87 commit 0c9fdcd

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

drivers/soc/qcom/qcom-geni-se.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -760,6 +760,9 @@ int geni_icc_get(struct geni_se *se, const char *icc_ddr)
760760
int i, err;
761761
const char *icc_names[] = {"qup-core", "qup-config", icc_ddr};
762762

763+
if (has_acpi_companion(se->dev))
764+
return 0;
765+
763766
for (i = 0; i < ARRAY_SIZE(se->icc_paths); i++) {
764767
if (!icc_names[i])
765768
continue;

0 commit comments

Comments
 (0)