From patchwork Fri Feb 10 14:44:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 55424 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2388:b0:96:219d:e725 with SMTP id i8csp1338685dyf; Fri, 10 Feb 2023 06:47:24 -0800 (PST) X-Google-Smtp-Source: AK7set9LtTQ9G94nCj8q5xe5fENMFe/R67BGUntdyFvcJo4dX7FY4/hxQTvwt1PLu3xRmGuyh3gL X-Received: by 2002:a17:902:c94e:b0:196:88b8:8616 with SMTP id i14-20020a170902c94e00b0019688b88616mr17798530pla.5.1676040443706; Fri, 10 Feb 2023 06:47:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676040443; cv=none; d=google.com; s=arc-20160816; b=WeIPnI/6lZnwZEKfsyOm9JvsjrfbbaYRKmNjc+9yz25BsGIBOmhvGDl9W6TcU+yV1r leS6X8mDbhrH7kyTVkrWcDZbyd5lGRqi7477MJ2oCpiAzFJTKFmmFqOjUMhHRmky0jcw z+FmKrFbluw5delxt509OwsUGwICX+h+7IW5m9gkEgBovfY9Rbp05AMqNja1VYcsCLo+ quYTEdMMhJatakROcRypL7zmVt829B2YJBKWqSHd5a0KL9CP6gA8XUd0c0gsvmRESs9h ySAXuRtYfgQ8poybR4wFUP6FfzTXbTL2oUYx787DSlhkhY4d/ENrkMXmbbH/ZPpXRhI5 N7CQ== 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=KG+b13pYRqQ3AMotewCXMg/fvG9C+W/U/A7+qVFsrG4=; b=OI7+EHIwW2KuypCdRtLWFTtL1Ur0HX1HOJn03z+3Hnf9QHA7Za8RHCkcFwqjaJLyo8 4TWD2nSBP4oVKTbg/e8mD4W8bkmapUqFBsuuZ6tZeNSir6gvgejo6P+y51yx10CN3mJT cjzuSLJga5MBaCiq2nEmjW4Shr7h1lH0y4G/ynncnlbzaYQOy8hxKf7gJ5pYzE2gVf76 F7NO9FbIC9oIbcG0T70N+Vq4KsKsPoFNd90V2m4Nlq/KEGR1KXSF3WT0oD/MThHnwAmZ EBKVteif2YpflizbymkvSVkD3uopugxPczJoXMFP3c041/EbN7Ny7L4t+V3LAN9YOU11 uyhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tIWrV+lp; 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 j62-20020a636e41000000b004f2920ecea3si4704472pgc.623.2023.02.10.06.47.11; Fri, 10 Feb 2023 06:47:23 -0800 (PST) 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=tIWrV+lp; 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 S232401AbjBJOoh (ORCPT + 99 others); Fri, 10 Feb 2023 09:44:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40444 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232076AbjBJOoc (ORCPT ); Fri, 10 Feb 2023 09:44:32 -0500 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 193F572DD5 for ; Fri, 10 Feb 2023 06:44:31 -0800 (PST) Received: by mail-wm1-x32a.google.com with SMTP id bg5-20020a05600c3c8500b003e00c739ce4so4214861wmb.5 for ; Fri, 10 Feb 2023 06:44:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=KG+b13pYRqQ3AMotewCXMg/fvG9C+W/U/A7+qVFsrG4=; b=tIWrV+lpsn1HJHyWCwwSR2K9yrdY+9dcj7U78S0bVemI7uyLshNqtlOWB0TIiW7Kq5 4XORWhuuzt2v1y47DkRcNB/dfi/o+FSzOyrHRRHX8+UDmRMfEASH/DhwZxx32eTyJYLH W/v7k+WzfNG+LGCjNP/VFViHQP1TNlZoiWwiwkKvzTu6KJXbIoZ3/mFSjamRtDCpv7ae UzE3cq+mp16kGMh9wwJGKT5MM2v2HJXiTjwnHenGVCHRwsg0wbM2vsKkqcIZ25jKz5k5 NK0OwC7WOhpPyz1jkB2Hl6LMkEtciW5zFVVIfNeR3/+MbQPm8vJOF84CwHCHDEEvYmCu JSnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=KG+b13pYRqQ3AMotewCXMg/fvG9C+W/U/A7+qVFsrG4=; b=Vx+oAVo/n+qdkrQwJAuzmVvb/D0ebyCVEBfmlqbMMzFVEDkZ82R7NeSkhZJLyvV+Qk L6g4KHWm5Wu+aJNHQ4YQgO4zi8yRbytGQFK12BMN/AAbaM5FQ5+ADMWtYwvfu8l+q7PO lwL3gtXrOFpykuX/bUuZLVEuYnpg+Pdm6Ge5KibDkxgcZa0PXi0Sc0VbB8aKpIsEFNEh H8YqRid6GtQnNCfP4gndJvQZ0P6GLHltvDwlejbEu9Ygui8mOLcdsziBb6tOCduPyZcY Z91XSDXvZy3bSHJfd6aWhzgWWZzAjdjqMcMM9qxVrgjkzGVONL5L+jLfAELMV1RkSkuw igRA== X-Gm-Message-State: AO0yUKXA32KXWi+JC4Vctl2hiJN47Ogcxs9KDNEgchMtn4PzSrcf/XII cz/DUWqXC5/UuxWdFMbYv1PWyA== X-Received: by 2002:a05:600c:16c5:b0:3db:1434:c51a with SMTP id l5-20020a05600c16c500b003db1434c51amr13124252wmn.40.1676040269667; Fri, 10 Feb 2023 06:44:29 -0800 (PST) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id l40-20020a05600c1d2800b003dd1b00bd9asm6103000wms.32.2023.02.10.06.44.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Feb 2023 06:44:29 -0800 (PST) From: Neil Armstrong Date: Fri, 10 Feb 2023 15:44:22 +0100 Subject: [PATCH v3 2/5] arm64: dts: qcom: sm8350: switch to combo usb3/dp phy MIME-Version: 1.0 Message-Id: <20230206-topic-sm8450-upstream-dp-controller-v3-2-636ef9e99932@linaro.org> References: <20230206-topic-sm8450-upstream-dp-controller-v3-0-636ef9e99932@linaro.org> In-Reply-To: <20230206-topic-sm8450-upstream-dp-controller-v3-0-636ef9e99932@linaro.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Kuogee Hsieh , Andy Gross , Bjorn Andersson , Konrad Dybcio 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, Neil Armstrong X-Mailer: b4 0.12.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham 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?1757455784127561386?= X-GMAIL-MSGID: =?utf-8?q?1757455784127561386?= The first QMP PHY is an USB3/DP combo phy, switch to the newly documented bindings and register the clocks to the GCC and DISPCC controllers. Reviewed-by: Dmitry Baryshkov Tested-by: Dmitry Baryshkov #SM8350-HDK Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/qcom/sm8350.dtsi | 42 +++++++++++++----------------------- 1 file changed, 15 insertions(+), 27 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi index 4c1a2f814b5c..6638704ff469 100644 --- a/arch/arm64/boot/dts/qcom/sm8350.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -653,7 +654,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>, <0>; }; @@ -2125,37 +2126,24 @@ usb_2_hsphy: phy@88e4000 { resets = <&gcc GCC_QUSB2PHY_SEC_BCR>; }; - usb_1_qmpphy: phy-wrapper@88e9000 { - compatible = "qcom,sm8350-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@88e9000 { + compatible = "qcom,sm8350-qmp-usb3-dp-phy"; + reg = <0 0x088e8000 0 0x3000>; 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"; }; usb_2_qmpphy: phy-wrapper@88eb000 { @@ -2258,7 +2246,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"; }; }; @@ -2623,8 +2611,8 @@ dispcc: clock-controller@af00000 { clocks = <&rpmhcc RPMH_CXO_CLK>, <&mdss_dsi0_phy 0>, <&mdss_dsi0_phy 1>, <&mdss_dsi1_phy 0>, <&mdss_dsi1_phy 1>, - <0>, - <0>; + <&usb_1_qmpphy QMP_USB43DP_DP_LINK_CLK>, + <&usb_1_qmpphy QMP_USB43DP_DP_VCO_DIV_CLK>; clock-names = "bi_tcxo", "dsi0_phy_pll_out_byteclk", "dsi0_phy_pll_out_dsiclk",