From patchwork Sat Dec 10 20:03:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 633011 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CD22EC4332F for ; Sat, 10 Dec 2022 20:04:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229728AbiLJUEI (ORCPT ); Sat, 10 Dec 2022 15:04:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41138 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229704AbiLJUEH (ORCPT ); Sat, 10 Dec 2022 15:04:07 -0500 Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 83D9A13F6D for ; Sat, 10 Dec 2022 12:04:06 -0800 (PST) Received: by mail-lf1-x12b.google.com with SMTP id b3so12252956lfv.2 for ; Sat, 10 Dec 2022 12:04:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OBRVlbrqRCLQh/hPYQMZj1j2VXHf/Xbb2WuXE+iQo4s=; b=OVMoskt21DvWG921R245YlH5xYu83EndxKpsNu/6SOS9yo9CCQi3wHGEMVYI5vTed0 puCgJbz0X7tScfYkgR20KfO/Yf0tb6IPESJb0xLtaGV1h92nKfnLMVhZnMoTJn9JScJd QXPvZMXHQbdT0Im2MBVxm7UWsaov7Jg2ehM6yHAt+huRWeQTnBIOYyqaKGh9m5PI6zQ+ kmn/6S5tg/Y/CAcKgkab9HEuM6tdkeBm2ZP+VhshFUwNm+gZj+n3NivgcaJdcqihkLFx ihlptI/KB3kl6Ohr0MEeVUKX7ZRE7+KyI6OHmhK5mr9Ngd6UmjqYonEVx8qgbmJyyYFi RtSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OBRVlbrqRCLQh/hPYQMZj1j2VXHf/Xbb2WuXE+iQo4s=; b=44WnOKPKThx+0XzNtsZABufIFygxJE1fqa9ahRwn7BnSADAxfE00iXDBXpQmHWTvAx PB2cZVYOJeFmi3UojIn9TJgIBNnyf4EjLCQwOs4gwzCji7htXh79bgTqP5cPX+4bepcD wO57abjT9mq6gicN9LXHdAJpgRDO7R77cE+Js45MSbvmbHNXnYh2XQA2xWpQzuT6exSK FtBrSFBOd8eCak0137Dc5CcQWzzeL3Oek1cQJdPb7dmYTZjHn8mi83KByO54Jjz6+hQl e4tTWMUMxxppslDjbXj175PeOOSdhkJCVIPSbEq2yUuFgFyyVJAQgWe5UGHLFX9psjEB 3YUg== X-Gm-Message-State: ANoB5pl14Y9SQ4J/ECVTqC7joWWGsQ7CQ1KstkYomWrlWqqa6y+2j2N9 LkKRK7AVetNm77W93fCD0liQew== X-Google-Smtp-Source: AA0mqf6Ms8jSQh1Mioo+UobLsSKiXCn3pnnxKj/xfyKNT6+AHp7ldUSx1xBzJkF2v+xrCd+Z7OkHpA== X-Received: by 2002:a05:6512:340c:b0:4b6:e22f:51a6 with SMTP id i12-20020a056512340c00b004b6e22f51a6mr529683lfr.53.1670702644949; Sat, 10 Dec 2022 12:04:04 -0800 (PST) Received: from localhost.localdomain (abxh44.neoplus.adsl.tpnet.pl. [83.9.1.44]) by smtp.gmail.com with ESMTPSA id h28-20020ac2597c000000b004b4f1ea713csm839628lfp.73.2022.12.10.12.04.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Dec 2022 12:04:04 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: marijn.suijten@somainline.org, Konrad Dybcio , Georgi Djakov , Rob Herring , Krzysztof Kozlowski , linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/5] dt-bindings: interconnect: Add UFS clocks to MSM8996 A2NoC Date: Sat, 10 Dec 2022 21:03:49 +0100 Message-Id: <20221210200353.418391-2-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221210200353.418391-1-konrad.dybcio@linaro.org> References: <20221210200353.418391-1-konrad.dybcio@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org MSM8996 A2NoC contains a UFS master, which means the UFS hardware is accessed every time sync_state is called within the interconnect framework. It's all good on devices where this clock is already enabled (most likely from the bootloader), but devices with eMMC storage are rather unlikely to have it like that. Add the missing 2 clocks to the binding. Signed-off-by: Konrad Dybcio Acked-by: Krzysztof Kozlowski --- .../bindings/interconnect/qcom,rpm.yaml | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml b/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml index 4b37aa88a375..5e6be4e79201 100644 --- a/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml +++ b/Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml @@ -84,7 +84,6 @@ allOf: - qcom,msm8939-pcnoc - qcom,msm8939-snoc - qcom,msm8996-a1noc - - qcom,msm8996-a2noc - qcom,msm8996-bimc - qcom,msm8996-cnoc - qcom,msm8996-pnoc @@ -186,6 +185,29 @@ allOf: required: - power-domains + - if: + properties: + compatible: + contains: + enum: + - qcom,msm8996-a2noc + + then: + properties: + clock-names: + items: + - const: bus + - const: bus_a + - const: aggre2_ufs_axi + - const: ufs_axi + + clocks: + items: + - description: Bus Clock + - description: Bus A Clock + - description: Aggregate2 NoC UFS AXI Clock + - description: UFS AXI Clock + - if: properties: compatible: From patchwork Sat Dec 10 20:03:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 633163 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 279D5C10F1B for ; Sat, 10 Dec 2022 20:04:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229875AbiLJUEM (ORCPT ); Sat, 10 Dec 2022 15:04:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229538AbiLJUEL (ORCPT ); Sat, 10 Dec 2022 15:04:11 -0500 Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D59C713F6D for ; Sat, 10 Dec 2022 12:04:08 -0800 (PST) Received: by mail-lf1-x133.google.com with SMTP id c1so12244308lfi.7 for ; Sat, 10 Dec 2022 12:04:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xDt+cVjkMFpQCr4WbA0njzIJ8/m0OvNyfOzyjmNYhSc=; b=cbdwYWpTVw/hWlTtSfZCil7N39WfC6Re7YQhOq8oVz4Wgsdfk1RJ+g/mY+MmANfWFM q4tzxHGHwDwr14gOPiMZ871Upc/blWpRVMZtOLHEpeo2h7lbqkl2tUwZepD/OB06f5dV k7cB8jMOMdh5pqEqmplIEYVWKCqTCUHTrOKfa2wwxIbvTKUO5R8TAhGf2shaMiG0wOZg OvybJUYi7HcIZUOE+qA0VVr+VwFf5Up49lY+4QyfSy/sWOet7OmynllwyYwtgSoUg3zx 6xubhTJmuQ7+Pj5OIrM0ar9FBGTMzBPLQtk31sp1HChXFvrM1qRl9pr2QaqXTmry9fuh fc+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xDt+cVjkMFpQCr4WbA0njzIJ8/m0OvNyfOzyjmNYhSc=; b=z/LrngoBDmXfc9TuYTCQlWUVUXDQFpTs6aUONz3/8H6dHTpCieTOt/6ZuutVuCnBvO C/pJ1YRHcjkZQBPlh/HH2j5bi1lZgRcfwtH5g6LbyIKgpKFQO/yqdOBfSn4qqYH3U+NJ Lxz1xcoLRTFE4fCpc8nHVjv/V2G0+kwu8yNBlTioX5jH0AfrfmNn0a8Fvrsc2WrhtnAd i6eguOz8tjwpIMGzYhUDWQgsKGOmmyR5pJUW2yLY9lI7BHlZMs5RlKQ/jicHAd2Y3ARs UGFZbImjuRqwgnbnwWjyFC4i+k9rHnG74HW4mhB4KtYrMPQ4rmtOgChZPfUavlXVbXUY tZUQ== X-Gm-Message-State: ANoB5pkoxvHnY81zwqvdUycRWFkpOjKCVmJY1JslljhcVJ0cAA+WkGHy IumG1V3RnSshC8svfr2okEuPjg== X-Google-Smtp-Source: AA0mqf5BUQoh8b2MIwiE5BPUaBEMPZLOJBADts9iy8539ZTFXtXwgTMR9dRsdxcdtCSN2rk/z/XGBQ== X-Received: by 2002:ac2:5a1d:0:b0:4a7:9e45:4cd0 with SMTP id q29-20020ac25a1d000000b004a79e454cd0mr2801113lfn.13.1670702647248; Sat, 10 Dec 2022 12:04:07 -0800 (PST) Received: from localhost.localdomain (abxh44.neoplus.adsl.tpnet.pl. [83.9.1.44]) by smtp.gmail.com with ESMTPSA id h28-20020ac2597c000000b004b4f1ea713csm839628lfp.73.2022.12.10.12.04.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Dec 2022 12:04:06 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: marijn.suijten@somainline.org, Konrad Dybcio , Georgi Djakov , Yassine Oudjana , Dmitry Baryshkov , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/5] interconnect: qcom: msm8996: Provide UFS clocks to A2NoC Date: Sat, 10 Dec 2022 21:03:50 +0100 Message-Id: <20221210200353.418391-3-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221210200353.418391-1-konrad.dybcio@linaro.org> References: <20221210200353.418391-1-konrad.dybcio@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org On eMMC devices the bootloader has no business enabling UFS clocks. That results in a platform hang and hard reboot when trying to vote on paths including MASTER_UFS and since sync_state guarantees that it's done at boot time, this effectively prevents such devices from booting. Fix that. Fixes: 7add937f5222 ("interconnect: qcom: Add MSM8996 interconnect provider driver") Signed-off-by: Konrad Dybcio Reviewed-by: Dmitry Baryshkov --- drivers/interconnect/qcom/msm8996.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/interconnect/qcom/msm8996.c b/drivers/interconnect/qcom/msm8996.c index c2903ae3b3bc..7ddb1f23fb2a 100644 --- a/drivers/interconnect/qcom/msm8996.c +++ b/drivers/interconnect/qcom/msm8996.c @@ -33,6 +33,13 @@ static const char * const bus_a0noc_clocks[] = { "aggre0_noc_mpu_cfg" }; +static const char * const bus_a2noc_clocks[] = { + "bus", + "bus_a", + "aggre2_ufs_axi", + "ufs_axi" +}; + static const u16 mas_a0noc_common_links[] = { MSM8996_SLAVE_A0NOC_SNOC }; @@ -1859,6 +1866,8 @@ static const struct qcom_icc_desc msm8996_a2noc = { .type = QCOM_ICC_NOC, .nodes = a2noc_nodes, .num_nodes = ARRAY_SIZE(a2noc_nodes), + .clocks = bus_a2noc_clocks, + .num_clocks = ARRAY_SIZE(bus_a2noc_clocks), .regmap_cfg = &msm8996_a2noc_regmap_config }; From patchwork Sat Dec 10 20:03:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 633010 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 57DB7C4332F for ; Sat, 10 Dec 2022 20:04:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229894AbiLJUEP (ORCPT ); Sat, 10 Dec 2022 15:04:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41192 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229845AbiLJUEM (ORCPT ); Sat, 10 Dec 2022 15:04:12 -0500 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 729991401F for ; Sat, 10 Dec 2022 12:04:11 -0800 (PST) Received: by mail-lf1-x136.google.com with SMTP id p36so12214022lfa.12 for ; Sat, 10 Dec 2022 12:04:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=F70X0h1gEhZbNZjzSbofbLgELtxej/JOcL3nmVN4Az4=; b=VnlJ64RRCWzDKIto7yzRZOPNx02NENlNPq+D7IcdtNHcHY6i9XFs003Bpn5i8F/q+0 TBcBTDmPgKBgwHNMs7oZrwj2VWOwecYuinfcarY8ODviqBW/O8NrGC7i96YZ9iUEr0uX DDcSpxRSdoailKGYOr8RckqaPjr52R6BJnk2PL2M2LW7mqTBtusEAHxIRda99LNVMDlk UjOf2eWMxp2RzvGobCtt1Rox78AFINvtPTP3Mj7rb+GOmjXRHR/84b123FWRV0aohhKu qHkRusMEJSHtYRAl57u28hImiZlolPs9ZN6MATKNQLnEHn+mZunLZUTgs7cmv6n5kcPn nbig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=F70X0h1gEhZbNZjzSbofbLgELtxej/JOcL3nmVN4Az4=; b=ISYZE62R71A+l7yozYryl9IOtTPro+P7bxD5x89hvuKS3+WvEL2KzuRF2+BxfXmyb6 EBIs8/21gZH5btYgmG1877gUBDvLx62Qed/E2lHRs/NGaYT8s6vUwJzniiqiFkiTaFX/ Pxfv4+glZBgQL7YnfozBoH6vjUTRPqv+WLrTkE1iGNp0w3O12xTxJrpzjBSui7RVN26N T5YQl6Ssxx+iwnlqGmdURsx2HMscRm9q1V1/T1W9dh2Yz0Jbd/PcPFXEg0dkeis9K6YE W2wywn2Bjs3ugRIZ1VGZe4x2cDVc84gnqp5YILsTAz6aDC2lRMEbEKx3SVBuySjt4AMv WKbQ== X-Gm-Message-State: ANoB5pljHLb+ZXlEVL90Re/otEGA9G4w5hkomcTaRoLECim2xAC3xgrU 3Z2qtCFg8jen+c8l4YJWgoK/A7c8M/T7AKRP X-Google-Smtp-Source: AA0mqf5mAtCFFr/GyhSpnySoX+FDSDVDj5vpOdKDW367vkMF/OGGYBjTaogxp2x56jTmWRYlFm/r0g== X-Received: by 2002:a05:6512:32ce:b0:4a4:8044:9b8 with SMTP id f14-20020a05651232ce00b004a4804409b8mr3063830lfg.9.1670702649853; Sat, 10 Dec 2022 12:04:09 -0800 (PST) Received: from localhost.localdomain (abxh44.neoplus.adsl.tpnet.pl. [83.9.1.44]) by smtp.gmail.com with ESMTPSA id h28-20020ac2597c000000b004b4f1ea713csm839628lfp.73.2022.12.10.12.04.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Dec 2022 12:04:09 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: marijn.suijten@somainline.org, Konrad Dybcio , Georgi Djakov , Dmitry Baryshkov , Yassine Oudjana , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/5] interconnect: qcom: msm8996: Fix regmap max_register values Date: Sat, 10 Dec 2022 21:03:51 +0100 Message-Id: <20221210200353.418391-4-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221210200353.418391-1-konrad.dybcio@linaro.org> References: <20221210200353.418391-1-konrad.dybcio@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org The device tree reg starts at BUS_BASE + QoS_OFFSET, but the regmap configs in the ICC driver had values suggesting the reg started at BUS_BASE. Shrink them down (where they haven't been already, so for providers where QoS_OFFSET = 0) to make sure they stay within their window. Fixes: 7add937f5222 ("interconnect: qcom: Add MSM8996 interconnect provider driver") Signed-off-by: Konrad Dybcio Reviewed-by: Dmitry Baryshkov --- drivers/interconnect/qcom/msm8996.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/interconnect/qcom/msm8996.c b/drivers/interconnect/qcom/msm8996.c index 7ddb1f23fb2a..25a1a32bc611 100644 --- a/drivers/interconnect/qcom/msm8996.c +++ b/drivers/interconnect/qcom/msm8996.c @@ -1813,7 +1813,7 @@ static const struct regmap_config msm8996_a0noc_regmap_config = { .reg_bits = 32, .reg_stride = 4, .val_bits = 32, - .max_register = 0x9000, + .max_register = 0x6000, .fast_io = true }; @@ -1837,7 +1837,7 @@ static const struct regmap_config msm8996_a1noc_regmap_config = { .reg_bits = 32, .reg_stride = 4, .val_bits = 32, - .max_register = 0x7000, + .max_register = 0x5000, .fast_io = true }; @@ -1858,7 +1858,7 @@ static const struct regmap_config msm8996_a2noc_regmap_config = { .reg_bits = 32, .reg_stride = 4, .val_bits = 32, - .max_register = 0xa000, + .max_register = 0x7000, .fast_io = true }; @@ -1886,7 +1886,7 @@ static const struct regmap_config msm8996_bimc_regmap_config = { .reg_bits = 32, .reg_stride = 4, .val_bits = 32, - .max_register = 0x62000, + .max_register = 0x5a000, .fast_io = true }; @@ -1997,7 +1997,7 @@ static const struct regmap_config msm8996_mnoc_regmap_config = { .reg_bits = 32, .reg_stride = 4, .val_bits = 32, - .max_register = 0x20000, + .max_register = 0x1c000, .fast_io = true }; From patchwork Sat Dec 10 20:03:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 633162 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CE548C10F1E for ; Sat, 10 Dec 2022 20:04:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229845AbiLJUER (ORCPT ); Sat, 10 Dec 2022 15:04:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41234 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229896AbiLJUEP (ORCPT ); Sat, 10 Dec 2022 15:04:15 -0500 Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4DB414028 for ; Sat, 10 Dec 2022 12:04:14 -0800 (PST) Received: by mail-lf1-x131.google.com with SMTP id bp15so12199711lfb.13 for ; Sat, 10 Dec 2022 12:04:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Xj0jB4AhzYQNXspmImuMXL7HzHFtFIdHtKGTYSzQnq0=; b=q3LIslAF2wRgh8DspOIqNEL5gxAzBjGzT1d0OFAjbzlOaSF6aIcUPKMgV6CNdRTYjT BPyhBbUunkkujEuf24tjFN2s0DyYsbiyUuWTIkJPg89nduDRd43gnPE77ozTe1n2AILd nFj4xP3Fqfyc/kK+EpUbBwP8ZPCi3yBZ/NMBMxcJGtSjNDODRSoj6/h+hFobDpnyNkhU iRcPyHpd+nyjT5hyqqplBO5HJd8CJKw+76tvmYgKLlmqZY6KKZLFj91bZYOz7yzxnzQm dhTNd8UUnewDyt8ns8Z8jMVro9FXj/+bcXyTUriQjoSRaTz2XC3Eh10/fU4R6PPLON4o vRYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Xj0jB4AhzYQNXspmImuMXL7HzHFtFIdHtKGTYSzQnq0=; b=WhgYwdsp3pVLL3dU0QiOkPZEtDGF3/RQ186RlBdZGDuropHn0Ygdvkb/z3815BNWVD iGBX0/BHZz0jrXZ3ZbIELVIZC9AVAs1+n/ZyTyWqcN3bbRycmNR0z6RlRjaGfY3TBTds aCym91ybDaYdCc1o0XFLs2pCvnBpqq6y+m5AwqzPSgmAP0wpF3Icv7Pa+NrwoMDf0J65 PVp2vILbhWFy1vBQU56/NCmN2HDK9YyGZIZzDV9AyoxDBIwjgfIRrgMkdD3nNFKZinSy WievBqR0H/L0E36cGPqRIgqOSmmvPHFOw+IAbNGhc2r5quig+KsQS9lsarRF96Pkzpdg 4wVQ== X-Gm-Message-State: ANoB5plhU5vc086xYGzuULNlSr253lZrWT60Au7GcR1N/m8vjW7l7Qq0 PWyAyJ16S+s/4kpsRkME56qp2Q== X-Google-Smtp-Source: AA0mqf5CwtJnVoK36NyIewNyGgUXoqk+uTWRK6Y9C1vqharCIFeloboLPZDqe2xMfIgQsedQVJ2o+w== X-Received: by 2002:a05:6512:3d0e:b0:4b5:9043:2530 with SMTP id d14-20020a0565123d0e00b004b590432530mr4008272lfv.68.1670702653080; Sat, 10 Dec 2022 12:04:13 -0800 (PST) Received: from localhost.localdomain (abxh44.neoplus.adsl.tpnet.pl. [83.9.1.44]) by smtp.gmail.com with ESMTPSA id h28-20020ac2597c000000b004b4f1ea713csm839628lfp.73.2022.12.10.12.04.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Dec 2022 12:04:12 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: marijn.suijten@somainline.org, Konrad Dybcio , Georgi Djakov , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/5] interconnect: qcom: rpm: Use _optional func for provider clocks Date: Sat, 10 Dec 2022 21:03:52 +0100 Message-Id: <20221210200353.418391-5-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221210200353.418391-1-konrad.dybcio@linaro.org> References: <20221210200353.418391-1-konrad.dybcio@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org It turned out that - very unfortunately - msm8996 needs a binding update, adding 2 more clocks to the A2NoC node. Use the _optional variant of devm_clk_get to make sure old DTs will still probe with newer versions of the driver. Signed-off-by: Konrad Dybcio Reviewed-by: Dmitry Baryshkov --- 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 ba6781f54ab7..df3196f72536 100644 --- a/drivers/interconnect/qcom/icc-rpm.c +++ b/drivers/interconnect/qcom/icc-rpm.c @@ -488,7 +488,7 @@ int qnoc_probe(struct platform_device *pdev) } regmap_done: - ret = devm_clk_bulk_get(dev, qp->num_clks, qp->bus_clks); + ret = devm_clk_bulk_get_optional(dev, qp->num_clks, qp->bus_clks); if (ret) return ret;