From patchwork Tue Jul 11 12:09:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13308487 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 58CE5C001DC for ; Tue, 11 Jul 2023 12:09:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=jseBcekG19fn+mwX0/CZ9cNbTjir7Ih4b6Lvqv7Lweg=; b=bYajIlHE/ELfrb H8hgFO1W+L6VonRZUGxQfovDb9wtm2R6vllenA065MRAUihSVAjB7qKaU81Fi0fNTLjxU4DhOeUIz w31aL12n3sJ6YvIZD7Eou9CtPD+vva9Nkya07NJ1sKbBg4Y2x3FBJg9YXuKMRIGdOPD24NgF+nLqA B6tdleUK+KJ9q1AHgHWDeW5sX9JFdx4hDbgugg7JHAC7sSt4Qm2Cov1LTf/ZCi5q57GSx4Zhahm1g edWjORsupMjM//eCnkpfI38LyDcH3l6RLPImE3dLwJyxcGY7Iy3BXSS18U3ECd9yx6rDP4AbV7MWi xn1cQ19qRCCHCA3Pyz0Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qJCBK-00EpqI-2h; Tue, 11 Jul 2023 12:09:26 +0000 Received: from mail-lf1-x12f.google.com ([2a00:1450:4864:20::12f]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qJCBG-00EpmZ-1L for linux-phy@lists.infradead.org; Tue, 11 Jul 2023 12:09:24 +0000 Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-4fb5bcb9a28so8668842e87.3 for ; Tue, 11 Jul 2023 05:09:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1689077361; x=1691669361; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lxe/TYLw76uyfwxihhOdapig9Tf8bElDDB0ge8lGtis=; b=K4qM5lJp/P3s2FY9mzzxJJqG7FOafzyVcD/KE8I8hz871Y5+teQ7ijfsSlVpTLhDSk TiTIJmg8wIhtERgRU6/GkAPBM/RTvEr63VjnOMestGgAsMeDXxIRz0peqzPaZOvOSnak H2RCLj1SZH94mgoRnwteBUUYoC3u2eb2LlHTVHhlAcfvAWpX7lyFTh3/xEq/HKvHHWXv 7ZS6Oh6JElbQ6QIq5ukW6ufN4lRY7TRLguyE9C6098kOhFTz4+xCYAkXnrEBGcn8waR8 9xQw66s4ECDQH/O4XYIau8D9GRD8Z46QZPx7TIgTeD+THsL/j7P6/qw57DUxUc/yb6j6 uACw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689077361; x=1691669361; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lxe/TYLw76uyfwxihhOdapig9Tf8bElDDB0ge8lGtis=; b=GkOpGwNNmYRQ7sQkf1HM6RDws4hXvqKouUOA+C36NRR1Ll3Vedj5k5ueJVneKtvTuj iFl0eRbQvXVwZtMyNFY4cq7t6qZmtGpIogdA4yZYOXQe8TAoOLd3eO8HxXEJyzlSLLaJ JLpQr3EAIhjoNmTqmlvlrU+VIQzLa2F8laSkevPp7GB7Sx+s+Wet2pFmD4DCSs3fWGvu /sZXyN2fYgJjcpXOIFC0OSjHR1evdgPLqIbeVprrtmMdp7n6JUIn/3D2fSqPJNhdszkL UyK/rZbz/vGE0UhH17975IJRKaFPQjO9R7ibb/l5si1+8CPywHU5gYE7kDBVEywsPsOL iJ3w== X-Gm-Message-State: ABy/qLbLBT2rQZOrpX3RRHGDClW1O4y4l8A0tBlRXvCrY9nkgOro3FwO RQ83e94VeBp5jZvM/XWuaP0Bpg== X-Google-Smtp-Source: APBJJlGzAkeUjP4Qjl8NvjjrBlCWChquo9NP6VDepoePHVCYKHRY+iMi2WIWvqCuRea5i5nG5/03Ug== X-Received: by 2002:a19:435a:0:b0:4fb:752c:3240 with SMTP id m26-20020a19435a000000b004fb752c3240mr11505720lfj.68.1689077360983; Tue, 11 Jul 2023 05:09:20 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id h22-20020ac25976000000b004fbbd818568sm291447lfp.137.2023.07.11.05.09.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 05:09:20 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Vinod Koul , Kishon Vijay Abraham I , Rob Herring , Krzysztof Kozlowski Cc: Philipp Zabel , Johan Hovold , linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, Neil Armstrong Subject: [PATCH v4 05/10] arm64: dts: qcom: sc7180: switch USB+DP QMP PHY to new style of bindings Date: Tue, 11 Jul 2023 15:09:11 +0300 Message-Id: <20230711120916.4165894-6-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230711120916.4165894-1-dmitry.baryshkov@linaro.org> References: <20230711120916.4165894-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230711_050922_469119_16485D60 X-CRM114-Status: GOOD ( 10.59 ) X-BeenThere: linux-phy@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux Phy Mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-phy" Errors-To: linux-phy-bounces+linux-phy=archiver.kernel.org@lists.infradead.org Change the USB QMP PHY to use newer style of QMP PHY bindings (single resource region, no per-PHY subnodes). Reviewed-by: Neil Armstrong Signed-off-by: Dmitry Baryshkov --- arch/arm64/boot/dts/qcom/sc7180.dtsi | 57 ++++++++++------------------ 1 file changed, 19 insertions(+), 38 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi index 179544ba12db..3920a51595f5 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -2721,49 +2722,28 @@ usb_1_hsphy: phy@88e3000 { nvmem-cells = <&qusb2p_hstx_trim>; }; - usb_1_qmpphy: phy-wrapper@88e9000 { + usb_1_qmpphy: phy@88e8000 { compatible = "qcom,sc7180-qmp-usb3-dp-phy"; - reg = <0 0x088e9000 0 0x18c>, - <0 0x088e8000 0 0x3c>, - <0 0x088ea000 0 0x18c>; + reg = <0 0x088e8000 0 0x3000>; status = "disabled"; - #address-cells = <2>; - #size-cells = <2>; - ranges; clocks = <&gcc GCC_USB3_PRIM_PHY_AUX_CLK>, - <&gcc GCC_USB_PHY_CFG_AHB2PHY_CLK>, <&gcc GCC_USB3_PRIM_CLKREF_CLK>, - <&gcc GCC_USB3_PRIM_PHY_COM_AUX_CLK>; - clock-names = "aux", "cfg_ahb", "ref", "com_aux"; + <&gcc GCC_USB3_PRIM_PHY_COM_AUX_CLK>, + <&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>, + <&gcc GCC_USB_PHY_CFG_AHB2PHY_CLK>; + clock-names = "aux", + "ref", + "com_aux", + "usb3_pipe", + "cfg_ahb"; resets = <&gcc GCC_USB3_PHY_PRIM_BCR>, <&gcc GCC_USB3_DP_PHY_PRIM_BCR>; reset-names = "phy", "common"; - usb_1_ssphy: usb3-phy@88e9200 { - reg = <0 0x088e9200 0 0x128>, - <0 0x088e9400 0 0x200>, - <0 0x088e9c00 0 0x218>, - <0 0x088e9600 0 0x128>, - <0 0x088e9800 0 0x200>, - <0 0x088e9a00 0 0x18>; - #clock-cells = <0>; - #phy-cells = <0>; - clocks = <&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>; - clock-names = "pipe0"; - clock-output-names = "usb3_phy_pipe_clk_src"; - }; - - dp_phy: dp-phy@88ea200 { - reg = <0 0x088ea200 0 0x200>, - <0 0x088ea400 0 0x200>, - <0 0x088eaa00 0 0x200>, - <0 0x088ea600 0 0x200>, - <0 0x088ea800 0 0x200>; - #clock-cells = <1>; - #phy-cells = <0>; - }; + #clock-cells = <1>; + #phy-cells = <1>; }; pmu@90b6300 { @@ -2927,7 +2907,7 @@ usb_1_dwc3: usb@a600000 { iommus = <&apps_smmu 0x540 0>; 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"; maximum-speed = "super-speed"; }; @@ -3233,8 +3213,9 @@ mdss_dp: displayport-controller@ae90000 { "ctrl_link_iface", "stream_pixel"; assigned-clocks = <&dispcc DISP_CC_MDSS_DP_LINK_CLK_SRC>, <&dispcc DISP_CC_MDSS_DP_PIXEL_CLK_SRC>; - assigned-clock-parents = <&dp_phy 0>, <&dp_phy 1>; - phys = <&dp_phy>; + assigned-clock-parents = <&usb_1_qmpphy QMP_USB43DP_DP_LINK_CLK>, + <&usb_1_qmpphy QMP_USB43DP_DP_VCO_DIV_CLK>; + phys = <&usb_1_qmpphy QMP_USB43DP_DP_PHY>; phy-names = "dp"; operating-points-v2 = <&dp_opp_table>; @@ -3291,8 +3272,8 @@ dispcc: clock-controller@af00000 { <&gcc GCC_DISP_GPLL0_CLK_SRC>, <&mdss_dsi0_phy 0>, <&mdss_dsi0_phy 1>, - <&dp_phy 0>, - <&dp_phy 1>; + <&usb_1_qmpphy QMP_USB43DP_DP_LINK_CLK>, + <&usb_1_qmpphy QMP_USB43DP_DP_VCO_DIV_CLK>; clock-names = "bi_tcxo", "gcc_disp_gpll0_clk_src", "dsi0_phy_pll_out_byteclk",