From patchwork Fri Apr 14 11:26:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 673426 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 8B3A2C77B77 for ; Fri, 14 Apr 2023 11:26:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229996AbjDNL0T (ORCPT ); Fri, 14 Apr 2023 07:26:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56496 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230046AbjDNL0R (ORCPT ); Fri, 14 Apr 2023 07:26:17 -0400 Received: from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com [IPv6:2a00:1450:4864:20::22a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC81C7D94 for ; Fri, 14 Apr 2023 04:26:13 -0700 (PDT) Received: by mail-lj1-x22a.google.com with SMTP id a29so19297358ljq.0 for ; Fri, 14 Apr 2023 04:26:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681471572; x=1684063572; 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=hZACr2qT1r+Pq/JG1rFFm+OjlMblwToTQZN+UEc9YSE=; b=YLnQYGCJFK1sjLKyNQ3cuARkxKXbepwbwtmbk6Oo/go3HDUl2YF1+mnWdBNd1NKgkT LsGxhTuYvED38/uLsGvXOX4CqmaairbS10svzUdBeY5cc6C4/p53Nt5XPJLxquAkoNGI nJeBcH7ndpb+f6xcQvVQjlWt6rVXxTE3JuIRvO/yWDjIDPbotvSz/ZoTHC+NTKq3H+cv BhMslCfWXY2i1U+jnjj1AL71PRvODqoAKqAIvOGksN9j9GSzJGvwLIKwP1KXEqfOXBeG grVfTdsAMSSe4oc5LCUxf8RABsiS7Y2Zt7/tWy+qzOnyke8tJ66U/DoAM2AL/ziBSaSJ FUpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681471572; x=1684063572; 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=hZACr2qT1r+Pq/JG1rFFm+OjlMblwToTQZN+UEc9YSE=; b=a5hayxDZo3mCA6M0Re5KHHnYdy/4scozVqHAjVuyY0xUV8zkrCk002KXWam2YaCgXH J3tIcSbBnHLpXgYtj/Yqd6WKDxRLDIOUqgzGdFRqvJGbAY78n0RhL9ilm+c+9NLek32r fjquNPdMGV+kVO3tOENtYovXbpcPaQ9WhJBVGXPu3gFwLR4ApEsmVRJs+p/eVhia5Mg5 y0LosAMPLmLlAdMvzG9voBYSMk/TLQpLwcVlhlTh1g8qSo2OXaIb9aV1yMPdTdWz4Wc3 ib8xA+DpLDUmMJNX/Q3Gx9zIQUPexml0neR3dp9ythi3oTzEmdcpSifcgEK4T1QCIYR3 FdBg== X-Gm-Message-State: AAQBX9eTyweg+wCrQdbaZU3QtRGOJrmEaQl44l6bWcm4KLlmI0a7gjp6 rQXhjdha5rTOrlplJdrTs8dINg== X-Google-Smtp-Source: AKy350aP/+UPWzkbCS3EJKDnIrjBwYL8ESv1As/svYi+jJohuIuHiK7x28QNSm3RUICN4+G1fmht+Q== X-Received: by 2002:a2e:9d84:0:b0:295:d7a8:559b with SMTP id c4-20020a2e9d84000000b00295d7a8559bmr1615180ljj.10.1681471571922; Fri, 14 Apr 2023 04:26:11 -0700 (PDT) Received: from [192.168.1.101] (abyl123.neoplus.adsl.tpnet.pl. [83.9.31.123]) by smtp.gmail.com with ESMTPSA id f2-20020a19ae02000000b004ecb06acbb3sm738430lfc.281.2023.04.14.04.26.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Apr 2023 04:26:11 -0700 (PDT) From: Konrad Dybcio Date: Fri, 14 Apr 2023 13:26:08 +0200 Subject: [PATCH v2 1/2] dt-bindings: clock: qcom,videocc: Add SM8350 MIME-Version: 1.0 Message-Id: <20230413-topic-lahaina_vidcc-v2-1-f721d507e555@linaro.org> References: <20230413-topic-lahaina_vidcc-v2-0-f721d507e555@linaro.org> In-Reply-To: <20230413-topic-lahaina_vidcc-v2-0-f721d507e555@linaro.org> To: Bjorn Andersson , Andy Gross , Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Philipp Zabel , Taniya Das Cc: Marijn Suijten , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1681471569; l=4559; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=yDNgI5vaFDUinUfBBr+IuGY3i/nybTj/plx2VvRXMcU=; b=vV8EFqIf+B1ySfObURnPZtaBo/OlDkvqpZX27ubloRTsoJGr+N0Ng8rwMNamtZEWSJOPy4ITzFpR cyJ0ULJMDKcIlEfFlIf8OO9N/VkRMeKeJOggAYg0MdLkoDOMNByE X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org SM8350, like most recent higher-end chips has a separate clock controller block just for the Venus IP. Document it. Signed-off-by: Konrad Dybcio --- .../devicetree/bindings/clock/qcom,videocc.yaml | 29 +++++++++++++++++- include/dt-bindings/clock/qcom,sm8350-videocc.h | 35 ++++++++++++++++++++++ include/dt-bindings/reset/qcom,sm8350-videocc.h | 18 +++++++++++ 3 files changed, 81 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/clock/qcom,videocc.yaml b/Documentation/devicetree/bindings/clock/qcom,videocc.yaml index 2b07146161b4..6d892b0f2306 100644 --- a/Documentation/devicetree/bindings/clock/qcom,videocc.yaml +++ b/Documentation/devicetree/bindings/clock/qcom,videocc.yaml @@ -19,6 +19,8 @@ description: | include/dt-bindings/clock/qcom,videocc-sdm845.h include/dt-bindings/clock/qcom,videocc-sm8150.h include/dt-bindings/clock/qcom,videocc-sm8250.h + include/dt-bindings/clock/qcom,videocc-sm8350.h + include/dt-bindings/reset/qcom,videocc-sm8350.h properties: compatible: @@ -28,6 +30,7 @@ properties: - qcom,sdm845-videocc - qcom,sm8150-videocc - qcom,sm8250-videocc + - qcom,sm8350-videocc clocks: minItems: 1 @@ -63,7 +66,6 @@ required: - compatible - reg - clocks - - clock-names - '#clock-cells' - '#reset-cells' - '#power-domain-cells' @@ -85,6 +87,9 @@ allOf: items: - const: bi_tcxo + required: + - clock-names + - if: properties: compatible: @@ -101,6 +106,9 @@ allOf: - const: bi_tcxo - const: bi_tcxo_ao + required: + - clock-names + - if: properties: compatible: @@ -119,6 +127,25 @@ allOf: - const: bi_tcxo - const: bi_tcxo_ao + required: + - clock-names + + - if: + properties: + compatible: + enum: + - qcom,sm8350-videocc + then: + properties: + clocks: + items: + - description: Board XO source + - description: Board active XO source + - description: Board sleep clock + + required: + - power-domains + additionalProperties: false examples: diff --git a/include/dt-bindings/clock/qcom,sm8350-videocc.h b/include/dt-bindings/clock/qcom,sm8350-videocc.h new file mode 100644 index 000000000000..b6945a448676 --- /dev/null +++ b/include/dt-bindings/clock/qcom,sm8350-videocc.h @@ -0,0 +1,35 @@ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ +/* + * Copyright (c) 2019, The Linux Foundation. All rights reserved. + * Copyright (c) 2023, Linaro Limited + */ + +#ifndef _DT_BINDINGS_CLK_QCOM_VIDEO_CC_SM8350_H +#define _DT_BINDINGS_CLK_QCOM_VIDEO_CC_SM8350_H + +/* Clocks */ +#define VIDEO_CC_AHB_CLK_SRC 0 +#define VIDEO_CC_MVS0_CLK 1 +#define VIDEO_CC_MVS0_CLK_SRC 2 +#define VIDEO_CC_MVS0_DIV_CLK_SRC 3 +#define VIDEO_CC_MVS0C_CLK 4 +#define VIDEO_CC_MVS0C_DIV2_DIV_CLK_SRC 5 +#define VIDEO_CC_MVS1_CLK 6 +#define VIDEO_CC_MVS1_CLK_SRC 7 +#define VIDEO_CC_MVS1_DIV2_CLK 8 +#define VIDEO_CC_MVS1_DIV_CLK_SRC 9 +#define VIDEO_CC_MVS1C_CLK 10 +#define VIDEO_CC_MVS1C_DIV2_DIV_CLK_SRC 11 +#define VIDEO_CC_SLEEP_CLK 12 +#define VIDEO_CC_SLEEP_CLK_SRC 13 +#define VIDEO_CC_XO_CLK_SRC 14 +#define VIDEO_PLL0 15 +#define VIDEO_PLL1 16 + +/* GDSCs */ +#define MVS0C_GDSC 0 +#define MVS1C_GDSC 1 +#define MVS0_GDSC 2 +#define MVS1_GDSC 3 + +#endif diff --git a/include/dt-bindings/reset/qcom,sm8350-videocc.h b/include/dt-bindings/reset/qcom,sm8350-videocc.h new file mode 100644 index 000000000000..df7a808720ee --- /dev/null +++ b/include/dt-bindings/reset/qcom,sm8350-videocc.h @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ +/* + * Copyright (c) 2019, The Linux Foundation. All rights reserved. + * Copyright (c) 2023, Linaro Limited + */ + +#ifndef _DT_BINDINGS_RESET_QCOM_VIDEO_CC_SM8350_H +#define _DT_BINDINGS_RESET_QCOM_VIDEO_CC_SM8350_H + +#define CVP_VIDEO_CC_INTERFACE_BCR 0 +#define CVP_VIDEO_CC_MVS0_BCR 1 +#define VIDEO_CC_MVS0C_CLK_ARES 2 +#define CVP_VIDEO_CC_MVS0C_BCR 3 +#define CVP_VIDEO_CC_MVS1_BCR 4 +#define VIDEO_CC_MVS1C_CLK_ARES 5 +#define CVP_VIDEO_CC_MVS1C_BCR 6 + +#endif From patchwork Fri Apr 14 11:06:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 673427 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 6CE8BC77B76 for ; Fri, 14 Apr 2023 11:07:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230486AbjDNLHC (ORCPT ); Fri, 14 Apr 2023 07:07:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42056 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230361AbjDNLG7 (ORCPT ); Fri, 14 Apr 2023 07:06:59 -0400 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2B758A41 for ; Fri, 14 Apr 2023 04:06:47 -0700 (PDT) Received: by mail-lf1-x134.google.com with SMTP id u12so5168304lfu.5 for ; Fri, 14 Apr 2023 04:06:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681470406; x=1684062406; 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=T+BegmIBTVhKhfD7Ho/4urS4COPOO81dhsHGg9scGxg=; b=g5SRt2qS60TT+OthyGZDbd610efz79PA3ocDVEaVSAiUHGQhajClLWlRxA2GpHWSRI Cw9tu5buoFzgoMKKnKnsImCWi6rm1QfdVz/K67DdvUQBu1qX6EG89VajWvN7yM9NKpK+ 8v7zwGIU1GJW689hNf8BQIHGNO/1ElpaafFn+dvuMWJ9ejE90yaQXSSIP3kiyimeydqz Q2adtFPYMK8L6I+GnxzS5NjhN9YFcW1tMxynJ3SwKdZamQTUcUD2JZ1RLFoT2g4VSsF8 Ut3q30cqPYqlRWK4VSoe4q8YkqVpynk2NBtf9kMTSyTcxU2vg77EjEQjkZ7N7eZ9oZ5p sEFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681470406; x=1684062406; 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=T+BegmIBTVhKhfD7Ho/4urS4COPOO81dhsHGg9scGxg=; b=l2jhdzgYSB3q5loNj7HpdAt74Pwezkn3MiAo0j6uDB4gzQbxkowTeZYMaXPOVgWI4/ 6WFkR6BQLHgXdMYIY9p2eGBu6/oib3j28ZqEn8wiMHxPTtsBjP35ziD9pWPkflutZqAm xubuM1Zs60x73TOwDeSf5mq43twCaSmM8/wvJev5xC6sBK9aMcbULX4So5aLHF2qHZqN 62oZXD0sLl/KxP1xHAiomyIq2lSjH1J+CxPGU/NgaA5Qkg8+Dv6avqLFAWOBYN5Z2bYD sPvmxwnMdoJNTYutJmEu2dGpAb9ndPDWG1KlMq99/junTjDq1/J37LZqF6IlZ+0TWq0L rQXg== X-Gm-Message-State: AAQBX9eZzvagiDDrbuPt2y5Q9YClDIavXg0ow68196z5q/BaOm/Ixyyt a4WcqCYE6tz6XNVvuX/dLl8uAbh4eXcHAVq3yR4= X-Google-Smtp-Source: AKy350Y5RSfc0jxAz4V5H/b+H1oE/ntfZSqGOdGhrQtvd0IKywMq/ZbPezMiiV7I/vHZ8iTsV21lNQ== X-Received: by 2002:ac2:4893:0:b0:4ec:9c2e:7ee3 with SMTP id x19-20020ac24893000000b004ec9c2e7ee3mr1864801lfc.42.1681470406087; Fri, 14 Apr 2023 04:06:46 -0700 (PDT) Received: from [192.168.1.101] (abyl123.neoplus.adsl.tpnet.pl. [83.9.31.123]) by smtp.gmail.com with ESMTPSA id j18-20020ac24552000000b004eae672e96bsm751398lfm.255.2023.04.14.04.06.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Apr 2023 04:06:45 -0700 (PDT) From: Konrad Dybcio Date: Fri, 14 Apr 2023 13:06:36 +0200 Subject: [PATCH v2 2/2] clk: qcom: dispcc-qcm2290: Fix GPLL0_OUT_DIV handling MIME-Version: 1.0 Message-Id: <20230412-topic-qcm_dispcc-v2-2-bce7dd512fe4@linaro.org> References: <20230412-topic-qcm_dispcc-v2-0-bce7dd512fe4@linaro.org> In-Reply-To: <20230412-topic-qcm_dispcc-v2-0-bce7dd512fe4@linaro.org> To: Andy Gross , Bjorn Andersson , Michael Turquette , Stephen Boyd , Loic Poulain Cc: Marijn Suijten , linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1681470402; l=1630; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=Ot/NHrSbW9+5csK1UT6o/fdNmdPt0KfTHT6AeS2TI2I=; b=Iwup5TWH8WazTzIVIvw0JEF6tfjNqgQIirmSDcAM4ppmZOoCZu7eDYcqsSIJAMfqcxPpkJPRjy0C ASL/xmAbC+FDIH5KpOxE7bM+61Pm1zzKfrTv1gH6Xtk4+4wH4Foj X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org GPLL0_OUT_DIV (.fw_name = "gcc_disp_gpll0_div_clk_src") was previously made to reuse the same parent enum entry as GPLL0_OUT_MAIN (.fw_name = "gcc_disp_gpll0_clk_src") in parent_map_2. Resolve it by introducing its own entry in the parent enum and correctly assigning it in disp_cc_parent_map_2[]. Fixes: cc517ea3333f ("clk: qcom: Add display clock controller driver for QCM2290") Signed-off-by: Konrad Dybcio --- drivers/clk/qcom/dispcc-qcm2290.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/clk/qcom/dispcc-qcm2290.c b/drivers/clk/qcom/dispcc-qcm2290.c index ee62aca4e5bb..44dd5cfcc150 100644 --- a/drivers/clk/qcom/dispcc-qcm2290.c +++ b/drivers/clk/qcom/dispcc-qcm2290.c @@ -28,6 +28,7 @@ enum { P_DISP_CC_PLL0_OUT_MAIN, P_DSI0_PHY_PLL_OUT_BYTECLK, P_DSI0_PHY_PLL_OUT_DSICLK, + P_GPLL0_OUT_DIV, P_GPLL0_OUT_MAIN, P_SLEEP_CLK, }; @@ -84,7 +85,7 @@ static const struct clk_parent_data disp_cc_parent_data_1[] = { static const struct parent_map disp_cc_parent_map_2[] = { { P_BI_TCXO_AO, 0 }, - { P_GPLL0_OUT_MAIN, 4 }, + { P_GPLL0_OUT_DIV, 4 }, }; static const struct clk_parent_data disp_cc_parent_data_2[] = { @@ -153,8 +154,8 @@ static struct clk_regmap_div disp_cc_mdss_byte0_div_clk_src = { static const struct freq_tbl ftbl_disp_cc_mdss_ahb_clk_src[] = { F(19200000, P_BI_TCXO_AO, 1, 0, 0), - F(37500000, P_GPLL0_OUT_MAIN, 8, 0, 0), - F(75000000, P_GPLL0_OUT_MAIN, 4, 0, 0), + F(37500000, P_GPLL0_OUT_DIV, 8, 0, 0), + F(75000000, P_GPLL0_OUT_DIV, 4, 0, 0), { } };