Re: [PATCH v4 09/10] rockchip: rk3588: Remove USB3 DRD nodes in u-boot.dtsi

2024-06-06 Thread Kever Yang 



On 2024/5/29 01:04, Jianfeng Liu wrote:

After we sync USB3 DRD nodes from v6.10-rc1, these obsolete nodes
can be removed.

Signed-off-by: Jianfeng Liu 

Reviewed-by: Kever Yang 

Thanks,
- Kever

---

(no changes since v1)

  arch/arm/dts/rk3588-u-boot.dtsi  | 74 ---
  arch/arm/dts/rk3588s-u-boot.dtsi | 85 
  2 files changed, 159 deletions(-)

diff --git a/arch/arm/dts/rk3588-u-boot.dtsi b/arch/arm/dts/rk3588-u-boot.dtsi
index 4623580c610..bfe6645c30e 100644
--- a/arch/arm/dts/rk3588-u-boot.dtsi
+++ b/arch/arm/dts/rk3588-u-boot.dtsi
@@ -4,77 +4,3 @@
   */
  
  #include "rk3588s-u-boot.dtsi"

-
-/ {
-   usb_host1_xhci: usb@fc40 {
-   compatible = "rockchip,rk3588-dwc3", "snps,dwc3";
-   reg = <0x0 0xfc40 0x0 0x40>;
-   interrupts = ;
-   clocks = < REF_CLK_USB3OTG1>, < SUSPEND_CLK_USB3OTG1>,
-< ACLK_USB3OTG1>;
-   clock-names = "ref_clk", "suspend_clk", "bus_clk";
-   dr_mode = "otg";
-   phys = <_otg>, <_phy1 PHY_TYPE_USB3>;
-   phy-names = "usb2-phy", "usb3-phy";
-   phy_type = "utmi_wide";
-   power-domains = < RK3588_PD_USB>;
-   resets = < SRST_A_USB3OTG1>;
-   snps,dis_enblslpm_quirk;
-   snps,dis-u2-freeclk-exists-quirk;
-   snps,dis-del-phy-power-chg-quirk;
-   snps,dis-tx-ipgap-linecheck-quirk;
-   status = "disabled";
-   };
-
-   usbdpphy1_grf: syscon@fd5cc000 {
-   compatible = "rockchip,rk3588-usbdpphy-grf", "syscon";
-   reg = <0x0 0xfd5cc000 0x0 0x4000>;
-   };
-
-   usb2phy1_grf: syscon@fd5d4000 {
-   compatible = "rockchip,rk3588-usb2phy-grf", "syscon", 
"simple-mfd";
-   reg = <0x0 0xfd5d4000 0x0 0x4000>;
-   #address-cells = <1>;
-   #size-cells = <1>;
-
-   u2phy1: usb2phy@4000 {
-   compatible = "rockchip,rk3588-usb2phy";
-   reg = <0x4000 0x10>;
-   #clock-cells = <0>;
-   clocks = < CLK_USB2PHY_HDPTXRXPHY_REF>;
-   clock-names = "phyclk";
-   clock-output-names = "usb480m_phy1";
-   interrupts = ;
-   resets = < SRST_OTGPHY_U3_1>, < 
SRST_P_USB2PHY_U3_1_GRF0>;
-   reset-names = "phy", "apb";
-   status = "disabled";
-
-   u2phy1_otg: otg-port {
-   #phy-cells = <0>;
-   status = "disabled";
-   };
-   };
-   };
-
-   usbdp_phy1: phy@fed9 {
-   compatible = "rockchip,rk3588-usbdp-phy";
-   reg = <0x0 0xfed9 0x0 0x1>;
-   #phy-cells = <1>;
-   clocks = < CLK_USBDPPHY_MIPIDCPPHY_REF>,
-< CLK_USBDP_PHY1_IMMORTAL>,
-< PCLK_USBDPPHY1>,
-<>;
-   clock-names = "refclk", "immortal", "pclk", "utmi";
-   resets = < SRST_USBDP_COMBO_PHY1_INIT>,
-< SRST_USBDP_COMBO_PHY1_CMN>,
-< SRST_USBDP_COMBO_PHY1_LANE>,
-< SRST_USBDP_COMBO_PHY1_PCS>,
-< SRST_P_USBDPPHY1>;
-   reset-names = "init", "cmn", "lane", "pcs_apb", "pma_apb";
-   rockchip,u2phy-grf = <_grf>;
-   rockchip,usb-grf = <_grf>;
-   rockchip,usbdpphy-grf = <_grf>;
-   rockchip,vo-grf = <_grf>;
-   status = "disabled";
-   };
-};
diff --git a/arch/arm/dts/rk3588s-u-boot.dtsi b/arch/arm/dts/rk3588s-u-boot.dtsi
index e9d38d5c83b..09d8b311cec 100644
--- a/arch/arm/dts/rk3588s-u-boot.dtsi
+++ b/arch/arm/dts/rk3588s-u-boot.dtsi
@@ -19,95 +19,10 @@
bootph-all;
};
  
