rockchip: Fix RK3328 USB support
Subsystems (6)
cover rockchip: Fix RK3328 USB support
This series support fixes for RK3328 USB.
It has few dependencies and nits.
1. dependencies
https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/
https://patchwork.ozlabs.org/project/uboot/patch/Y5IWpjYLB4aXMy9o@localhost/
2. USB2PHY still working on default syscon.
Thanks,
Jagan.
Jagan Teki (7):
arm64: dts: rockchip: Drop unused rk3328-xhci node
configs: Drop unused XHCI_DWC3 for RK3328 boards
usb: dwc3-generic: Restrict single ctrl node for RK3328
configs: Enable DWC3 USB 3.0 on RK3328 boards
phy: rockchip-inno-usb2: Add USB2 PHY for RK3328
clk: rockchip: rk3328: Return zero for USB480M clocks
configs: rockchip: Enable USB2PHY for RK3328 boards
arch/arm/dts/rk3328-evb-u-boot.dtsi | 5 --- arch/arm/dts/rk3328-roc-cc-u-boot.dtsi | 14 -------- arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi | 5 --- arch/arm/dts/rk3328-rock64-u-boot.dtsi | 15 --------- arch/arm/dts/rk3328-u-boot.dtsi | 11 ------- configs/evb-rk3328_defconfig | 4 ++- configs/nanopi-r2c-rk3328_defconfig | 4 ++- configs/nanopi-r2s-rk3328_defconfig | 4 ++- configs/roc-cc-rk3328_defconfig | 4 ++- configs/rock-pi-e-rk3328_defconfig | 4 ++- configs/rock64-rk3328_defconfig | 4 ++- drivers/clk/rockchip/clk_rk3328.c | 1 + drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 33 +++++++++++++++++++ drivers/usb/dwc3/dwc3-generic.c | 2 +- 14 files changed, 53 insertions(+), 57 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/7 arm64: dts: rockchip: Drop unused rk3328-xhci node
rk3328-xhci has been added due to the fact that the upstream dwc3 is unsupported. Moreover, the driver for rk3328-xhci is not added to the code tree.
By considering these facts and unsupported rk3328-xhci this patch is dropping all related code from DT. However, the DWC3 is fixed now in dwc3-generic and RK3328 USB 3.0 is functional in upcoming patches.
Let's drop it.
--- arch/arm/dts/rk3328-evb-u-boot.dtsi | 5 ----- arch/arm/dts/rk3328-roc-cc-u-boot.dtsi | 14 -------------- arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi | 5 ----- arch/arm/dts/rk3328-rock64-u-boot.dtsi | 15 --------------- arch/arm/dts/rk3328-u-boot.dtsi | 11 ----------- 5 files changed, 50 deletions(-)
arch/arm/dts/rk3328-evb-u-boot.dtsi +0 -5
@@ -44,8 +44,3 @@ /* Integrated PHY unsupported by U-boot */ status = "broken"; }; - -&usb_host0_xhci { - vbus-supply = <&vcc5v0_host_xhci>; - status = "okay"; -};
arch/arm/dts/rk3328-roc-cc-u-boot.dtsi +0 -14
@@ -48,20 +48,6 @@ bootph-pre-ram; }; -&usb_host0_xhci { - vbus-supply = <&vcc_host1_5v>; - status = "okay"; -}; - -/* - * This makes XHCI responsible for toggling VBUS. This is needed to work - * around an issue where either XHCI only works with USB 2.0 or OTG doesn't - * work, depending on how VBUS is configured. Having USB 3.0 seems better. - */ -&vcc_host1_5v { - /delete-property/ regulator-always-on; -}; - /* Need this and all the pinctrl/gpio stuff above to set pinmux */ &vcc_sd { bootph-pre-ram;
arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi +0 -5
@@ -45,11 +45,6 @@ bootph-pre-ram; }; -&usb_host0_xhci { - vbus-supply = <&vcc_host_5v>; - status = "okay"; -}; - /* Need this and all the pinctrl/gpio stuff above to set pinmux */ &vcc_sd { bootph-pre-ram;
arch/arm/dts/rk3328-rock64-u-boot.dtsi +0 -15
@@ -48,21 +48,6 @@ bootph-pre-ram; }; -&usb_host0_xhci { - vbus-supply = <&vcc_host_5v>; - status = "okay"; -}; - -/* - * This makes XHCI responsible for toggling VBUS. This is needed to work - * around an issue where either XHCI only works with USB 2.0 or OTG doesn't - * work, depending on how VBUS is configured. Having USB 3.0 seems better. - */ -&vcc_host_5v { - /delete-property/ regulator-always-on; - /delete-property/ regulator-boot-on; -}; - /* Need this and all the pinctrl/gpio stuff above to set pinmux */ &vcc_sd { bootph-pre-ram;
arch/arm/dts/rk3328-u-boot.dtsi +0 -11
@@ -26,17 +26,6 @@ 0x0 0xff720000 0x0 0x1000 0x0 0xff798000 0x0 0x1000>; }; - - usb_host0_xhci: usb@ff600000 { - compatible = "rockchip,rk3328-xhci"; - reg = <0x0 0xff600000 0x0 0x100000>; - interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>; - snps,dis-enblslpm-quirk; - snps,phyif-utmi-bits = <16>; - snps,dis-u2-freeclk-exists-quirk; - snps,dis-u2-susphy-quirk; - status = "disabled"; - }; }; &cru {
Signature · 1 line
2.25.1
PATCH 2/7 configs: Drop unused XHCI_DWC3 for RK3328 boards
In reply to Jagan TekiDriver support for rk3328 is not supported so drop this unused XHCI_DWC3.
--- configs/evb-rk3328_defconfig | 1 - configs/nanopi-r2c-rk3328_defconfig | 1 - configs/nanopi-r2s-rk3328_defconfig | 1 - configs/roc-cc-rk3328_defconfig | 1 - configs/rock-pi-e-rk3328_defconfig | 1 - configs/rock64-rk3328_defconfig | 1 - 6 files changed, 6 deletions(-)
configs/evb-rk3328_defconfig +0 -1
@@ -93,7 +93,6 @@ CONFIG_SYSRESET=y # CONFIG_TPL_SYSRESET is not set CONFIG_USB=y CONFIG_USB_XHCI_HCD=y -CONFIG_USB_XHCI_DWC3=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y CONFIG_USB_OHCI_HCD=y
configs/nanopi-r2c-rk3328_defconfig +0 -1
@@ -97,7 +97,6 @@ CONFIG_SYSRESET=y # CONFIG_TPL_SYSRESET is not set CONFIG_USB=y CONFIG_USB_XHCI_HCD=y -CONFIG_USB_XHCI_DWC3=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y CONFIG_USB_OHCI_HCD=y
configs/nanopi-r2s-rk3328_defconfig +0 -1
@@ -97,7 +97,6 @@ CONFIG_SYSRESET=y # CONFIG_TPL_SYSRESET is not set CONFIG_USB=y CONFIG_USB_XHCI_HCD=y -CONFIG_USB_XHCI_DWC3=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y CONFIG_USB_OHCI_HCD=y
configs/roc-cc-rk3328_defconfig +0 -1
@@ -102,7 +102,6 @@ CONFIG_SYSRESET=y # CONFIG_TPL_SYSRESET is not set CONFIG_USB=y CONFIG_USB_XHCI_HCD=y -CONFIG_USB_XHCI_DWC3=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y CONFIG_USB_OHCI_HCD=y
configs/rock-pi-e-rk3328_defconfig +0 -1
@@ -103,7 +103,6 @@ CONFIG_SYSRESET=y # CONFIG_TPL_SYSRESET is not set CONFIG_USB=y CONFIG_USB_XHCI_HCD=y -CONFIG_USB_XHCI_DWC3=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y CONFIG_USB_OHCI_HCD=y
configs/rock64-rk3328_defconfig +0 -1
@@ -100,7 +100,6 @@ CONFIG_SYSRESET=y # CONFIG_TPL_SYSRESET is not set CONFIG_USB=y CONFIG_USB_XHCI_HCD=y -CONFIG_USB_XHCI_DWC3=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y CONFIG_USB_OHCI_HCD=y
Signature · 1 line
2.25.1
PATCH 3/7 usb: dwc3-generic: Restrict single ctrl node for RK3328
In reply to Jagan TekiLike Rockchip RK3568, the RK3328 also have single node to represent the glue and ctrl for USB 3.0.
So, use the driver data to use single ctrl for RK3328 DWC3.
---
Note: It has dependency with
https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/
drivers/usb/dwc3/dwc3-generic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/dwc3/dwc3-generic.c +1 -1
@@ -621,7 +621,7 @@ static const struct udevice_id dwc3_glue_ids[] = { { .compatible = "ti,dwc3", .data = (ulong)&ti_ops }, { .compatible = "ti,am437x-dwc3", .data = (ulong)&ti_ops }, { .compatible = "ti,am654-dwc3" }, - { .compatible = "rockchip,rk3328-dwc3" }, + { .compatible = "rockchip,rk3328-dwc3", .data = (ulong)&rk_ops }, { .compatible = "rockchip,rk3399-dwc3" }, { .compatible = "rockchip,rk3568-dwc3", .data = (ulong)&rk_ops }, { .compatible = "qcom,dwc3" },
Signature · 1 line
2.25.1
Re: [PATCH 3/7] usb: dwc3-generic: Restrict single ctrl node for RK3328
Quoted 7 lines · Jagan Teki
Like Rockchip RK3568, the RK3328 also have single node to represent the glue and ctrl for USB 3.0.
So, use the driver data to use single ctrl for RK3328 DWC3.
Cc Marek Vasut <[email protected]>Signed-off-by Jagan Teki <[email protected]>
PATCH 4/7 configs: Enable DWC3 USB 3.0 on RK3328 boards
In reply to Jagan TekiEnable USB 3.0 in all RK3328 boards.
=> usb start
starting USB...
Bus usb@ff5c0000: ehci_generic usb@ff5c0000: Failed to get clocks (ret=-19) Port not available.
Bus usb@ff5d0000: USB OHCI 1.0
Bus usb@ff600000: Register 2000140 NbrPorts 2
Starting the controller
USB XHCI 1.10
Bus usb@ff580000: 1 USB Device(s) found
scanning usb for storage devices... 1 Storage Device(s) found
=> usb tree
USB device tree:
1 Hub (12 Mb/s, 0mA)
U-Boot Root Hub
1 Hub (5 Gb/s, 0mA)
| U-Boot XHCI Host Controller
|
+-2 Mass Storage (5 Gb/s, 224mA)
SanDisk Dual Drive 040130e3ee554b7078843f4eb331646
1 Hub (480 Mb/s, 0mA)
U-Boot Root Hub
--- configs/evb-rk3328_defconfig | 2 ++ configs/nanopi-r2c-rk3328_defconfig | 2 ++ configs/nanopi-r2s-rk3328_defconfig | 2 ++ configs/roc-cc-rk3328_defconfig | 2 ++ configs/rock-pi-e-rk3328_defconfig | 2 ++ configs/rock64-rk3328_defconfig | 2 ++ 6 files changed, 12 insertions(+)
configs/evb-rk3328_defconfig +2 -0
@@ -69,6 +69,7 @@ CONFIG_FASTBOOT_BUF_ADDR=0x800800 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_MISC=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_ETH_DESIGNWARE=y
@@ -100,6 +101,7 @@ CONFIG_USB_OHCI_GENERIC=y CONFIG_USB_DWC2=y CONFIG_USB_DWC3=y # CONFIG_USB_DWC3_GADGET is not set +CONFIG_USB_DWC3_GENERIC=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_SPL_TINY_MEMSET=y
configs/nanopi-r2c-rk3328_defconfig +2 -0
@@ -71,6 +71,7 @@ CONFIG_FASTBOOT_BUF_ADDR=0x800800 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_MISC=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_ETH_DESIGNWARE=y
@@ -104,6 +105,7 @@ CONFIG_USB_OHCI_GENERIC=y CONFIG_USB_DWC2=y CONFIG_USB_DWC3=y # CONFIG_USB_DWC3_GADGET is not set +CONFIG_USB_DWC3_GENERIC=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_SPL_TINY_MEMSET=y
configs/nanopi-r2s-rk3328_defconfig +2 -0
@@ -71,6 +71,7 @@ CONFIG_FASTBOOT_BUF_ADDR=0x800800 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_MISC=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_ETH_DESIGNWARE=y
@@ -104,6 +105,7 @@ CONFIG_USB_OHCI_GENERIC=y CONFIG_USB_DWC2=y CONFIG_USB_DWC3=y # CONFIG_USB_DWC3_GADGET is not set +CONFIG_USB_DWC3_GENERIC=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_SPL_TINY_MEMSET=y
configs/roc-cc-rk3328_defconfig +2 -0
@@ -72,6 +72,7 @@ CONFIG_FASTBOOT_BUF_ADDR=0x800800 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_MISC=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PHY_REALTEK=y
@@ -109,6 +110,7 @@ CONFIG_USB_OHCI_GENERIC=y CONFIG_USB_DWC2=y CONFIG_USB_DWC3=y # CONFIG_USB_DWC3_GADGET is not set +CONFIG_USB_DWC3_GENERIC=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_SPL_TINY_MEMSET=y
configs/rock-pi-e-rk3328_defconfig +2 -0
@@ -73,6 +73,7 @@ CONFIG_FASTBOOT_BUF_ADDR=0x800800 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_MISC=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_ETH_DESIGNWARE=y
@@ -101,6 +102,7 @@ CONFIG_SYSINFO=y CONFIG_SYSINFO_SMBIOS=y CONFIG_SYSRESET=y # CONFIG_TPL_SYSRESET is not set +CONFIG_USB_DWC3_GENERIC=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_EHCI_HCD=y
configs/rock64-rk3328_defconfig +2 -0
@@ -71,6 +71,7 @@ CONFIG_FASTBOOT_BUF_ADDR=0x800800 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_MISC=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_SPI_FLASH_GIGADEVICE=y
@@ -107,6 +108,7 @@ CONFIG_USB_OHCI_GENERIC=y CONFIG_USB_DWC2=y CONFIG_USB_DWC3=y # CONFIG_USB_DWC3_GADGET is not set +CONFIG_USB_DWC3_GENERIC=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_SPL_TINY_MEMSET=y
Signature · 1 line
2.25.1
PATCH 5/7 phy: rockchip-inno-usb2: Add USB2 PHY for RK3328
In reply to Jagan TekiUSB2.0 Host and OTG controllers in RK3328 are using USB2PHY.
Add support for it.
--- drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+)
drivers/phy/rockchip/phy-rockchip-inno-usb2.c +33 -0
@@ -267,6 +267,35 @@ static int rockchip_usb2phy_bind(struct udevice *dev)return ret; } +static const struct rockchip_usb2phy_cfg rk3328_usb2phy_cfgs[] = { + { + .reg =0x100 , + .port_cfgs = { + [USB2PHY_PORT_OTG ] = { + .phy_sus = {0x0100 ,15 ,0 ,0 ,0x1d1 }, + .bvalid_det_en = {0x0110 ,3 ,2 ,0 ,3 }, + .bvalid_det_st = {0x0114 ,3 ,2 ,0 ,3 }, + .bvalid_det_clr = {0x0118 ,3 ,2 ,0 ,3 }, + .ls_det_en = {0x0110 ,0 ,0 ,0 ,1 }, + .ls_det_st = {0x0114 ,0 ,0 ,0 ,1 }, + .ls_det_clr = {0x0118 ,0 ,0 ,0 ,1 }, + .utmi_avalid = {0x0120 ,10 ,10 ,0 ,1 }, + .utmi_bvalid = {0x0120 ,9 ,9 ,0 ,1 }, + .utmi_ls = {0x0120 ,5 ,4 ,0 ,1 }, + }, + [USB2PHY_PORT_HOST ] = { + .phy_sus = {0x104 ,15 ,0 ,0 ,0x1d1 }, + .ls_det_en = {0x110 ,1 ,1 ,0 ,1 }, + .ls_det_st = {0x114 ,1 ,1 ,0 ,1 }, + .ls_det_clr = {0x118 ,1 ,1 ,0 ,1 }, + .utmi_ls = {0x120 ,17 ,16 ,0 ,1 }, + .utmi_hstdet = {0x120 ,19 ,19 ,0 ,1 } + } + }, + }, + {/* sentinel */ } +}; +static const struct rockchip_usb2phy_cfg rk3399_usb2phy_cfgs[] = { { .reg =0xe450 ,
@@ -416,6 +445,10 @@ static const struct rockchip_usb2phy_cfg rk3588_phy_cfgs[] = { };static const struct udevice_id rockchip_usb2phy_ids[] = { + { + .compatible ="rockchip,rk3328-usb2phy" , + .data = (ulong)&rk3328_usb2phy_cfgs, + }, { .compatible ="rockchip,rk3399-usb2phy" , .data = (ulong)&rk3399_usb2phy_cfgs,
Signature · 1 line
2.25.1
PATCH 6/7 clk: rockchip: rk3328: Return zero for USB480M clocks
In reply to Jagan TekiRK3328 u2phy has assigned-clock-rates on USB480M, return zero for them since the default rates will work fine.
--- drivers/clk/rockchip/clk_rk3328.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/rockchip/clk_rk3328.c +1 -0
@@ -681,6 +681,7 @@ static ulong rk3328_clk_set_rate(struct clk *clk, ulong rate)case ACLK_GMAC :case PCLK_GMAC :case SCLK_USB3OTG_SUSPEND : +case USB480M :return 0 ;default :return -ENOENT ;
Signature · 1 line
2.25.1
PATCH 7/7 configs: rockchip: Enable USB2PHY for RK3328 boards
In reply to Jagan TekiEnable USB2PHY for all RK3328 boards.
--- configs/evb-rk3328_defconfig | 1 + configs/nanopi-r2c-rk3328_defconfig | 1 + configs/nanopi-r2s-rk3328_defconfig | 1 + configs/roc-cc-rk3328_defconfig | 1 + configs/rock-pi-e-rk3328_defconfig | 1 + configs/rock64-rk3328_defconfig | 1 + 6 files changed, 6 insertions(+)
configs/evb-rk3328_defconfig +1 -0
@@ -74,6 +74,7 @@ CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y +CONFIG_PHY_ROCKCHIP_INNO_USB2=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_DM_PMIC=y
configs/nanopi-r2c-rk3328_defconfig +1 -0
@@ -76,6 +76,7 @@ CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y +CONFIG_PHY_ROCKCHIP_INNO_USB2=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_DM_PMIC=y
configs/nanopi-r2s-rk3328_defconfig +1 -0
@@ -76,6 +76,7 @@ CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y +CONFIG_PHY_ROCKCHIP_INNO_USB2=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_DM_PMIC=y
configs/roc-cc-rk3328_defconfig +1 -0
@@ -79,6 +79,7 @@ CONFIG_PHY_REALTEK=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y +CONFIG_PHY_ROCKCHIP_INNO_USB2=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_DM_PMIC=y
configs/rock-pi-e-rk3328_defconfig +1 -0
@@ -78,6 +78,7 @@ CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y +CONFIG_PHY_ROCKCHIP_INNO_USB2=y CONFIG_PHY=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y
configs/rock64-rk3328_defconfig +1 -0
@@ -77,6 +77,7 @@ CONFIG_MMC_DW_ROCKCHIP=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y +CONFIG_PHY_ROCKCHIP_INNO_USB2=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_DM_PMIC=y
Signature · 1 line
2.25.1