From f775bd5fb3b1a340491381320b0be47972dcbf90 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sun, 18 Jul 2021 03:48:10 +0000 Subject: [PATCH] linux (Rockchip): 5.10.51 upstreamed rk3328 usb3 Full patch remove: - arm64: dts: rockchip: add rk3328 usb3 and usb3phy nodes - partially included in 5.10.51 --- .../linux-0004-rockchip-from-list.patch | 141 ------------------ .../default/linux-1003-for-libreelec.patch | 76 ---------- 2 files changed, 217 deletions(-) diff --git a/projects/Rockchip/patches/linux/default/linux-0004-rockchip-from-list.patch b/projects/Rockchip/patches/linux/default/linux-0004-rockchip-from-list.patch index 9f6ba3f32c..aeabfcd4cb 100644 --- a/projects/Rockchip/patches/linux/default/linux-0004-rockchip-from-list.patch +++ b/projects/Rockchip/patches/linux/default/linux-0004-rockchip-from-list.patch @@ -1067,147 +1067,6 @@ index 000000000000..7007ddbcbdae +MODULE_DESCRIPTION("DesignWare USB3 Rockchip Innosilicon Glue Layer"); +MODULE_AUTHOR("Peter Geis "); -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Peter Geis -Date: Mon, 16 Nov 2020 15:17:35 +0000 -Subject: [PATCH] arm64: dts: rockchip: add rk3328 usb3 and usb3phy nodes - -Add the usb3 controller and usb3 phy nodes to the rk3328. - -Signed-off-by: Peter Geis ---- - arch/arm64/boot/dts/rockchip/rk3328.dtsi | 65 ++++++++++++++++++++++++ - 1 file changed, 65 insertions(+) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -index 17709faf651b..d327fd300116 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -@@ -856,6 +856,40 @@ u2phy_host: host-port { - }; - }; - -+ usb3phy: usb3-phy@ff470000 { -+ compatible = "rockchip,rk3328-usb3phy"; -+ reg = <0x0 0xff460000 0x0 0x10000>; -+ clocks = <&cru PCLK_USB3PHY_OTG>, <&cru PCLK_USB3PHY_PIPE>; -+ clock-names = "usb3phy-otg", "usb3phy-pipe"; -+ resets = <&cru SRST_USB3PHY_U2>, -+ <&cru SRST_USB3PHY_U3>, -+ <&cru SRST_USB3PHY_PIPE>, -+ <&cru SRST_USB3OTG_UTMI>, -+ <&cru SRST_USB3PHY_OTG_P>, -+ <&cru SRST_USB3PHY_PIPE_P>; -+ reset-names = "usb3phy-u2-por", "usb3phy-u3-por", -+ "usb3phy-pipe-mac", "usb3phy-utmi-mac", -+ "usb3phy-utmi-apb", "usb3phy-pipe-apb"; -+ #address-cells = <2>; -+ #size-cells = <2>; -+ ranges; -+ status = "disabled"; -+ -+ usb3phy_utmi: utmi@ff470000 { -+ compatible = "rockchip,rk3328-usb3phy-utmi"; -+ reg = <0x0 0xff470000 0x0 0x8000>; -+ #phy-cells = <0>; -+ status = "disabled"; -+ }; -+ -+ usb3phy_pipe: pipe@ff478000 { -+ compatible = "rockchip,rk3328-usb3phy-pipe"; -+ reg = <0x0 0xff478000 0x0 0x8000>; -+ #phy-cells = <0>; -+ status = "disabled"; -+ }; -+ }; -+ - sdmmc: mmc@ff500000 { - compatible = "rockchip,rk3328-dw-mshc", "rockchip,rk3288-dw-mshc"; - reg = <0x0 0xff500000 0x0 0x4000>; -@@ -987,6 +1021,37 @@ usb_host0_ohci: usb@ff5d0000 { - status = "disabled"; - }; - -+ usbdrd3: usb@ff600000 { -+ compatible = "rockchip,rk3328-dwc3"; -+ clocks = <&cru SCLK_USB3OTG_REF>, <&cru ACLK_USB3OTG>, -+ <&cru SCLK_USB3OTG_SUSPEND>; -+ clock-names = "ref", "bus_early", "suspend"; -+ #address-cells = <2>; -+ #size-cells = <2>; -+ ranges; -+ status = "disabled"; -+ -+ usbdrd_dwc3: dwc3@ff600000 { -+ compatible = "snps,dwc3"; -+ reg = <0x0 0xff600000 0x0 0x100000>; -+ interrupts = ; -+ clocks = <&cru SCLK_USB3OTG_REF>, <&cru ACLK_USB3OTG>, -+ <&cru SCLK_USB3OTG_SUSPEND>; -+ clock-names = "ref", "bus_early", "suspend"; -+ dr_mode = "host"; -+ usb-phy = <&usb3phy_utmi>, <&usb3phy_pipe>; -+ 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,dis-tx-ipgap-linecheck-quirk; -+ snps,xhci-trb-ent-quirk; -+ status = "disabled"; -+ }; -+ }; -+ - gic: interrupt-controller@ff811000 { - compatible = "arm,gic-400"; - #interrupt-cells = <3>; - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Peter Geis -Date: Mon, 16 Nov 2020 15:17:36 +0000 -Subject: [PATCH] arm64: dts: rockchip: enable usb3 on rk3328-roc-cc board - -Enable the usb3 controller and usb3 phy nodes on the rk3328-roc-cc board file. - -Signed-off-by: Peter Geis ---- - .../arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 21 +++++++++++++++++++ - 1 file changed, 21 insertions(+) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts -index 19959bfba451..3ac876c08d61 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts -@@ -366,6 +366,27 @@ &usb_host0_ohci { - status = "okay"; - }; - -+&usbdrd3 { -+ status = "okay"; -+}; -+ -+&usbdrd_dwc3 { -+ dr_mode = "host"; -+ status = "okay"; -+}; -+ -+&usb3phy { -+ status = "okay"; -+}; -+ -+&usb3phy_utmi { -+ status = "okay"; -+}; -+ -+&usb3phy_pipe { -+ status = "okay"; -+}; -+ - &vop { - status = "okay"; - }; - From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Sun, 17 Feb 2019 22:14:38 +0000 diff --git a/projects/Rockchip/patches/linux/default/linux-1003-for-libreelec.patch b/projects/Rockchip/patches/linux/default/linux-1003-for-libreelec.patch index 58fc60ada5..b49f6b9dc8 100644 --- a/projects/Rockchip/patches/linux/default/linux-1003-for-libreelec.patch +++ b/projects/Rockchip/patches/linux/default/linux-1003-for-libreelec.patch @@ -1,79 +1,3 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Alex Bee -Date: Sat, 16 Jan 2021 12:24:58 +0000 -Subject: [PATCH] arm64: dts: rockchip: enable USB3 for supported RK3328 boards - -Signed-off-by: Alex Bee ---- - arch/arm64/boot/dts/rockchip/rk3328-a1.dts | 21 +++++++++++++++++++ - .../arm64/boot/dts/rockchip/rk3328-rock64.dts | 21 +++++++++++++++++++ - 2 files changed, 42 insertions(+) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3328-a1.dts b/arch/arm64/boot/dts/rockchip/rk3328-a1.dts -index 37f307cfa4cc..4013f16bb368 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3328-a1.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3328-a1.dts -@@ -352,6 +352,27 @@ &usb_host0_ehci { - status = "okay"; - }; - -+&usbdrd3 { -+ status = "okay"; -+}; -+ -+&usbdrd_dwc3 { -+ dr_mode = "host"; -+ status = "okay"; -+}; -+ -+&usb3phy { -+ status = "okay"; -+}; -+ -+&usb3phy_utmi { -+ status = "okay"; -+}; -+ -+&usb3phy_pipe { -+ status = "okay"; -+}; -+ - &vop { - status = "okay"; - }; -diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts -index c984662043da..89fde87f7650 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts -@@ -384,6 +384,27 @@ &usb_host0_ohci { - status = "okay"; - }; - -+&usbdrd3 { -+ status = "okay"; -+}; -+ -+&usbdrd_dwc3 { -+ dr_mode = "host"; -+ status = "okay"; -+}; -+ -+&usb3phy { -+ status = "okay"; -+}; -+ -+&usb3phy_utmi { -+ status = "okay"; -+}; -+ -+&usb3phy_pipe { -+ status = "okay"; -+}; -+ - &vop { - status = "okay"; - }; - From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alex Bee Date: Wed, 2 Sep 2020 19:52:02 +0200