From patchwork Sun May 21 20:23:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13249520 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 6EBBAC7EE37 for ; Sun, 21 May 2023 20:23:32 +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=rEhT/IIAh+6pk84CrMhkA/y2PW/QQEoZRubKZX8Gkpg=; b=zT6O78S9fwyZXQ rFt1cmOQmejGMtP0+gra+S36Zg4JqoCpGsYlaSHJCTEo5N+NmuIhYcm/pbv6xMm1sLP7lX9/BRpZE EcKlzQQlb7rnHlYbDhrY8HwHrcgaXxUYtQmwcLwBDrOWDWe5ATCVRxSdtv2nfHW5AwNnnp0E0GVMv Q7qv/XNYOwugNyn5m2d37/Ho188suExccA/DjWgt4NhzhCv/RfTbcLqd2L/FvO+1Wz08VpAFDF4oK bwE1ny5w0Q5v5b5nNIY3l6cTgkPU+AWr/mFvaYNc3L2zp/sKf1w5oypu8H6OHy43ev/FdJwNSuzLv ajFMmmFswkDUUOp9RfrQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q0paW-004bBD-0J; Sun, 21 May 2023 20:23:32 +0000 Received: from mail-lj1-x233.google.com ([2a00:1450:4864:20::233]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q0paT-004b9E-2V for linux-phy@lists.infradead.org; Sun, 21 May 2023 20:23:31 +0000 Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2af1c884b08so35065821fa.1 for ; Sun, 21 May 2023 13:23:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684700608; x=1687292608; 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=pWrV67OsJP9CWKxru1gQ/MLjp2jHimn9rmWnswhiISo=; b=G5PBtbj1HFwkyFD5+yMYH7mtsb9raC0YQPe5ZaK0m7SZ6C6rBErt2FrQBTuDNBjCzg +7kkk2dCQaJIEC2v3e/0mJdjY2wqqPwd23zwboxgEvwho92zeN5uPSj8DGPDTQrKj0x8 bWFF8bIk3xX8HYXsmlliqRkBMla6hqTPeiyKkMUkKSQRR7PQ4uKt1HFU1xw2KqHxQBbE DJwyS7xYWffPdbUHqf5DwP7huY3Bj0TFoj2OQMmjynUaok+Zku2wj7Q0r7awHbWTn3RK N1ja6f+mWeUofkGtczA5t7N4J+S6ZbalaUi+K7PNeeCm2GCebjiTLYlCZlH8iTj67BTo hEug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684700608; x=1687292608; 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=pWrV67OsJP9CWKxru1gQ/MLjp2jHimn9rmWnswhiISo=; b=B2Wj4elJ+5+blj567Wls9njAPyUlFkBMzmx3WL52z72scQn1YhsgD23qorOKt+GNlI KZyhj38dey9amsImjg3HSLcZ52oiMQ4Rgakwy/q2vRpJ1NMoXTQqz6LqmGHRqf0ud5qq J3AMBfx0dPJ3+B/DnqP/yMoui1toY1nQcSgo/X/gvg/SdcOiI24eV6NPST0ECMYCAh8i cvncAZpZtjhmL5Wlojhalf79wAHiIMQVD6+jtSbw33rCdY2jDsNe87o9ZT0SB4eMlw4s RShZ2EjW8iwPv2+LNIFvyPOU8FH0CEUM2w6ffs5cv0hjKZsYQTsOlf8eOd0eXeETD/fW Qixw== X-Gm-Message-State: AC+VfDxoPpdsMTSKXTio0/0lqhx259D5XeBXStnULyLhO5cUv/Z5NSUr uFal7c/8LXJQQYA+UmTEOWrvOg== X-Google-Smtp-Source: ACHHUZ4+UTTZrQBPP91lLZpPQlkexq+52FfSU4dCSzedK9vjvpL/X9w7f26sUR0NJr9ZRCs1xRJXBg== X-Received: by 2002:a05:651c:200b:b0:2ac:81a9:2059 with SMTP id s11-20020a05651c200b00b002ac81a92059mr2358797ljo.26.1684700608498; Sun, 21 May 2023 13:23:28 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id u23-20020a2e91d7000000b002adb566dc10sm835589ljg.129.2023.05.21.13.23.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 May 2023 13:23:28 -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 , linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, Neil Armstrong Subject: [PATCH v3 08/10] arm64: dts: qcom: sdm845: switch USB+DP QMP PHY to new style of bindings Date: Sun, 21 May 2023 23:23:19 +0300 Message-Id: <20230521202321.19778-9-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230521202321.19778-1-dmitry.baryshkov@linaro.org> References: <20230521202321.19778-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-20230521_132329_815357_D5D4C46F X-CRM114-Status: GOOD ( 10.21 ) 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/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 90424442bb4a..6aa2f8f3affc 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -3969,49 +3970,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 { @@ -4091,7 +4071,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"; }; }; @@ -4559,8 +4539,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>; @@ -4898,8 +4879,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",