diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-npu-evb-v10.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-npu-evb-v10.dts index 03f97f974a7e..e1cc5a4bf52c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399pro-npu-evb-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-npu-evb-v10.dts @@ -96,6 +96,10 @@ status = "okay"; }; +&combphy { + status = "okay"; +}; + &u2phy { status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-npu.dtsi b/arch/arm64/boot/dts/rockchip/rk3399pro-npu.dtsi index b031ba59cc87..8489ca575613 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399pro-npu.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-npu.dtsi @@ -6,6 +6,7 @@ #include #include #include +#include / { compatible = "rockchip,rk3399pro-npu"; @@ -74,6 +75,8 @@ <&cru SCLK_USB3_OTG0_SUSPEND>; clock-names = "ref_clk", "bus_clk", "suspend_clk"; + assigned-clocks = <&cru SCLK_USB3_OTG0_SUSPEND>; + assigned-clock-rates = <24000000>; #address-cells = <2>; #size-cells = <2>; ranges; @@ -84,12 +87,13 @@ reg = <0x0 0xfd000000 0x0 0x200000>; interrupts = ; dr_mode = "peripheral"; - phys = <&u2phy_otg>; - phy-names = "usb2-phy"; + phys = <&u2phy_otg>, <&combphy PHY_TYPE_USB3>; + phy-names = "usb2-phy", "usb3-phy"; phy_type = "utmi_wide"; snps,dis_enblslpm_quirk; snps,dis-u2-freeclk-exists-quirk; snps,dis_u2_susphy_quirk; + snps,dis_u3_susphy_quirk; snps,dis-del-phy-power-chg-quirk; snps,tx-ipgap-linecheck-dis-quirk; power-domains = <&power RK1808_PD_PCIE>; @@ -141,6 +145,11 @@ }; }; + combphy_grf: syscon@fe018000 { + compatible = "rockchip,usb3phy-grf", "syscon"; + reg = <0x0 0xfe018000 0x0 0x8000>; + }; + pmugrf: syscon@fe020000 { compatible = "rockchip,rk1808-pmugrf", "syscon", "simple-mfd"; reg = <0x0 0xfe020000 0x0 0x1000>; @@ -235,6 +244,22 @@ <100000000>; }; + combphy: phy@ff380000 { + compatible = "rockchip,rk1808-combphy"; + reg = <0x0 0xff380000 0x0 0x10000>; + #phy-cells = <1>; + clocks = <&cru SCLK_PCIEPHY_REF>; + clock-names = "refclk"; + assigned-clocks = <&cru SCLK_PCIEPHY_REF>; + assigned-clock-rates = <25000000>; + resets = <&cru SRST_USB3_OTG_A>, <&cru SRST_PCIEPHY_POR>, + <&cru SRST_PCIEPHY_P>, <&cru SRST_PCIEPHY_PIPE>; + reset-names = "otg-rst", "combphy-por", + "combphy-apb", "combphy-pipe"; + rockchip,combphygrf = <&combphy_grf>; + status = "disabled"; + }; + tsadc: tsadc@ff3a0000 { compatible = "rockchip,rk1808-tsadc"; reg = <0x0 0xff3a0000 0x0 0x100>;