Message ID | 20230627-sm6125-dpu-v2-12-03e430a2078c@somainline.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp8453330vqr; Tue, 27 Jun 2023 13:29:18 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5JOQWIN96xH0GXYaYDqn2xiah1Qm15ExWVuwuh+wFEX0IPgqRvXdykl8beKqC6leFVWlyr X-Received: by 2002:a17:90b:1d0c:b0:262:e273:403f with SMTP id on12-20020a17090b1d0c00b00262e273403fmr7119363pjb.8.1687897758227; Tue, 27 Jun 2023 13:29:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687897758; cv=none; d=google.com; s=arc-20160816; b=Ci/RYX/AGObWKVjo29yZl0CgofxsQTeKRxSXPSYyAaFujXn9rPL6cad28+B/twUvyq vw+33gS/lQwPWRL7YCuftgQU055GplFknbbbVUmGu8sPiM3Pc2C8F20xvNLTG60ijlrN 020L4PLk+GiQuAhZR8pL4exjkwXSfYSs0DWKrJvID0vn5tcwqiy7HIY6pmHtrdRArM2v u0GT4HCvPCQncOVY4XU39hJPsUFWhRgw9tUTue2Ukuv40Aaqmhane7CL1//umyC/Sw7L fg2MNBn+6Oj84BeAVnY5bqnwQqqf5cyd1KOXULw+X6WgQc61ZBNSxJcyStyXFuG/zArv 5cgA== 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; bh=ATluFXSNXjprsfAhFqtBBNmPG/x4Nsvi/AQ4cSNsYvo=; fh=pj9lVTD7zJGSjaLEKdvLb7dkz1RbGKHUxYpQTxVQ54Y=; b=R6DrBlj5EmB4VsfYxReN4SIYiTmiXBpD2vq6f3OFm/TadnPui3qGlqQKXbPlzy8Qhp kZq99xCVsARrFnY23BcbkNVqr18aNLuMWTGl8q0o2kGHY+T36Le22QYxYuFcVtRI0HJv F9/lhHz2R0HgBr0DipdD+bzJZlZz0lJwt/OZ/ErASX8C3HakTmRkkvXwCpNJeJ04GuR3 RsNu+Qkbwim8qGokK5v+KHg2hfg/byBPmmnA4lyzDtQWcCJtmJX+Z35o3RpQAZ6PC9hm Q3PbH1+OpERea3JBmzraKz6lovzBN+AEG1mXJS3C9IDAEE4uFAdGFKWg0jfNhlro0L0V 3F6A== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x5-20020a17090abc8500b0025bd1db6083si7590866pjr.102.2023.06.27.13.29.05; Tue, 27 Jun 2023 13:29:18 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231452AbjF0UPk (ORCPT <rfc822;nicolai.engesland@gmail.com> + 99 others); Tue, 27 Jun 2023 16:15:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231154AbjF0UOo (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 27 Jun 2023 16:14:44 -0400 Received: from m-r2.th.seeweb.it (m-r2.th.seeweb.it [IPv6:2001:4b7a:2000:18::171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18E652D4A; Tue, 27 Jun 2023 13:14:39 -0700 (PDT) Received: from Marijn-Arch-PC.localdomain (94-211-6-86.cable.dynamic.v4.ziggo.nl [94.211.6.86]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by m-r2.th.seeweb.it (Postfix) with ESMTPSA id 632BF3F73D; Tue, 27 Jun 2023 22:14:37 +0200 (CEST) From: Marijn Suijten <marijn.suijten@somainline.org> Date: Tue, 27 Jun 2023 22:14:27 +0200 Subject: [PATCH v2 12/15] arm64: dts: qcom: sm6125: Switch fixed xo_board clock to RPM XO clock MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230627-sm6125-dpu-v2-12-03e430a2078c@somainline.org> References: <20230627-sm6125-dpu-v2-0-03e430a2078c@somainline.org> In-Reply-To: <20230627-sm6125-dpu-v2-0-03e430a2078c@somainline.org> To: Andy Gross <agross@kernel.org>, Bjorn Andersson <andersson@kernel.org>, Rob Herring <robh+dt@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, Conor Dooley <conor+dt@kernel.org>, Michael Turquette <mturquette@baylibre.com>, Stephen Boyd <sboyd@kernel.org>, Rob Clark <robdclark@gmail.com>, Abhinav Kumar <quic_abhinavk@quicinc.com>, Dmitry Baryshkov <dmitry.baryshkov@linaro.org>, Sean Paul <sean@poorly.run>, David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>, Krishna Manikandan <quic_mkrishn@quicinc.com>, Marijn Suijten <marijn.suijten@somainline.org>, Loic Poulain <loic.poulain@linaro.org>, Konrad Dybcio <konrad.dybcio@somainline.org> Cc: ~postmarketos/upstreaming@lists.sr.ht, AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>, Konrad Dybcio <konrad.dybcio@linaro.org>, Martin Botka <martin.botka@somainline.org>, Jami Kettunen <jami.kettunen@somainline.org>, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski <krzk@kernel.org>, linux-clk@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, Lux Aliaga <they@mint.lgbt> X-Mailer: b4 0.12.3 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769889079879367910?= X-GMAIL-MSGID: =?utf-8?q?1769889079879367910?= |
Series |
drm/msm: Add SM6125 MDSS/DPU hardware and enable Sony Xperia 10 II panel
|
|
Commit Message
Marijn Suijten
June 27, 2023, 8:14 p.m. UTC
We have a working RPM XO clock; no other driver except rpmcc should be parenting directly to the fixed-factor xo_board clock nor should it be reachable by that global name. Remove the name to that effect, so that every clock relation is explicitly defined in DTS. Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org> --- arch/arm64/boot/dts/qcom/sm6125.dtsi | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
Comments
On 27/06/2023 23:14, Marijn Suijten wrote: > We have a working RPM XO clock; no other driver except rpmcc should be > parenting directly to the fixed-factor xo_board clock nor should it be > reachable by that global name. Remove the name to that effect, so that > every clock relation is explicitly defined in DTS. > > Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> > Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org> > --- > arch/arm64/boot/dts/qcom/sm6125.dtsi | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/sm6125.dtsi b/arch/arm64/boot/dts/qcom/sm6125.dtsi > index 722dde560bec..edb03508dba3 100644 > --- a/arch/arm64/boot/dts/qcom/sm6125.dtsi > +++ b/arch/arm64/boot/dts/qcom/sm6125.dtsi > @@ -22,7 +22,6 @@ xo_board: xo-board { > compatible = "fixed-clock"; > #clock-cells = <0>; > clock-frequency = <19200000>; > - clock-output-names = "xo_board"; Why? I'd say, leave it. With that fixed: Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > }; > > sleep_clk: sleep-clk { > @@ -306,6 +305,8 @@ rpm_requests: rpm-requests { > rpmcc: clock-controller { > compatible = "qcom,rpmcc-sm6125", "qcom,rpmcc"; > #clock-cells = <1>; > + clocks = <&xo_board>; > + clock-names = "xo"; > }; > > rpmpd: power-controller { > @@ -713,7 +714,7 @@ sdhc_1: mmc@4744000 { > > clocks = <&gcc GCC_SDCC1_AHB_CLK>, > <&gcc GCC_SDCC1_APPS_CLK>, > - <&xo_board>; > + <&rpmcc RPM_SMD_XO_CLK_SRC>; > clock-names = "iface", "core", "xo"; > iommus = <&apps_smmu 0x160 0x0>; > > @@ -740,7 +741,7 @@ sdhc_2: mmc@4784000 { > > clocks = <&gcc GCC_SDCC2_AHB_CLK>, > <&gcc GCC_SDCC2_APPS_CLK>, > - <&xo_board>; > + <&rpmcc RPM_SMD_XO_CLK_SRC>; > clock-names = "iface", "core", "xo"; > iommus = <&apps_smmu 0x180 0x0>; > >
On 2023-06-29 13:55:28, Dmitry Baryshkov wrote: > On 27/06/2023 23:14, Marijn Suijten wrote: > > We have a working RPM XO clock; no other driver except rpmcc should be > > parenting directly to the fixed-factor xo_board clock nor should it be > > reachable by that global name. Remove the name to that effect, so that > > every clock relation is explicitly defined in DTS. > > > > Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> > > Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org> > > --- > > arch/arm64/boot/dts/qcom/sm6125.dtsi | 7 ++++--- > > 1 file changed, 4 insertions(+), 3 deletions(-) > > > > diff --git a/arch/arm64/boot/dts/qcom/sm6125.dtsi b/arch/arm64/boot/dts/qcom/sm6125.dtsi > > index 722dde560bec..edb03508dba3 100644 > > --- a/arch/arm64/boot/dts/qcom/sm6125.dtsi > > +++ b/arch/arm64/boot/dts/qcom/sm6125.dtsi > > @@ -22,7 +22,6 @@ xo_board: xo-board { > > compatible = "fixed-clock"; > > #clock-cells = <0>; > > clock-frequency = <19200000>; > > - clock-output-names = "xo_board"; > > Why? I'd say, leave it. The exact reason is explained in the commit message. > > With that fixed: Hence I don't think it makes sense to "fix" this. - Marijn > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
On Thu, 29 Jun 2023 at 15:09, Marijn Suijten <marijn.suijten@somainline.org> wrote: > > On 2023-06-29 13:55:28, Dmitry Baryshkov wrote: > > On 27/06/2023 23:14, Marijn Suijten wrote: > > > We have a working RPM XO clock; no other driver except rpmcc should be > > > parenting directly to the fixed-factor xo_board clock nor should it be > > > reachable by that global name. Remove the name to that effect, so that > > > every clock relation is explicitly defined in DTS. > > > > > > Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> > > > Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org> > > > --- > > > arch/arm64/boot/dts/qcom/sm6125.dtsi | 7 ++++--- > > > 1 file changed, 4 insertions(+), 3 deletions(-) > > > > > > diff --git a/arch/arm64/boot/dts/qcom/sm6125.dtsi b/arch/arm64/boot/dts/qcom/sm6125.dtsi > > > index 722dde560bec..edb03508dba3 100644 > > > --- a/arch/arm64/boot/dts/qcom/sm6125.dtsi > > > +++ b/arch/arm64/boot/dts/qcom/sm6125.dtsi > > > @@ -22,7 +22,6 @@ xo_board: xo-board { > > > compatible = "fixed-clock"; > > > #clock-cells = <0>; > > > clock-frequency = <19200000>; > > > - clock-output-names = "xo_board"; > > > > Why? I'd say, leave it. > > The exact reason is explained in the commit message. Usually we do no not kill the xo_board name for the sake of anybody still looking for the old name. Weak argument, I know. > > > > > With that fixed: > > Hence I don't think it makes sense to "fix" this. > > - Marijn > > > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
On 29.06.2023 14:26, Dmitry Baryshkov wrote: > On Thu, 29 Jun 2023 at 15:09, Marijn Suijten > <marijn.suijten@somainline.org> wrote: >> >> On 2023-06-29 13:55:28, Dmitry Baryshkov wrote: >>> On 27/06/2023 23:14, Marijn Suijten wrote: >>>> We have a working RPM XO clock; no other driver except rpmcc should be >>>> parenting directly to the fixed-factor xo_board clock nor should it be >>>> reachable by that global name. Remove the name to that effect, so that >>>> every clock relation is explicitly defined in DTS. >>>> >>>> Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> >>>> Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org> >>>> --- >>>> arch/arm64/boot/dts/qcom/sm6125.dtsi | 7 ++++--- >>>> 1 file changed, 4 insertions(+), 3 deletions(-) >>>> >>>> diff --git a/arch/arm64/boot/dts/qcom/sm6125.dtsi b/arch/arm64/boot/dts/qcom/sm6125.dtsi >>>> index 722dde560bec..edb03508dba3 100644 >>>> --- a/arch/arm64/boot/dts/qcom/sm6125.dtsi >>>> +++ b/arch/arm64/boot/dts/qcom/sm6125.dtsi >>>> @@ -22,7 +22,6 @@ xo_board: xo-board { >>>> compatible = "fixed-clock"; >>>> #clock-cells = <0>; >>>> clock-frequency = <19200000>; >>>> - clock-output-names = "xo_board"; >>> >>> Why? I'd say, leave it. >> >> The exact reason is explained in the commit message. > > Usually we do no not kill the xo_board name for the sake of anybody > still looking for the old name. Weak argument, I know. The only users are (rg -l '"xo_board"' drivers): drivers/clk/qcom/mmcc-msm8974.c drivers/clk/qcom/a53-pll.c drivers/clk/qcom/gcc-msm8974.c drivers/clk/qcom/clk-smd-rpm.c drivers/clk/qcom/mmcc-msm8996.c drivers/clk/qcom/gcc-msm8916.c drivers/clk/qcom/gcc-apq8084.c drivers/clk/qcom/gcc-msm8996.c drivers/clk/qcom/mmcc-apq8084.c drivers/clk/qcom/clk-rpmh.c drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c This platform only binds clk-smd-rpm, but patch 11 provides a direct reference in the DT. Konrad > >> >>> >>> With that fixed: >> >> Hence I don't think it makes sense to "fix" this. >> >> - Marijn >> >>> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > > >
On 2023-06-29 21:14:47, Konrad Dybcio wrote: > On 29.06.2023 14:26, Dmitry Baryshkov wrote: > > On Thu, 29 Jun 2023 at 15:09, Marijn Suijten > > <marijn.suijten@somainline.org> wrote: > >> > >> On 2023-06-29 13:55:28, Dmitry Baryshkov wrote: > >>> On 27/06/2023 23:14, Marijn Suijten wrote: > >>>> We have a working RPM XO clock; no other driver except rpmcc should be > >>>> parenting directly to the fixed-factor xo_board clock nor should it be > >>>> reachable by that global name. Remove the name to that effect, so that > >>>> every clock relation is explicitly defined in DTS. > >>>> > >>>> Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> > >>>> Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org> > >>>> --- > >>>> arch/arm64/boot/dts/qcom/sm6125.dtsi | 7 ++++--- > >>>> 1 file changed, 4 insertions(+), 3 deletions(-) > >>>> > >>>> diff --git a/arch/arm64/boot/dts/qcom/sm6125.dtsi b/arch/arm64/boot/dts/qcom/sm6125.dtsi > >>>> index 722dde560bec..edb03508dba3 100644 > >>>> --- a/arch/arm64/boot/dts/qcom/sm6125.dtsi > >>>> +++ b/arch/arm64/boot/dts/qcom/sm6125.dtsi > >>>> @@ -22,7 +22,6 @@ xo_board: xo-board { > >>>> compatible = "fixed-clock"; > >>>> #clock-cells = <0>; > >>>> clock-frequency = <19200000>; > >>>> - clock-output-names = "xo_board"; > >>> > >>> Why? I'd say, leave it. > >> > >> The exact reason is explained in the commit message. > > > > Usually we do no not kill the xo_board name for the sake of anybody > > still looking for the old name. Weak argument, I know. > The only users are (rg -l '"xo_board"' drivers): > > drivers/clk/qcom/mmcc-msm8974.c > drivers/clk/qcom/a53-pll.c > drivers/clk/qcom/gcc-msm8974.c > drivers/clk/qcom/clk-smd-rpm.c > drivers/clk/qcom/mmcc-msm8996.c > drivers/clk/qcom/gcc-msm8916.c > drivers/clk/qcom/gcc-apq8084.c > drivers/clk/qcom/gcc-msm8996.c > drivers/clk/qcom/mmcc-apq8084.c > drivers/clk/qcom/clk-rpmh.c > drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c > > This platform only binds clk-smd-rpm, but patch 11 provides a > direct reference in the DT. And following a quick check, those occurrences all have .fw_name="xo",.name="xo_board", allowing the clock to be provided via DT. For sm6125, I'd like it to be required like that: all dt-bindings require an "xo" board where relevant, after all. - Marijn > > Konrad > > > > >> > >>> > >>> With that fixed: > >> > >> Hence I don't think it makes sense to "fix" this. > >> > >> - Marijn > >> > >>> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > > > > > >
diff --git a/arch/arm64/boot/dts/qcom/sm6125.dtsi b/arch/arm64/boot/dts/qcom/sm6125.dtsi index 722dde560bec..edb03508dba3 100644 --- a/arch/arm64/boot/dts/qcom/sm6125.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6125.dtsi @@ -22,7 +22,6 @@ xo_board: xo-board { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <19200000>; - clock-output-names = "xo_board"; }; sleep_clk: sleep-clk { @@ -306,6 +305,8 @@ rpm_requests: rpm-requests { rpmcc: clock-controller { compatible = "qcom,rpmcc-sm6125", "qcom,rpmcc"; #clock-cells = <1>; + clocks = <&xo_board>; + clock-names = "xo"; }; rpmpd: power-controller { @@ -713,7 +714,7 @@ sdhc_1: mmc@4744000 { clocks = <&gcc GCC_SDCC1_AHB_CLK>, <&gcc GCC_SDCC1_APPS_CLK>, - <&xo_board>; + <&rpmcc RPM_SMD_XO_CLK_SRC>; clock-names = "iface", "core", "xo"; iommus = <&apps_smmu 0x160 0x0>; @@ -740,7 +741,7 @@ sdhc_2: mmc@4784000 { clocks = <&gcc GCC_SDCC2_AHB_CLK>, <&gcc GCC_SDCC2_APPS_CLK>, - <&xo_board>; + <&rpmcc RPM_SMD_XO_CLK_SRC>; clock-names = "iface", "core", "xo"; iommus = <&apps_smmu 0x180 0x0>;