-	usb_host0_xhci: usb@fc00 {

-   compatible = "rockchip,rk3588-dwc3", "snps,dwc3";
-   reg = <0x0 0xfc00 0x0 0x40>;
-   interrupts = ;
-   clocks = < REF_CLK_USB3OTG0>, < SUSPEND_CLK_USB3OTG0>,
-< ACLK_USB3OTG0>;
-   clock-names = "ref_clk", "suspend_clk", "bus_clk";
-   dr_mode = "otg";
-   phys = <_otg>, <_phy0 PHY_TYPE_USB3>;
-   phy-names = "usb2-phy", "usb3-phy";
-   phy_type = "utmi_wide";
-   power-domains = < RK3588_PD_USB>;
-   resets = < SRST_A_USB3OTG0>;
-   snps,dis_enblslpm_quirk;
-   snps,dis-u1-entry-quirk;
-   snps,dis-u2-entry-quirk;
-   snps,dis-u2-freeclk-exists-quirk;
-   snps,dis-del-phy-power-chg-quirk;
-   snps,dis-tx-ipgap-linecheck-quirk;
-   status = "disabled";
-   };

[PATCH v4 09/10] rockchip: rk3588: Remove USB3 DRD nodes in u-boot.dtsi

2024-05-28 Thread Jianfeng Liu 
After we sync USB3 DRD nodes from v6.10-rc1, these obsolete nodes
can be removed.

Signed-off-by: Jianfeng Liu 
---

(no changes since v1)

 arch/arm/dts/rk3588-u-boot.dtsi  | 74 ---
 arch/arm/dts/rk3588s-u-boot.dtsi | 85 
 2 files changed, 159 deletions(-)

diff --git a/arch/arm/dts/rk3588-u-boot.dtsi b/arch/arm/dts/rk3588-u-boot.dtsi
index 4623580c610..bfe6645c30e 100644
--- a/arch/arm/dts/rk3588-u-boot.dtsi
+++ b/arch/arm/dts/rk3588-u-boot.dtsi
@@ -4,77 +4,3 @@
  */
 
 #include "rk3588s-u-boot.dtsi"
