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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19CD0C6FD1F for ; Tue, 14 Mar 2023 22:13:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231486AbjCNWNx (ORCPT ); Tue, 14 Mar 2023 18:13:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47884 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231264AbjCNWNe (ORCPT ); Tue, 14 Mar 2023 18:13:34 -0400 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 87D165AB4C for ; Tue, 14 Mar 2023 15:12:14 -0700 (PDT) Received: by mail-lf1-x133.google.com with SMTP id y15so12415040lfa.7 for ; Tue, 14 Mar 2023 15:12:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678831864; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=B1H+TPwf60TlkFCFPEC38Ss9BVTQN0btdeOtJySg2mE=; b=vWP9PwT8UkuxXG5gIEeNyBN90Wbsj4lEwmhTOi1pvigCyTILbFPkzEo46sFlHv5GsQ tus5ODOE54bzQcaut/L8jzd+SC9JRvUY5JIvO/1zk3xaiOzVG3w/MNHfrBplLiD4mLhI WYRyJ6kTh2sjTwVtIbXonGD6YFsxz7V/haQNvDE3VpluuY0q9Fjaj3GHIiyor8maJ9es 6Zm9tmyp+MauwwwKbiwmqRUsx/GKkG/ZkFwo1Xpdd2Wxt7nyvEmCWfsZe0RuWggRqSas QLHX4Kpg35exlYKo+k2Du4PK8LtjtSDYpnagQ83KpTn53odovfnkEWeQFy7g/s0IOqv6 XeMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678831864; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=B1H+TPwf60TlkFCFPEC38Ss9BVTQN0btdeOtJySg2mE=; b=y6KyTXGqQob7e2s/uTUhZ1S5rWHIDl0yfy0StcZhwrc1oivmgIrpFVaagMhMFahZhE rp5kyLZVDRRcLM5bGWTKEwt5vG6D2dGnkBlyEH2gvpj/C+aYt6PwozP6TI7bMZjOZ0V0 hsAVgfYwQz1gsD4CdSVXMFjRLUjOOFl7798bbJKsHufMV+jaxMEClYmsUZZraDVcclRa zrYTpNvJ9fnPQ+H3NAlXlowZWGdw07j/YEdDZ2jjNHEwKqQ2ick46EnAq+ri1CNsu6Gb gzzqAR6NkqQt8Rjlkn38eqEEW1D7bgHzkosjxT0r5XwMf8GnsLAj8nIVi+SqeRKDa1v1 8g3Q== X-Gm-Message-State: AO0yUKWyZ2UcIH5AS4UE91VGcnjvozGaHq6UU/hu2FgZAZW/KpCbGEcg U4TYlNSxHPDciabAuRZZGL2T4w== X-Google-Smtp-Source: AK7set8w4RHybjUcN9VpLWZC8V9uYpMQoIIvgf0ELIssnS+g7g4Z2avgJaMpuDmcokxsIGIh8AmV1A== X-Received: by 2002:ac2:538f:0:b0:4a4:68b7:f86d with SMTP id g15-20020ac2538f000000b004a468b7f86dmr1433714lfh.17.1678831864219; Tue, 14 Mar 2023 15:11:04 -0700 (PDT) Received: from [192.168.1.101] (abyj16.neoplus.adsl.tpnet.pl. [83.9.29.16]) by smtp.gmail.com with ESMTPSA id j3-20020ac253a3000000b004db45ae3aa8sm565839lfh.50.2023.03.14.15.11.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 14 Mar 2023 15:11:03 -0700 (PDT) Message-ID: <6942b801-a6c2-6d84-77ff-8091179aeef1@linaro.org> Date: Tue, 14 Mar 2023 23:11:02 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Subject: Re: [PATCH v4 4/5] arm64: dts: qcom: sm8450: switch to usb3/dp combo phy Content-Language: en-US To: Neil Armstrong , Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Kuogee Hsieh , Andy Gross , Bjorn Andersson Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org References: <20230206-topic-sm8450-upstream-dp-controller-v4-0-dca33f531e0d@linaro.org> <20230206-topic-sm8450-upstream-dp-controller-v4-4-dca33f531e0d@linaro.org> From: Konrad Dybcio In-Reply-To: <20230206-topic-sm8450-upstream-dp-controller-v4-4-dca33f531e0d@linaro.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 9.03.2023 10:19, Neil Armstrong wrote: > The QMP PHY is a USB3/DP combo phy, switch to the newly > documented bindings and register the clocks to the GCC > and DISPCC controllers. > > Reviewed-by: Dmitry Baryshkov > Signed-off-by: Neil Armstrong > --- Reviewed-by: Konrad Dybcio Konrad > arch/arm64/boot/dts/qcom/sm8450.dtsi | 42 +++++++++++++----------------------- > 1 file changed, 15 insertions(+), 27 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi > index 1a744a33bcf4..6caa2c8efb46 100644 > --- a/arch/arm64/boot/dts/qcom/sm8450.dtsi > +++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi > @@ -11,6 +11,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -748,7 +749,7 @@ gcc: clock-controller@100000 { > <&ufs_mem_phy_lanes 0>, > <&ufs_mem_phy_lanes 1>, > <&ufs_mem_phy_lanes 2>, > - <0>; > + <&usb_1_qmpphy QMP_USB43DP_USB3_PIPE_CLK>; > clock-names = "bi_tcxo", > "sleep_clk", > "pcie_0_pipe_clk", > @@ -2034,37 +2035,24 @@ usb_1_hsphy: phy@88e3000 { > resets = <&gcc GCC_QUSB2PHY_PRIM_BCR>; > }; > > - usb_1_qmpphy: phy-wrapper@88e9000 { > - compatible = "qcom,sm8450-qmp-usb3-phy"; > - reg = <0 0x088e9000 0 0x200>, > - <0 0x088e8000 0 0x20>; > - status = "disabled"; > - #address-cells = <2>; > - #size-cells = <2>; > - ranges; > + usb_1_qmpphy: phy@88e8000 { > + compatible = "qcom,sm8450-qmp-usb3-dp-phy"; > + reg = <0 0x088e8000 0 0x4000>; > > clocks = <&gcc GCC_USB3_PRIM_PHY_AUX_CLK>, > <&rpmhcc RPMH_CXO_CLK>, > - <&gcc GCC_USB3_PRIM_PHY_COM_AUX_CLK>; > - clock-names = "aux", "ref_clk_src", "com_aux"; > + <&gcc GCC_USB3_PRIM_PHY_COM_AUX_CLK>, > + <&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>; > + clock-names = "aux", "ref", "com_aux", "usb3_pipe"; > > resets = <&gcc GCC_USB3_DP_PHY_PRIM_BCR>, > <&gcc GCC_USB3_PHY_PRIM_BCR>; > reset-names = "phy", "common"; > > - usb_1_ssphy: phy@88e9200 { > - reg = <0 0x088e9200 0 0x200>, > - <0 0x088e9400 0 0x200>, > - <0 0x088e9c00 0 0x400>, > - <0 0x088e9600 0 0x200>, > - <0 0x088e9800 0 0x200>, > - <0 0x088e9a00 0 0x100>; > - #phy-cells = <0>; > - #clock-cells = <0>; > - clocks = <&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>; > - clock-names = "pipe0"; > - clock-output-names = "usb3_phy_pipe_clk_src"; > - }; > + #clock-cells = <1>; > + #phy-cells = <1>; > + > + status = "disabled"; > }; > > remoteproc_slpi: remoteproc@2400000 { > @@ -2972,8 +2960,8 @@ dispcc: clock-controller@af00000 { > <&mdss_dsi0_phy 1>, > <&mdss_dsi1_phy 0>, > <&mdss_dsi1_phy 1>, > - <0>, /* dp0 */ > - <0>, > + <&usb_1_qmpphy QMP_USB43DP_DP_LINK_CLK>, > + <&usb_1_qmpphy QMP_USB43DP_DP_VCO_DIV_CLK>, > <0>, /* dp1 */ > <0>, > <0>, /* dp2 */ > @@ -4153,7 +4141,7 @@ usb_1_dwc3: usb@a600000 { > iommus = <&apps_smmu 0x0 0x0>; > snps,dis_u2_susphy_quirk; > snps,dis_enblslpm_quirk; > - phys = <&usb_1_hsphy>, <&usb_1_ssphy>; > + phys = <&usb_1_hsphy>, <&usb_1_qmpphy QMP_USB43DP_USB3_PHY>; > phy-names = "usb2-phy", "usb3-phy"; > }; > }; >