From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6C85C43470 for ; Mon, 19 Apr 2021 20:45:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 89060613EA for ; Mon, 19 Apr 2021 20:45:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242799AbhDSUph (ORCPT ); Mon, 19 Apr 2021 16:45:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:54402 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242616AbhDSUpB (ORCPT ); Mon, 19 Apr 2021 16:45:01 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4E4AE61369; Mon, 19 Apr 2021 20:44:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1618865068; bh=P20kHEYm4uUCgh052ecN3NDKkwWJw8kGBA9GgpWC6HE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PeuAInFTSKpJb1tYpdbwDvD2Uk5wQfpBC0lU9yLapUdaHCTeyBAOlHAI+m/J0wOsN 2jXnLkCnvnAO9wcS1xcbjTD0YkjKRi4ZzH9BCpQYeaREODAhVPyGhqu2Pr5Q3rAhQe fZbfFi73xdXW/8SZVU+N7kzMo3QKqJHQqTCVLJo2aFoCWuGVe+N6d5IjravvHCkjOZ QUYo4sW3wmPV0ZjLTptEIf5mPkuVenFs/L9GLv9/BsKymfEqOrlAFkL47dmEiZqE9N boJCvo3GHiiDiqMF0U7QgE6s6ReY25J/aWWVLeQ+Ki22IbDXjUJE3CGo8xSYamQJxs J3Qzm602jNFgA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Shawn Guo , Bjorn Andersson , Sasha Levin , linux-arm-msm@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 05/21] soc: qcom: geni: shield geni_icc_get() for ACPI boot Date: Mon, 19 Apr 2021 16:44:03 -0400 Message-Id: <20210419204420.6375-5-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210419204420.6375-1-sashal@kernel.org> References: <20210419204420.6375-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Shawn Guo [ 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 Signed-off-by: Shawn Guo Link: https://lore.kernel.org/r/20210114112928.11368-1-shawn.guo@linaro.org Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- drivers/soc/qcom/qcom-geni-se.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/soc/qcom/qcom-geni-se.c b/drivers/soc/qcom/qcom-geni-se.c index be76fddbf524..0dbca679bd32 100644 --- a/drivers/soc/qcom/qcom-geni-se.c +++ b/drivers/soc/qcom/qcom-geni-se.c @@ -741,6 +741,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; -- 2.30.2