-
-/ {
-   usb_host1_xhci: usb@fc40 {
-   compatible = "rockchip,rk3588-dwc3", "snps,dwc3";
-   reg = <0x0 0xfc40 0x0 0x40>;
-   interrupts = ;
-   clocks = < REF_CLK_USB3OTG1>, < SUSPEND_CLK_USB3OTG1>,
-< ACLK_USB3OTG1>;
-   clock-names = "ref_clk", "suspend_clk", "bus_clk";
-   dr_mode = "otg";
-   phys = <_otg>, <_phy1 PHY_TYPE_USB3>;
-   phy-names = "usb2-phy", "usb3-phy";
-   phy_type = "utmi_wide";
-   power-domains = < RK3588_PD_USB>;
-   resets = < SRST_A_USB3OTG1>;
-   snps,dis_enblslpm_quirk;
-   snps,dis-u2-freeclk-exists-quirk;
-   snps,dis-del-phy-power-chg-quirk;
-   snps,dis-tx-ipgap-linecheck-quirk;
-   status = "disabled";
-   };
-
-   usbdpphy1_grf: syscon@fd5cc000 {
-   compatible = "rockchip,rk3588-usbdpphy-grf", "syscon";
-   reg = <0x0 0xfd5cc000 0x0 0x4000>;
-   };
-
-   usb2phy1_grf: syscon@fd5d4000 {
-   compatible = "rockchip,rk3588-usb2phy-grf", "syscon", 
"simple-mfd";
-   reg = <0x0 0xfd5d4000 0x0 0x4000>;
-   #address-cells = <1>;
-   #size-cells = <1>;
-
-   u2phy1: usb2phy@4000 {
-   compatible = "rockchip,rk3588-usb2phy";
-   reg = <0x4000 0x10>;
-   #clock-cells = <0>;
-   clocks = < CLK_USB2PHY_HDPTXRXPHY_REF>;
-   clock-names = "phyclk";
-   clock-output-names = "usb480m_phy1";
-   interrupts = ;
-   resets = < SRST_OTGPHY_U3_1>, < 
SRST_P_USB2PHY_U3_1_GRF0>;
-   reset-names = "phy", "apb";
-   status = "disabled";
-
-   u2phy1_otg: otg-port {
-   #phy-cells = <0>;
-   status = "disabled";
-   };
-   };
-   };
-
-   usbdp_phy1: phy@fed9 {
-   compatible = "rockchip,rk3588-usbdp-phy";
-   reg = <0x0 0xfed9 0x0 0x1>;
-   #phy-cells = <1>;
-   clocks = < CLK_USBDPPHY_MIPIDCPPHY_REF>,
-< CLK_USBDP_PHY1_IMMORTAL>,
-< PCLK_USBDPPHY1>,
-<>;
-   clock-names = "refclk", "immortal", "pclk", "utmi";
-   resets = < SRST_USBDP_COMBO_PHY1_INIT>,
-< SRST_USBDP_COMBO_PHY1_CMN>,
-< SRST_USBDP_COMBO_PHY1_LANE>,
-< SRST_USBDP_COMBO_PHY1_PCS>,
-< SRST_P_USBDPPHY1>;
-   reset-names = "init", "cmn", "lane", "pcs_apb", "pma_apb";
-   rockchip,u2phy-grf = <_grf>;
-   rockchip,usb-grf = <_grf>;
-   rockchip,usbdpphy-grf = <_grf>;
-   rockchip,vo-grf = <_grf>;
-   status = "disabled";
-   };
-};
diff --git a/arch/arm/dts/rk3588s-u-boot.dtsi b/arch/arm/dts/rk3588s-u-boot.dtsi
index e9d38d5c83b..09d8b311cec 100644
--- a/arch/arm/dts/rk3588s-u-boot.dtsi
+++ b/arch/arm/dts/rk3588s-u-boot.dtsi
@@ -19,95 +19,10 @@
bootph-all;
};
 
-   usb_host0_xhci: usb@fc00 {
-   compatible = "rockchip,rk3588-dwc3", "snps,dwc3";
-   reg = <0x0 0xfc00 0x0 0x40>;
-   interrupts = ;
-   clocks = < REF_CLK_USB3OTG0>, < SUSPEND_CLK_USB3OTG0>,
-< ACLK_USB3OTG0>;
-   clock-names = "ref_clk", "suspend_clk", "bus_clk";
-   dr_mode = "otg";
-   phys = <_otg>, <_phy0 PHY_TYPE_USB3>;
-   phy-names = "usb2-phy", "usb3-phy";
-   phy_type = "utmi_wide";
-   power-domains = < RK3588_PD_USB>;
-   resets = < SRST_A_USB3OTG0>;
-   snps,dis_enblslpm_quirk;
-   snps,dis-u1-entry-quirk;
-   snps,dis-u2-entry-quirk;
-   snps,dis-u2-freeclk-exists-quirk;
-   snps,dis-del-phy-power-chg-quirk;
-   snps,dis-tx-ipgap-linecheck-quirk;
-   status = "disabled";
-   };
-
-   vo0_grf: syscon@fd5a6000 {
-   compatible = "rockchip,rk3588-vo-grf",