From patchwork Fri Mar 17 15:06:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 71320 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp396998wrt; Fri, 17 Mar 2023 08:15:34 -0700 (PDT) X-Google-Smtp-Source: AK7set/dN/UtpwnMEnoW0t9uPXaoHBtj3Fd+W82/aRgdYTy8AXK056e/2Fa4fG4OOoZhAuTe8JAY X-Received: by 2002:a17:902:c94f:b0:19a:9269:7d1 with SMTP id i15-20020a170902c94f00b0019a926907d1mr7538221pla.4.1679066134212; Fri, 17 Mar 2023 08:15:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679066134; cv=none; d=google.com; s=arc-20160816; b=M4WJQ/KM8mLcEqA+VrU0mf2rTQqIfjSeDVShz41ULcLhwg7DAAig7XG276Mbu4JeW/ TLkaSdFeBavY1Cm90rGx5YFiCsC/t8H803TmGehO50P3UdCae30jJpZ1mlKzOAUUGHGN 7gOWRVeB3GaloZy8miA2cEmakSEdHYdDF7vl7cbJxw8TU9KQ/0a8sCf56kDOJF089fZU Mt2cuun7X3uktQnAIdhag8hbrMPoVX6zUt8n7g6D5R0mexcw61nbgkk8kU+LB7OUgY7k O8LRPRUekoGoji11NQ2ije/APEdI3caV/NtAozVb5nGQ/d5odFX8dzXZ4eniVyug6oJI opBQ== 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=4UjNj4RhdG2GPeYaYxWsIzZJ/IFtQynTcD2qm6NR1vE=; b=Zj1kh9qN4Yr0y/8XiznYfXk+67STFmR/pkxXnQ6ieIwdX7fmmJxyNvsdaWdHQsvlz7 SfTPkUCiaV2Z2eLf4J0gufrd/Eu0eBC26+2V9fEGfFBZu7pZypMgVWVDGd2JSTBWCFKw 85WCoJ3oT88A31dWTzwVVlOA59L7qg11WDkKFEOBPDXEFs89vmPxfXfm7oArtA8cOe+W Z94oZQ8puzq2V3fAuirD8k5kyHXs8ba/vRFqqbDr7A3t9J/uDRTzXurm/lD6ijtVcxtY Cu3jUsn1z/NrF8RfUFg4ZxvDSUb2Q8Xv5uqDAuY+aqQsN++gLQcgo95YWGVnmNH1oCbW NByg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=czkh5cDi; 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 j12-20020a170903024c00b0019cec506164si2855197plh.178.2023.03.17.08.15.18; Fri, 17 Mar 2023 08:15:34 -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; dkim=pass header.i=@linaro.org header.s=google header.b=czkh5cDi; 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 S231517AbjCQPI0 (ORCPT + 99 others); Fri, 17 Mar 2023 11:08:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231415AbjCQPIR (ORCPT ); Fri, 17 Mar 2023 11:08:17 -0400 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7F7D1C1BD8 for ; Fri, 17 Mar 2023 08:07:47 -0700 (PDT) Received: by mail-wr1-x42b.google.com with SMTP id p4so4725641wre.11 for ; Fri, 17 Mar 2023 08:07:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679065596; 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=4UjNj4RhdG2GPeYaYxWsIzZJ/IFtQynTcD2qm6NR1vE=; b=czkh5cDiGWVe/i0SuyJrTZy/wTH2ZfGTJbRrg8+e64y0OdSn1I4Uabl3zl6DYXzPqI CqBmMYZq+7Jvw6amuaE2JUYKPOdsg+BZsRcJP9tzbk3Sevdr8lAnKfdj4w/TBWpf6XwU cDSfMBDD03UhkQvvpo6N8dpA/NafQldP0cnbke0M58KUSt6UYw8IRR5tM2IhROiJdqEW WQqDs4EdFr0bTKqWzj1HEtgJc6gXA4m/OdL3CMRs6RUNpfYPh3nvt1fblNrgWjjrXGeF zYc1a1sTQakB2PKVakVooGdrwIfeKZ7nXDQhlv8TLCrKYPW1G1vbiGVZtmlt53CCc7pj pStw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679065596; 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=4UjNj4RhdG2GPeYaYxWsIzZJ/IFtQynTcD2qm6NR1vE=; b=jsmQVNPm8VSqYoww16lapT665gR+E9QJ+NxK3+AKYhAYhnG/2WpXUPpgWEKL/2QRz2 b+Nq3CNMAA7nQSDTIXFk2BFsgBJcFnY5f/COyBWXeZreSFRN+N/57wxmAB3TjII5mNKu hBa8JJniD38p3MlM34Sfsu/cSn19vpi4udAs6XmPEqMu2ZHVBYk7mxCITufT17VTkV3r Ma0ivMyzN8JnEceEWo6FA4DQodMpVoRDivxJ3J0iImf1DfTawduSLfHpfKnyTkVLx/i8 9mm86FoLV3XeGPY93eZOUQAWYJQzU6ZO/j5aqH1Qc4g0MEFDJvUcdGcfsTYn2VlEOm7T bMeA== X-Gm-Message-State: AO0yUKWH/HNFjTnwCbKrjGnvyrrVzwT7E2Xtu0OhMY2ZVRdtnrG4CPSW SViXBk7AIKpEge5UHgk/Sp0BSA== X-Received: by 2002:adf:f5cc:0:b0:2d4:4f2b:965d with SMTP id k12-20020adff5cc000000b002d44f2b965dmr293209wrp.51.1679065596255; Fri, 17 Mar 2023 08:06:36 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:52eb:f6ff:feb3:451a]) by smtp.gmail.com with ESMTPSA id f13-20020a5d58ed000000b002c5493a17efsm2187902wrd.25.2023.03.17.08.06.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 08:06:35 -0700 (PDT) From: Neil Armstrong Date: Fri, 17 Mar 2023 16:06:33 +0100 Subject: [PATCH v6 2/5] arm64: dts: qcom: sm8350: switch to combo usb3/dp phy MIME-Version: 1.0 Message-Id: <20230206-topic-sm8450-upstream-dp-controller-v6-2-d78313cbc41d@linaro.org> References: <20230206-topic-sm8450-upstream-dp-controller-v6-0-d78313cbc41d@linaro.org> In-Reply-To: <20230206-topic-sm8450-upstream-dp-controller-v6-0-d78313cbc41d@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.1 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,URIBL_BLOCKED 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?1760628450642850325?= X-GMAIL-MSGID: =?utf-8?q?1760628450642850325?= 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 Reviewed-by: Konrad Dybcio 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 1afc4311796e..975ab4cbe57e 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 @@ -661,7 +662,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>; }; @@ -2135,37 +2136,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 { @@ -2268,7 +2256,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"; }; }; @@ -2633,8 +2621,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",