From: Kever Yang <kever.yang@rock-chips.com>
To: Jonas Karlman <jonas@kwiboo.se>, Simon Glass <sjg@chromium.org>,
Philipp Tomsich <philipp.tomsich@vrull.eu>,
Tom Rini <trini@konsulko.com>,
Eugen Hristev <eugen.hristev@collabora.com>
Cc: u-boot@lists.denx.de
Subject: Re: [PATCH 14/16] rockchip: rk3588: Update USB3 related nodes in u-boot.dtsi
Date: Tue, 7 May 2024 15:20:07 +0800 [thread overview]
Message-ID: <e71fa387-6a6b-4959-86b5-e53e4017dc14@rock-chips.com> (raw)
In-Reply-To: <20240504194346.2462489-15-jonas@kwiboo.se>
On 2024/5/5 03:43, Jonas Karlman wrote:
> The USB3 related DT nodes in SoC u-boot.dtsi is slightly different from
> the final nodes being targeted for Linux kernel v6.10.
>
> Sync USB3 related nodes from Linux maintainer v6.10-rockchip-dts64-1 tag
> to prepare for migration of RK3588 to use OF_UPSTREAM.
>
> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Thanks,
- Kever
> ---
> arch/arm/dts/rk3588-generic-u-boot.dtsi | 4 ---
> arch/arm/dts/rk3588-rock-5b-u-boot.dtsi | 9 +------
> arch/arm/dts/rk3588-u-boot.dtsi | 36 +++++++++----------------
> arch/arm/dts/rk3588s-u-boot.dtsi | 34 +++++++++--------------
> 4 files changed, 26 insertions(+), 57 deletions(-)
>
> diff --git a/arch/arm/dts/rk3588-generic-u-boot.dtsi b/arch/arm/dts/rk3588-generic-u-boot.dtsi
> index 225dfa0b682a..f67301d87a6e 100644
> --- a/arch/arm/dts/rk3588-generic-u-boot.dtsi
> +++ b/arch/arm/dts/rk3588-generic-u-boot.dtsi
> @@ -14,10 +14,6 @@
> status = "okay";
> };
>
> -&usbdp_phy0_u3 {
> - status = "okay";
> -};
> -
> &usb_host0_xhci {
> dr_mode = "peripheral";
> maximum-speed = "high-speed";
> diff --git a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
> index 69914f4ce183..8e318e624a85 100644
> --- a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
> +++ b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
> @@ -51,18 +51,10 @@
> status = "okay";
> };
>
> -&usbdp_phy1_u3 {
> - status = "okay";
> -};
> -
> &usbdp_phy0 {
> status = "okay";
> };
>
> -&usbdp_phy0_u3 {
> - status = "okay";
> -};
> -
> &usb_host0_xhci {
> dr_mode = "peripheral";
> maximum-speed = "high-speed";
> @@ -70,5 +62,6 @@
> };
>
> &usb_host1_xhci {
> + dr_mode = "host";
> status = "okay";
> };
> diff --git a/arch/arm/dts/rk3588-u-boot.dtsi b/arch/arm/dts/rk3588-u-boot.dtsi
> index 992f7b5d6637..4623580c6102 100644
> --- a/arch/arm/dts/rk3588-u-boot.dtsi
> +++ b/arch/arm/dts/rk3588-u-boot.dtsi
> @@ -13,8 +13,8 @@
> clocks = <&cru REF_CLK_USB3OTG1>, <&cru SUSPEND_CLK_USB3OTG1>,
> <&cru ACLK_USB3OTG1>;
> clock-names = "ref_clk", "suspend_clk", "bus_clk";
> - dr_mode = "host";
> - phys = <&u2phy1_otg>, <&usbdp_phy1_u3>;
> + dr_mode = "otg";
> + phys = <&u2phy1_otg>, <&usbdp_phy1 PHY_TYPE_USB3>;
> phy-names = "usb2-phy", "usb3-phy";
> phy_type = "utmi_wide";
> power-domains = <&power RK3588_PD_USB>;
> @@ -32,22 +32,21 @@
> };
>
> usb2phy1_grf: syscon@fd5d4000 {
> - compatible = "rockchip,rk3588-usb2phy-grf", "syscon",
> - "simple-mfd";
> + compatible = "rockchip,rk3588-usb2phy-grf", "syscon", "simple-mfd";
> reg = <0x0 0xfd5d4000 0x0 0x4000>;
> #address-cells = <1>;
> #size-cells = <1>;
>
> - u2phy1: usb2-phy@4000 {
> + u2phy1: usb2phy@4000 {
> compatible = "rockchip,rk3588-usb2phy";
> reg = <0x4000 0x10>;
> - interrupts = <GIC_SPI 394 IRQ_TYPE_LEVEL_HIGH 0>;
> - resets = <&cru SRST_OTGPHY_U3_1>, <&cru SRST_P_USB2PHY_U3_1_GRF0>;
> - reset-names = "phy", "apb";
> + #clock-cells = <0>;
> clocks = <&cru CLK_USB2PHY_HDPTXRXPHY_REF>;
> clock-names = "phyclk";
> clock-output-names = "usb480m_phy1";
> - #clock-cells = <0>;
> + interrupts = <GIC_SPI 394 IRQ_TYPE_LEVEL_HIGH 0>;
> + resets = <&cru SRST_OTGPHY_U3_1>, <&cru SRST_P_USB2PHY_U3_1_GRF0>;
> + reset-names = "phy", "apb";
> status = "disabled";
>
> u2phy1_otg: otg-port {
> @@ -60,10 +59,7 @@
> usbdp_phy1: phy@fed90000 {
> compatible = "rockchip,rk3588-usbdp-phy";
> reg = <0x0 0xfed90000 0x0 0x10000>;
> - rockchip,u2phy-grf = <&usb2phy1_grf>;
> - rockchip,usb-grf = <&usb_grf>;
> - rockchip,usbdpphy-grf = <&usbdpphy1_grf>;
> - rockchip,vo-grf = <&vo0_grf>;
> + #phy-cells = <1>;
> clocks = <&cru CLK_USBDPPHY_MIPIDCPPHY_REF>,
> <&cru CLK_USBDP_PHY1_IMMORTAL>,
> <&cru PCLK_USBDPPHY1>,
> @@ -75,16 +71,10 @@
> <&cru SRST_USBDP_COMBO_PHY1_PCS>,
> <&cru SRST_P_USBDPPHY1>;
> reset-names = "init", "cmn", "lane", "pcs_apb", "pma_apb";
> + rockchip,u2phy-grf = <&usb2phy1_grf>;
> + rockchip,usb-grf = <&usb_grf>;
> + rockchip,usbdpphy-grf = <&usbdpphy1_grf>;
> + rockchip,vo-grf = <&vo0_grf>;
> status = "disabled";
> -
> - usbdp_phy1_dp: dp-port {
> - #phy-cells = <0>;
> - status = "disabled";
> - };
> -
> - usbdp_phy1_u3: usb3-port {
> - #phy-cells = <0>;
> - status = "disabled";
> - };
> };
> };
> diff --git a/arch/arm/dts/rk3588s-u-boot.dtsi b/arch/arm/dts/rk3588s-u-boot.dtsi
> index d3c257983ecb..e9d38d5c83b0 100644
> --- a/arch/arm/dts/rk3588s-u-boot.dtsi
> +++ b/arch/arm/dts/rk3588s-u-boot.dtsi
> @@ -27,7 +27,7 @@
> <&cru ACLK_USB3OTG0>;
> clock-names = "ref_clk", "suspend_clk", "bus_clk";
> dr_mode = "otg";
> - phys = <&u2phy0_otg>, <&usbdp_phy0_u3>;
> + phys = <&u2phy0_otg>, <&usbdp_phy0 PHY_TYPE_USB3>;
> phy-names = "usb2-phy", "usb3-phy";
> phy_type = "utmi_wide";
> power-domains = <&power RK3588_PD_USB>;
> @@ -58,22 +58,21 @@
> };
>
> usb2phy0_grf: syscon@fd5d0000 {
> - compatible = "rockchip,rk3588-usb2phy-grf", "syscon",
> - "simple-mfd";
> + compatible = "rockchip,rk3588-usb2phy-grf", "syscon", "simple-mfd";
> reg = <0x0 0xfd5d0000 0x0 0x4000>;
> #address-cells = <1>;
> #size-cells = <1>;
>
> - u2phy0: usb2-phy@0 {
> + u2phy0: usb2phy@0 {
> compatible = "rockchip,rk3588-usb2phy";
> reg = <0x0 0x10>;
> - interrupts = <GIC_SPI 393 IRQ_TYPE_LEVEL_HIGH 0>;
> - resets = <&cru SRST_OTGPHY_U3_0>, <&cru SRST_P_USB2PHY_U3_0_GRF0>;
> - reset-names = "phy", "apb";
> + #clock-cells = <0>;
> clocks = <&cru CLK_USB2PHY_HDPTXRXPHY_REF>;
> clock-names = "phyclk";
> clock-output-names = "usb480m_phy0";
> - #clock-cells = <0>;
> + interrupts = <GIC_SPI 393 IRQ_TYPE_LEVEL_HIGH 0>;
> + resets = <&cru SRST_OTGPHY_U3_0>, <&cru SRST_P_USB2PHY_U3_0_GRF0>;
> + reset-names = "phy", "apb";
> status = "disabled";
>
> u2phy0_otg: otg-port {
> @@ -91,10 +90,7 @@
> usbdp_phy0: phy@fed80000 {
> compatible = "rockchip,rk3588-usbdp-phy";
> reg = <0x0 0xfed80000 0x0 0x10000>;
> - rockchip,u2phy-grf = <&usb2phy0_grf>;
> - rockchip,usb-grf = <&usb_grf>;
> - rockchip,usbdpphy-grf = <&usbdpphy0_grf>;
> - rockchip,vo-grf = <&vo0_grf>;
> + #phy-cells = <1>;
> clocks = <&cru CLK_USBDPPHY_MIPIDCPPHY_REF>,
> <&cru CLK_USBDP_PHY0_IMMORTAL>,
> <&cru PCLK_USBDPPHY0>,
> @@ -106,17 +102,11 @@
> <&cru SRST_USBDP_COMBO_PHY0_PCS>,
> <&cru SRST_P_USBDPPHY0>;
> reset-names = "init", "cmn", "lane", "pcs_apb", "pma_apb";
> + rockchip,u2phy-grf = <&usb2phy0_grf>;
> + rockchip,usb-grf = <&usb_grf>;
> + rockchip,usbdpphy-grf = <&usbdpphy0_grf>;
> + rockchip,vo-grf = <&vo0_grf>;
> status = "disabled";
> -
> - usbdp_phy0_dp: dp-port {
> - #phy-cells = <0>;
> - status = "disabled";
> - };
> -
> - usbdp_phy0_u3: usb3-port {
> - #phy-cells = <0>;
> - status = "disabled";
> - };
> };
> };
>
next prev parent reply other threads:[~2024-05-07 7:20 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-04 19:42 [PATCH 00/16] rockchip: Migrate RK3308, RK3328, RK356x and RK3588 to OF_UPSTREAM Jonas Karlman
2024-05-04 19:42 ` [PATCH 01/16] rockchip: rk3308: Migrate " Jonas Karlman
2024-05-07 3:29 ` Kever Yang
2024-05-04 19:42 ` [PATCH 02/16] rockchip: rk3308: Remove redundant device tree files Jonas Karlman
2024-05-07 3:30 ` Kever Yang
2024-05-04 19:42 ` [PATCH 03/16] rockchip: rk3328: Migrate to OF_UPSTREAM Jonas Karlman
2024-05-07 3:32 ` Kever Yang
2024-05-04 19:42 ` [PATCH 04/16] rockchip: rk3328: Remove redundant device tree files Jonas Karlman
2024-05-07 3:32 ` Kever Yang
2024-05-04 19:42 ` [PATCH 05/16] rockchip: rk3399: Migrate to OF_UPSTREAM Jonas Karlman
2024-05-07 3:33 ` Kever Yang
2024-05-04 19:42 ` [PATCH 06/16] rockchip: rk3399: Remove redundant device tree files Jonas Karlman
2024-05-07 3:33 ` Kever Yang
2024-05-04 19:42 ` [PATCH 07/16] rockchip: rk356x: Add rk3568-u-boot.dtsi Jonas Karlman
2024-05-07 3:33 ` Kever Yang
2024-05-04 19:43 ` [PATCH 08/16] rockchip: rk356x: Migrate to OF_UPSTREAM Jonas Karlman
2024-05-07 3:33 ` Kever Yang
2024-05-04 19:43 ` [PATCH 09/16] rockchip: rk356x: Remove redundant device tree files Jonas Karlman
2024-05-04 20:51 ` Chris Morgan
2024-05-04 21:15 ` Jonas Karlman
2024-05-07 3:34 ` Kever Yang
2024-05-04 19:43 ` [PATCH 10/16] phy: rockchip: usbdp: Find phy-id from the io address Jonas Karlman
2024-05-07 3:34 ` Kever Yang
2024-05-04 19:43 ` [PATCH 11/16] phy: rockchip: usbdp: Drop rockchip_u3phy_uboot_init() Jonas Karlman
2024-05-07 3:34 ` Kever Yang
2024-05-04 19:43 ` [PATCH 12/16] phy: rockchip: usbdp: Adopt driver to work with upstream DT Jonas Karlman
2024-05-07 3:34 ` Kever Yang
2024-05-04 19:43 ` [PATCH 13/16] rockchip: rk3588-rock-5b: Drop usb-typec node from u-boot.dtsi Jonas Karlman
2024-05-07 3:34 ` Kever Yang
2024-05-04 19:43 ` [PATCH 14/16] rockchip: rk3588: Update USB3 related nodes in u-boot.dtsi Jonas Karlman
2024-05-07 7:20 ` Kever Yang [this message]
2024-05-04 19:43 ` [PATCH 15/16] rockchip: rk3588: Migrate to OF_UPSTREAM Jonas Karlman
2024-05-07 7:20 ` Kever Yang
2024-05-04 19:43 ` [PATCH 16/16] rockchip: rk3588: Remove redundant device tree files Jonas Karlman
2024-05-07 7:19 ` Kever Yang
2024-05-05 2:58 ` [PATCH 00/16] rockchip: Migrate RK3308, RK3328, RK356x and RK3588 to OF_UPSTREAM Dragan Simic
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e71fa387-6a6b-4959-86b5-e53e4017dc14@rock-chips.com \
--to=kever.yang@rock-chips.com \
--cc=eugen.hristev@collabora.com \
--cc=jonas@kwiboo.se \
--cc=philipp.tomsich@vrull.eu \
--cc=sjg@chromium.org \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).