From patchwork Fri Apr 7 20:14:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 81018 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp508253vqo; Fri, 7 Apr 2023 13:17:33 -0700 (PDT) X-Google-Smtp-Source: AKy350atORPSod0pFwT83UPMtVJHcQnX1VGdNhAp83j+t4/dCjlniruoy5XhSgqxMK/KU0rkYQBu X-Received: by 2002:a17:907:2c45:b0:931:d644:b9d3 with SMTP id hf5-20020a1709072c4500b00931d644b9d3mr556696ejc.59.1680898653061; Fri, 07 Apr 2023 13:17:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680898653; cv=none; d=google.com; s=arc-20160816; b=izVcOL/+4RFKEYkuWfb8HA2pPh1DzNEY1qK4LIgJdNkjqBS5O4WBFGJlb1uuOAJBZz r8+NhYaZlfP14sokv+vLDbV7YuvOXMEWnowWepVo18cgxZxLP9+mZJbe7eCt4LaAoygn +QvigMPPFc0Zx4h8Q8ubA8zusdXxZErwYWk3xAO3YTLb0cNA3bSrJz77fuEbhVbHaXJg pAHrXJ7uvEf2Rr4fRKf2CQlEi5rAE7ZHWPCoUJuRrrtzRXbHg7qDifvFBP8sbELhcog7 +fyQTyZna1AEcwTwIj924CPLRd+KxTJsFAX0aacKK5JB6W+Dih0XV5XC1BI+j+R26A4V s/SQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=JmxVQOr0UERcZ1YMRZsASK3EItYYsfIdBLZTNEGU6JM=; b=NMHv4xGlcJu4L1iezLqlVAMLyCAf0BhGwSLRRDeQlHfCw/1B1U64B+HLKndzi5Y6oM OKaIPjlACBZlePqwokhWDlDE2BqD7oiiFhOCijnhOIDaHpKtIfBqnyykSTYsExCruVwp J+Q1Yb54Xu2jT3/idgI5pl9dBCr3baOkq2t4K6xKL8cqG9SJN7kcxJFIaBXSlmmcnM2o fqS2yXW7Jr8HnPWeaj8FJ5fs6h6yKLHw7YYLFkEZLu8sbraD90jmnYfytvUzGJRa/gk8 0BOekZxDGKjebjr46QVaow5eYRQLIXvKGkuaG0OAvlAWejmmQBJm+hlL2YAfBhRBDwtl nFDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="TS8/QvzE"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lu10-20020a170906faca00b0093f3027f7c8si4202857ejb.802.2023.04.07.13.17.09; Fri, 07 Apr 2023 13:17:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="TS8/QvzE"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230150AbjDGUP1 (ORCPT + 99 others); Fri, 7 Apr 2023 16:15:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38700 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230092AbjDGUPM (ORCPT ); Fri, 7 Apr 2023 16:15:12 -0400 Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CBA6AC67B for ; Fri, 7 Apr 2023 13:14:56 -0700 (PDT) Received: by mail-lf1-x12a.google.com with SMTP id h25so55713702lfv.6 for ; Fri, 07 Apr 2023 13:14:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680898495; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=JmxVQOr0UERcZ1YMRZsASK3EItYYsfIdBLZTNEGU6JM=; b=TS8/QvzEVoiAydjEqS6eJXS9sWglXo50esu9QCI7gS7JP4MWoc3Wu/G+seMqtUy5sA 9BdKLgLAmu4Pzch+SbNpRW6sORsloB20w1juxxbrCncxb0/R+JbkkwwEo19uvOLJg2UL tWuevGu2VWU/xw268YcUZDHr4BxXgGEScQTw9FfUY9XwFmN1JdvmBPbKv6KNl6FKgj5V QR2Pnt0W8FyHoIuUigpEkSR1lPmMgMm+KyGhRuR+N9worgahzeX0VlyCZp/guGpEwjVc t1HxEBz9Ya5UO+oxGdOUmjhNrkmJoUM21bpqgLXA4YSLJ3lxVrrEWzqzAiL9kBr5WoIL Wi2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680898495; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JmxVQOr0UERcZ1YMRZsASK3EItYYsfIdBLZTNEGU6JM=; b=gnxWXN2186BcjMZuJoHw7rxNXmbp4owWM2y3RSRMSwR7eeynLxK04FzOORygC7Sdvr t/ozMf35tjVYRoqxJEUa1YC6vzmsUVc+NXqR3WUa6nANZve2QUh4Hh2oPcbKeS5N006U VZC99xRTKkIsfixCwApfMhoImMYVSBRiU8TeXbEF71wOSpj/IzZCjhNm595SDq8xZf8B hUmNg2ztfP7KaPUtaYZhjmm6GMEkoshMzjuC7rWCk5iBkMohWRwS2Pxg7mGIP2IyycFx aJRnF9A4Z0UqTa4virtIuGGbaypyBaJjdpxcctT3qvn29L/Dk/t3BZEbPTeFoQR5n6Zm 16lw== X-Gm-Message-State: AAQBX9dC/eGpC9X48gom7w4djLmBqWWo52SbSBjStPYHR4qWXnk/61EO B8+5O4Hsi2vcQTeGReU105rXkA== X-Received: by 2002:a19:ac09:0:b0:4ea:f69a:de37 with SMTP id g9-20020a19ac09000000b004eaf69ade37mr938788lfc.42.1680898495005; Fri, 07 Apr 2023 13:14:55 -0700 (PDT) Received: from [192.168.1.101] (abxh37.neoplus.adsl.tpnet.pl. [83.9.1.37]) by smtp.gmail.com with ESMTPSA id u3-20020ac243c3000000b004eaf6181a32sm842436lfl.75.2023.04.07.13.14.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Apr 2023 13:14:54 -0700 (PDT) From: Konrad Dybcio Date: Fri, 07 Apr 2023 22:14:49 +0200 Subject: [PATCH v8 7/8] interconnect: qcom: rpm: Don't use clk_get_optional for bus clocks anymore MIME-Version: 1.0 Message-Id: <20230228-topic-qos-v8-7-ee696a2c15a9@linaro.org> References: <20230228-topic-qos-v8-0-ee696a2c15a9@linaro.org> In-Reply-To: <20230228-topic-qos-v8-0-ee696a2c15a9@linaro.org> To: Andy Gross , Bjorn Andersson , Georgi Djakov , Dmitry Baryshkov Cc: Bryan O'Donoghue , linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio , Marijn Suijten X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1680898484; l=1105; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=ntGrIMziVYgfLiYwCKCTYabEq/yl5ewVMN3vP4/MQz8=; b=yfoAQc12tdXVQVdF6BOEuXj1J5vomOdNVpPVKYFlfaqUid1lCYeXUIaJE/6idY0Vg0osvkV6wzMQ PD95zQvvBAALR9xRzuU80Cy8R87AVhOySBmjYUso70sFcN1gLUIg X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762549986046175666?= X-GMAIL-MSGID: =?utf-8?q?1762549986046175666?= Commit dd42ec8ea5b9 ("interconnect: qcom: rpm: Use _optional func for provider clocks") relaxed the requirements around probing bus clocks. This was a decent solution for making sure MSM8996 would still boot with old DTs, but now that there's a proper fix in place that both old and new DTs will be happy about, revert back to the safer variant of the function. Fixes: dd42ec8ea5b9 ("interconnect: qcom: rpm: Use _optional func for provider clocks") Signed-off-by: Konrad Dybcio --- drivers/interconnect/qcom/icc-rpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/interconnect/qcom/icc-rpm.c b/drivers/interconnect/qcom/icc-rpm.c index 2298eb019534..8c1beae13860 100644 --- a/drivers/interconnect/qcom/icc-rpm.c +++ b/drivers/interconnect/qcom/icc-rpm.c @@ -481,7 +481,7 @@ int qnoc_probe(struct platform_device *pdev) } regmap_done: - ret = devm_clk_bulk_get_optional(dev, qp->num_bus_clks, qp->bus_clks); + ret = devm_clk_bulk_get(dev, qp->num_bus_clks, qp->bus_clks); if (ret) return ret;