From patchwork Sun Mar 26 00:57:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13187965 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 820B2C77B6C for ; Sun, 26 Mar 2023 02:01:56 +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=VZbimqCakOSo/iN8gbw9h2wdSgN9dRLWwgmewBm0z+o=; b=UsFoQPOWcPjILl 7CelhJ0ktopajubp43B9obkwR5/UTznjf2d5UU/G/mgUw7G3mx3uggq5AgCDVNIemvI748TPSE6eM yb1cHNVc2ZlHnSaJNff1oHDptknM/5Cefq+TlhB6/nA/oxdV3bXKhuv8hKg8p1I/WhXCTImnZKQIO Q0kJnbw7OZVo+wmyJ1uOvDC0I6/85d9a2aKnSgAbe9z3X49LNl2sSpzWfFyA89rmoU8LR96A3wi7Q b6TyehrryeZk7LEt+1S7QzrA3n5Y4vkpXqmQpdIxzAKkSkNnDIQocuqzJm0R66qeQxyAPOU0h8+qL 1meYahpNF8DfkOIyVFwQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pgFhk-007pZ4-0Z; Sun, 26 Mar 2023 02:01:56 +0000 Received: from mail-lf1-x12d.google.com ([2a00:1450:4864:20::12d]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pgEhZ-007jrR-2O for linux-phy@lists.infradead.org; Sun, 26 Mar 2023 00:57:43 +0000 Received: by mail-lf1-x12d.google.com with SMTP id q16so6920491lfe.10 for ; Sat, 25 Mar 2023 17:57:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679792259; 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=3GNa0fcHH21wLDXSWROL6xeDtSdFaQfshGobUBLyMtc=; b=QUwM30JBcc5pW4IOz+PLBM9kK8q0GVPI9IcqbPVu9u2CSed3wir+0ZkEoY4WSrVnp1 mFnGOxoPs0zRxS2XMQ21tnx2E16LkpcCCTjQvVrZHLknRIfSd3nW309awUVwCW6jLP4J h0wThxqf4njuXXuBwR9lCG2wbGgutjFBrUltAHNj2miNy4YlxVudEp8xPuOFsHqo1oJ5 NPVhQHAnRjH4Q7DShffiL8pIPytwJOT3hUjSDlN9SZxoTX09SebEXfdsR6xrjcl0TmrL 5mC7bj1zwjA7OOKU8qwSJjoTmTeKwsb7CwVjmJdTbZotyRBg5jbMJb5RhJ7gxMmQsZbq jcwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679792259; 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=3GNa0fcHH21wLDXSWROL6xeDtSdFaQfshGobUBLyMtc=; b=KRnQBNlbuk7OEFwIfGlZhA3Q1WWGIytjbhKpDWfGozpfnc2W859SSG753OLlDvsoUR x5AZWCvvURrHRCGV/eqXYLECkk0HVR5fVFOpYCB7SgpYkvCm9hqrgW8pSDEcCDF19zSp 0qav9rBVfwbNizjKFM3Gg2tygcseAOx8VLG8c8EehpqMzkLEvKb2bRZzftalSPfxdPz0 OfZDlFxgYcY0hdxevW6yyz0tDcqaEkmpA6iHotNceSHKUeGFCF+NdNpAWP0BgI9Y7Xir YrhVRnkUxifhmP4jHL3dngGb0M8lE4ADfuGKIn8LWQHkkg7QYINg+YEWZCVSvcOE5rKL yUuw== X-Gm-Message-State: AAQBX9ebJOrw3j4y2waxyv4wZR1O9eV3plf1JEcua0pfWWxjipZ0Xg0O hl29hdA4dTDBi0TzH17o0I7cgw== X-Google-Smtp-Source: AKy350Ymvv9QkBl1oesrawowvBnsZ7VkRbV3AMlhUmWeOOF072kxFsJ0dkr3eALJBSCGJTSfi6e1pQ== X-Received: by 2002:ac2:55a8:0:b0:4d5:c96f:f7c7 with SMTP id y8-20020ac255a8000000b004d5c96ff7c7mr2199891lfg.23.1679792259195; Sat, 25 Mar 2023 17:57:39 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id n13-20020ac242cd000000b004e7fa99f3f4sm3996858lfl.265.2023.03.25.17.57.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Mar 2023 17:57:38 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Vinod Koul , Kishon Vijay Abraham I , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, Johan Hovold , devicetree@vger.kernel.org Subject: [PATCH v2 7/9] arm64: dts: qcom: sdm845: switch USB+DP QMP PHY to new style of bindings Date: Sun, 26 Mar 2023 03:57:31 +0300 Message-Id: <20230326005733.2166354-8-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230326005733.2166354-1-dmitry.baryshkov@linaro.org> References: <20230326005733.2166354-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-20230325_175741_793503_B847059D X-CRM114-Status: GOOD ( 10.00 ) 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). Signed-off-by: Dmitry Baryshkov Reviewed-by: Neil Armstrong --- arch/arm64/boot/dts/qcom/sdm845.dtsi | 57 ++++++++++------------------ 1 file changed, 19 insertions(+), 38 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index 2f32179c7d1b..aff8b9278914 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -3909,49 +3910,28 @@ usb_2_hsphy: phy@88e3000 { nvmem-cells = <&qusb2s_hstx_trim>; }; - usb_1_qmpphy: phy@88e9000 { + usb_1_qmpphy: phy@88e8000 { compatible = "qcom,sdm845-qmp-usb3-dp-phy"; - reg = <0 0x088e9000 0 0x18c>, - <0 0x088e8000 0 0x38>, - <0 0x088ea000 0 0x40>; + 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 0x100>; - #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>; }; usb_2_qmpphy: phy@88eb000 { @@ -4031,7 +4011,7 @@ usb_1_dwc3: usb@a600000 { iommus = <&apps_smmu 0x740 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"; }; }; @@ -4499,8 +4479,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>; @@ -4838,8 +4819,8 @@ dispcc: clock-controller@af00000 { <&dsi0_phy 1>, <&dsi1_phy 0>, <&dsi1_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", "gcc_disp_gpll0_div_clk_src",