Add Rockchip USBPHY DM driver
Subsystems (5)
v4 cover Add Rockchip USBPHY DM driver
The Rockchip SoCs with an USB node and compatible = "snps,dwc2" can be HOST or OTG while the PHY driver is hard coded and initiated in the board.c file. Above construction is not very U-boot DM alike. This is an attempt to decouple the USBPHY into a DM driver.
On older Rockchip SOCs an usbphy DT node is placed under a SYSCOM node.
grf: grf@20008000 {
usbphy: usbphy {
usbphy0: usb-phy@17c {
};
usbphy1: usb-phy@188 {
};
};
};Changed V2:
Add grf function that binds the usbphy driver to the grf syscom driver.
=> dm tree
Class Seq Probed Driver Name
-----------------------------------------------------------
syscon 9 [ + ] rk3066_syscon |-- grf@20008000 nop 0 [ + ] rockchip_usbphy | `-- usbphy phy 0 [ + ] rockchip_usbphy_port | |-- usb-phy@17c phy 1 [ + ] rockchip_usbphy_port | `-- usb-phy@188
Changed V3:
rebase
compile rk3066 SPL with SPL_OF_REAL
add SCLK_OTGPHYx enable and disable
make drivers available in SPL
enable USB in SPL for MK808
Changed V4:
restyle
remove clk patches
remove reset patch
(Jonas)
reword
replaced deprecated help word
call dm_scan_fdt_dev to bind grf child
split Makefile and Kconfig sort
fixup SPL_PHY_ROCKCHIP_USB2
remove DECLARE_GLOBAL_DATA_PTR
add bind rollback
use device_get_supply_regulator
use regulator_set_enable_if_allowed
use reset_assert_bulk functions
init the port in the port probe function
protect against a blank struct
remove of_xlate
remove select RESET_ROCKCHIP
use uclass_find_device_by_of_offset
Johan Jonker (10):
rockchip: configs: compile rk3066 SPL with SPL_OF_REAL
usb: Kconfig: add SPL_USB_DWC2
phy: rockchip: sort Makefile and Kconfig
rockchip: bind grf syscon usbphy subnode
phy: rockchip: add phy-rockchip-usb2.c
rockchip: configs: use phy-rockchip-usb2 DM driver
usb: phy: remove rockchip_usb2_phy.c
rockchip: spl-boot-order: add usb boot option
arm: dts: rockchip: add USB required properties in SPL for mk808
rockchip: configs: enable USB in SPL for mk808
arch/arm/dts/rk3066a-mk808-u-boot.dtsi | 18 ++ arch/arm/mach-rockchip/board.c | 28 --- arch/arm/mach-rockchip/rk3066/syscon_rk3066.c | 3 + arch/arm/mach-rockchip/rk3188/syscon_rk3188.c | 3 + arch/arm/mach-rockchip/rk3288/syscon_rk3288.c | 3 + arch/arm/mach-rockchip/spl-boot-order.c | 3 + configs/chromebit_mickey_defconfig | 2 +- configs/chromebook_jerry_defconfig | 2 +- configs/chromebook_minnie_defconfig | 2 +- configs/chromebook_speedy_defconfig | 2 +- configs/evb-rk3288-rk808_defconfig | 2 +- configs/firefly-rk3288_defconfig | 4 +- configs/miqi-rk3288_defconfig | 4 +- configs/mk808_defconfig | 17 +- configs/phycore-rk3288_defconfig | 2 +- configs/popmetal-rk3288_defconfig | 2 +- configs/rock-pi-n8-rk3288_defconfig | 2 +- configs/rock2_defconfig | 2 +- configs/rock_defconfig | 2 +- configs/tinker-rk3288_defconfig | 4 +- configs/tinker-s-rk3288_defconfig | 4 +- configs/vyasa-rk3288_defconfig | 2 +- drivers/Makefile | 3 +- drivers/phy/rockchip/Kconfig | 41 ++- drivers/phy/rockchip/Makefile | 7 +- drivers/phy/rockchip/phy-rockchip-usb2.c | 235 ++++++++++++++++++ drivers/usb/common/Makefile | 2 +- drivers/usb/host/Kconfig | 11 + drivers/usb/host/Makefile | 2 +- drivers/usb/phy/Kconfig | 3 - drivers/usb/phy/Makefile | 1 - drivers/usb/phy/rockchip_usb2_phy.c | 113 --------- include/usb/dwc2_udc.h | 1 - 33 files changed, 338 insertions(+), 194 deletions(-) create mode 100644 drivers/phy/rockchip/phy-rockchip-usb2.c delete mode 100644 drivers/usb/phy/rockchip_usb2_phy.c
--
2.39.5
PATCH v4 1/10 rockchip: configs: compile rk3066 SPL with SPL_OF_REAL
Unlike later Rockchip models the rk3066 SOC has no build-in support for SD/MMC cards in the boot phase. The current workaround in SPL probes the rockchip_dwmmc driver with OF_PLATDATA. For a simple board as MK808 with MMC that just works fine, but for more complex boot options not all required drivers come with OF_PLATDATA support, so compile rk3066 SPL with SPL_OF_REAL. Update mk808_defconfig.
--- configs/mk808_defconfig | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
configs/mk808_defconfig +3 -9
@@ -16,16 +16,17 @@ CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_ENV_SIZE=0x8000 CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3066a-mk808" CONFIG_DM_RESET=y +CONFIG_SPL_SYS_MALLOC_F_LEN=0x8000 CONFIG_ROCKCHIP_RK3066=y # CONFIG_ROCKCHIP_STIMER is not set CONFIG_TPL_TEXT_BASE=0x10080c00 CONFIG_TPL_STACK=0x1008FFFF +CONFIG_TPL_SYS_MALLOC_F_LEN=0x0800 CONFIG_TARGET_MK808=y CONFIG_SPL_STACK_R_ADDR=0x70000000 -CONFIG_SPL_STACK=0x1008ffff CONFIG_SPL_TEXT_BASE=0x60000000 CONFIG_SPL_STACK_R=y -CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x200000 +CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x300000 CONFIG_SYS_LOAD_ADDR=0x70800800 CONFIG_DEBUG_UART_BASE=0x20064000 CONFIG_DEBUG_UART_CLOCK=24000000
@@ -43,9 +44,6 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_BOARD_LATE_INIT=y CONFIG_SPL_MAX_SIZE=0x32000 CONFIG_SPL_NO_BSS_LIMIT=y -# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set -CONFIG_SPL_HAVE_INIT_STACK=y -CONFIG_SPL_SEPARATE_BSS=y CONFIG_SPL_FS_EXT4=y CONFIG_SYS_MMCSD_FS_BOOT_PARTITION=2 CONFIG_TPL_HAVE_INIT_STACK=y
@@ -65,14 +63,10 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_TPL_OF_CONTROL=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_OF_DTB_PROPS_REMOVE=y -CONFIG_SPL_OF_PLATDATA=y CONFIG_TPL_OF_PLATDATA=y CONFIG_ENV_RELOC_GD_ENV_ADDR=y CONFIG_NO_NET=y CONFIG_TPL_DM=y -CONFIG_REGMAP=y -CONFIG_SPL_REGMAP=y -CONFIG_TPL_REGMAP=y CONFIG_SYSCON=y CONFIG_SPL_SYSCON=y CONFIG_TPL_SYSCON=y
--
2.39.5
PATCH v4 2/10 usb: Kconfig: add SPL_USB_DWC2
In reply to Johan JonkerThe config SPL_DM_USB gives the user the option to be more selective in what phase the USB drivers should enabled.
Pass this concept to the dwc2_usb driver and make a SPL_USB_DWC2 config available in SPL to load U-boot (full) from a USB disk.
---
Note:
There are no boards with SPL_DM_USB and USB_DWC2 enabled, so no need for a default y.
grep -l SPL_DM_USB grep -l USB_DWC2 ./configs/*
Changed V4:
(Jonas)
reword
replaced deprecated help word
--- drivers/Makefile | 3 ++- drivers/usb/common/Makefile | 2 +- drivers/usb/host/Kconfig | 11 +++++++++++ drivers/usb/host/Makefile | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-)
drivers/Makefile +2 -1
@@ -68,8 +68,9 @@ obj-$(CONFIG_SPL_MUSB_NEW) += usb/musb-new/ obj-$(CONFIG_SPL_USB_GADGET) += usb/gadget/ obj-$(CONFIG_SPL_USB_GADGET) += usb/common/ obj-$(CONFIG_SPL_USB_GADGET) += usb/gadget/udc/ -obj-$(CONFIG_SPL_WATCHDOG) += watchdog/ +obj-$(CONFIG_SPL_USB_HOST) += usb/common/ obj-$(CONFIG_SPL_USB_HOST) += usb/host/ +obj-$(CONFIG_SPL_WATCHDOG) += watchdog/ obj-$(CONFIG_SPL_SATA) += ata/ scsi/ obj-$(CONFIG_SPL_LEGACY_BLOCK) += block/ obj-$(CONFIG_SPL_THERMAL) += thermal/
drivers/usb/common/Makefile +1 -1
@@ -4,7 +4,7 @@ # obj-$(CONFIG_$(PHASE_)DM_USB) += common.o -obj-$(CONFIG_USB_DWC2) += dwc2_core.o +obj-$(CONFIG_$(PHASE_)USB_DWC2) += dwc2_core.o obj-$(CONFIG_USB_GADGET_DWC2_OTG) += dwc2_core.o obj-$(CONFIG_USB_ISP1760) += usb_urb.o obj-$(CONFIG_USB_MUSB_HOST) += usb_urb.o
drivers/usb/host/Kconfig +11 -0
@@ -417,6 +417,17 @@ config USB_DWC2 operation is compliant to the controller Supplement. If you want to enable this controller in host mode, say Y. +config SPL_USB_DWC2 + bool "DesignWare USB2 Core support in SPL" + depends on SPL_DM && SPL_OF_CONTROL + select SPL_USB_HOST + help + The DesignWare USB 2.0 controller is compliant with the + USB-Implementers Forum (USB-IF) USB 2.0 specifications. + Hi-Speed (480 Mbps), Full-Speed (12 Mbps), and Low-Speed (1.5 Mbps) + operation is compliant to the controller Supplement. If you want to + enable this controller in host mode, say Y. + if USB_DWC2 config USB_DWC2_BUFFER_SIZE int "Data buffer size in kB"
drivers/usb/host/Makefile +1 -1
@@ -57,4 +57,4 @@ obj-$(CONFIG_USB_XHCI_RCAR) += xhci-rcar.o obj-$(CONFIG_USB_XHCI_OCTEON) += dwc3-octeon-glue.o # designware -obj-$(CONFIG_USB_DWC2) += dwc2.o +obj-$(CONFIG_$(PHASE_)USB_DWC2) += dwc2.o
--
2.39.5
PATCH v4 3/10 phy: rockchip: sort Makefile and Kconfig
In reply to Johan JonkerSort Makefile and Kconfig, so that new phy drivers entries insert in a clean proper orderly way.
--- drivers/phy/rockchip/Kconfig | 27 ++++++++++++++------------- drivers/phy/rockchip/Makefile | 6 +++--- 2 files changed, 17 insertions(+), 16 deletions(-)
drivers/phy/rockchip/Kconfig +14 -13
@@ -17,7 +17,7 @@ config PHY_ROCKCHIP_INNO_HDMI depends on ARCH_ROCKCHIP select PHY help - Enable this to support the Rockchip Innosilicon HDMI PHY. + Support for Rockchip Innosilicon HDMI PHY. config PHY_ROCKCHIP_INNO_USB2 bool "Rockchip INNO USB2PHY Driver"
@@ -27,40 +27,41 @@ config PHY_ROCKCHIP_INNO_USB2 Support for Rockchip USB2.0 PHY with Innosilicon IP block. config PHY_ROCKCHIP_NANENG_COMBOPHY - bool "Support Rockchip NANENG combo PHY Driver" + bool "Rockchip NANENG combo PHY Driver" depends on ARCH_ROCKCHIP select PHY help - Enable this to support the Rockchip NANENG combo PHY. + Support for Rockchip NANENG combo PHY. config PHY_ROCKCHIP_PCIE bool "Rockchip PCIe PHY Driver" depends on ARCH_ROCKCHIP select PHY help - Enable this to support the Rockchip PCIe PHY. + Support for Rockchip PCIe PHY. config PHY_ROCKCHIP_SNPS_PCIE3 - bool "Rockchip Snps PCIe3 PHY Driver" - depends on PHY && ARCH_ROCKCHIP + bool "Rockchip SNPS PCIe3 PHY Driver" + depends on ARCH_ROCKCHIP + select PHY help Support for Rockchip PCIe3 PHY with Synopsys IP block. It could support PCIe Gen3 single root complex, and could also be able splited into multiple combinations of lanes. -config PHY_ROCKCHIP_USBDP - tristate "Rockchip USBDP COMBO PHY Driver" +config PHY_ROCKCHIP_TYPEC + bool "Rockchip TYPEC PHY Driver" depends on ARCH_ROCKCHIP select PHY help - Enable this to support the Rockchip USB3.0/DP - combo PHY with Samsung IP block. + Support for Rockchip USB TYPEC PHY. -config PHY_ROCKCHIP_TYPEC - bool "Rockchip TYPEC PHY Driver" +config PHY_ROCKCHIP_USBDP + bool "Rockchip USBDP COMBO PHY Driver" depends on ARCH_ROCKCHIP select PHY help - Enable this to support the Rockchip USB TYPEC PHY. + Support for Rockchip USB3.0/DP + combo PHY with Samsung IP block. endmenu
drivers/phy/rockchip/Makefile +3 -3
@@ -3,11 +3,11 @@ # Copyright (C) 2020 Amarula Solutions(India) # +obj-$(CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY) += phy-rockchip-inno-dsidphy.o obj-$(CONFIG_PHY_ROCKCHIP_INNO_HDMI) += phy-rockchip-inno-hdmi.o obj-$(CONFIG_PHY_ROCKCHIP_INNO_USB2) += phy-rockchip-inno-usb2.o -obj-$(CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY) += phy-rockchip-naneng-combphy.o +obj-$(CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY) += phy-rockchip-naneng-combphy.o obj-$(CONFIG_PHY_ROCKCHIP_PCIE) += phy-rockchip-pcie.o obj-$(CONFIG_PHY_ROCKCHIP_SNPS_PCIE3) += phy-rockchip-snps-pcie3.o obj-$(CONFIG_PHY_ROCKCHIP_TYPEC) += phy-rockchip-typec.o -obj-$(CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY) += phy-rockchip-inno-dsidphy.o -obj-$(CONFIG_PHY_ROCKCHIP_USBDP) += phy-rockchip-usbdp.o +obj-$(CONFIG_PHY_ROCKCHIP_USBDP) += phy-rockchip-usbdp.o
--
2.39.5
PATCH v4 4/10 rockchip: bind grf syscon usbphy subnode
In reply to Johan JonkerThe RK3066/RK3188/RK3288 SoC's have a grf usbphy subnode that doesn't show up in DM by it's self, so call dm_scan_fdt_dev to bind grf child devices in the device tree.
--- arch/arm/mach-rockchip/rk3066/syscon_rk3066.c | 3 +++ arch/arm/mach-rockchip/rk3188/syscon_rk3188.c | 3 +++ arch/arm/mach-rockchip/rk3288/syscon_rk3288.c | 3 +++ 3 files changed, 9 insertions(+)
arch/arm/mach-rockchip/rk3066/syscon_rk3066.c +3 -0
@@ -20,6 +20,9 @@ U_BOOT_DRIVER(syscon_rk3066) = { .name = "rk3066_syscon", .id = UCLASS_SYSCON, .of_match = rk3066_syscon_ids, +#if CONFIG_IS_ENABLED (OF_REAL ) + .bind = dm_scan_fdt_dev, +#endif };#if CONFIG_IS_ENABLED (OF_PLATDATA )
arch/arm/mach-rockchip/rk3188/syscon_rk3188.c +3 -0
@@ -20,6 +20,9 @@ U_BOOT_DRIVER(syscon_rk3188) = { .name = "rk3188_syscon", .id = UCLASS_SYSCON, .of_match = rk3188_syscon_ids, +#if CONFIG_IS_ENABLED (OF_REAL ) + .bind = dm_scan_fdt_dev, +#endif };#if CONFIG_IS_ENABLED (OF_PLATDATA )
arch/arm/mach-rockchip/rk3288/syscon_rk3288.c +3 -0
@@ -24,6 +24,9 @@ U_BOOT_DRIVER(syscon_rk3288) = { .name = "rk3288_syscon", .id = UCLASS_SYSCON, .of_match = rk3288_syscon_ids, +#if CONFIG_IS_ENABLED (OF_REAL ) + .bind = dm_scan_fdt_dev, +#endif };#if CONFIG_IS_ENABLED (OF_PLATDATA )
--
2.39.5
PATCH v4 5/10 phy: rockchip: add phy-rockchip-usb2.c
In reply to Johan JonkerAdd phy-rockchip-usb2.c driver with support
for RK3066, RK3188 and RK3288 pdata.
---
Changed V4:
restyle
remove clk
(Jonas)
split Makefile and Kconfig sort
fixup SPL_PHY_ROCKCHIP_USB2
remove DECLARE_GLOBAL_DATA_PTR
add bind rollback
use device_get_supply_regulator
use regulator_set_enable_if_allowed
use reset_assert_bulk functions
init the port in the port probe function
protect against a blank struct
remove of_xlate
remove RESET_ROCKCHIP
Changed V2:
add DM_FLAG_PROBE_AFTER_BIND
restyle
--- drivers/phy/rockchip/Kconfig | 14 ++ drivers/phy/rockchip/Makefile | 1 + drivers/phy/rockchip/phy-rockchip-usb2.c | 235 +++++++++++++++++++++++ 3 files changed, 250 insertions(+) create mode 100644 drivers/phy/rockchip/phy-rockchip-usb2.c
drivers/phy/rockchip/Kconfig +14 -0
@@ -56,6 +56,20 @@ config PHY_ROCKCHIP_TYPEC help Support for Rockchip USB TYPEC PHY. +config PHY_ROCKCHIP_USB2 + bool "Rockchip USB2 PHY" + depends on ARCH_ROCKCHIP + select PHY + help + Support for Rockchip USB 2.0 PHY. + +config SPL_PHY_ROCKCHIP_USB2 + bool "Rockchip USB2 PHY in SPL" + depends on ARCH_ROCKCHIP && SPL + select SPL_PHY + help + Support for Rockchip USB 2.0 PHY. + config PHY_ROCKCHIP_USBDP bool "Rockchip USBDP COMBO PHY Driver" depends on ARCH_ROCKCHIP
drivers/phy/rockchip/Makefile +1 -0
@@ -10,4 +10,5 @@ obj-$(CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY) += phy-rockchip-naneng-combphy.o obj-$(CONFIG_PHY_ROCKCHIP_PCIE) += phy-rockchip-pcie.o obj-$(CONFIG_PHY_ROCKCHIP_SNPS_PCIE3) += phy-rockchip-snps-pcie3.o obj-$(CONFIG_PHY_ROCKCHIP_TYPEC) += phy-rockchip-typec.o +obj-$(CONFIG_$(PHASE_)PHY_ROCKCHIP_USB2) += phy-rockchip-usb2.o obj-$(CONFIG_PHY_ROCKCHIP_USBDP) += phy-rockchip-usbdp.o
drivers/phy/rockchip/phy-rockchip-usb2.c new file +235 -0
235 lines not on this page · raw message
--
2.39.5
PATCH v4 6/10 rockchip: configs: use phy-rockchip-usb2 DM driver
In reply to Johan JonkerThe new phy-rockchip-usb2 DM driver is now available. Update defconfigs for RK3066/RK3188/RK3288.
---
Changed V4:
(Jonas)
split patch
remove CONFIG_DM_RESET
--- configs/chromebit_mickey_defconfig | 2 +- configs/chromebook_jerry_defconfig | 2 +- configs/chromebook_minnie_defconfig | 2 +- configs/chromebook_speedy_defconfig | 2 +- configs/evb-rk3288-rk808_defconfig | 2 +- configs/firefly-rk3288_defconfig | 4 ++-- configs/miqi-rk3288_defconfig | 4 ++-- configs/mk808_defconfig | 2 +- configs/phycore-rk3288_defconfig | 2 +- configs/popmetal-rk3288_defconfig | 2 +- configs/rock-pi-n8-rk3288_defconfig | 2 +- configs/rock2_defconfig | 2 +- configs/rock_defconfig | 2 +- configs/tinker-rk3288_defconfig | 4 ++-- configs/tinker-s-rk3288_defconfig | 4 ++-- configs/vyasa-rk3288_defconfig | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-)
configs/chromebit_mickey_defconfig +1 -1
@@ -82,6 +82,7 @@ CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y +CONFIG_PHY_ROCKCHIP_USB2=y CONFIG_PINCTRL=y CONFIG_PINCONF=y CONFIG_SPL_PINCTRL=y
@@ -102,7 +103,6 @@ CONFIG_SYSRESET=y CONFIG_USB=y # CONFIG_SPL_DM_USB is not set CONFIG_USB_DWC2=y -CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_VIDEO=y # CONFIG_VIDEO_BPP8 is not set CONFIG_CONSOLE_TRUETYPE=y
configs/chromebook_jerry_defconfig +1 -1
@@ -82,6 +82,7 @@ CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y +CONFIG_PHY_ROCKCHIP_USB2=y CONFIG_PINCTRL=y CONFIG_PINCONF=y CONFIG_SPL_PINCTRL=y
@@ -106,7 +107,6 @@ CONFIG_SYSRESET=y CONFIG_USB=y # CONFIG_SPL_DM_USB is not set CONFIG_USB_DWC2=y -CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_VIDEO=y # CONFIG_VIDEO_BPP8 is not set CONFIG_CONSOLE_TRUETYPE=y
configs/chromebook_minnie_defconfig +1 -1
@@ -83,6 +83,7 @@ CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y +CONFIG_PHY_ROCKCHIP_USB2=y CONFIG_PINCTRL=y CONFIG_PINCONF=y CONFIG_SPL_PINCTRL=y
@@ -107,7 +108,6 @@ CONFIG_SYSRESET=y CONFIG_USB=y # CONFIG_SPL_DM_USB is not set CONFIG_USB_DWC2=y -CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_VIDEO=y # CONFIG_VIDEO_BPP8 is not set CONFIG_CONSOLE_TRUETYPE=y
configs/chromebook_speedy_defconfig +1 -1
@@ -83,6 +83,7 @@ CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_WINBOND=y +CONFIG_PHY_ROCKCHIP_USB2=y CONFIG_PINCTRL=y CONFIG_PINCONF=y CONFIG_SPL_PINCTRL=y
@@ -107,7 +108,6 @@ CONFIG_SYSRESET=y CONFIG_USB=y # CONFIG_SPL_DM_USB is not set CONFIG_USB_DWC2=y -CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_VIDEO=y # CONFIG_VIDEO_BPP8 is not set CONFIG_CONSOLE_TRUETYPE=y
configs/evb-rk3288-rk808_defconfig +1 -1
@@ -71,6 +71,7 @@ CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y +CONFIG_PHY_ROCKCHIP_USB2=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_DM_PMIC=y
@@ -85,7 +86,6 @@ CONFIG_SYS_NS16550_MEM32=y CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_DWC2=y -CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_VIDEO=y
configs/firefly-rk3288_defconfig +2 -2
@@ -62,11 +62,12 @@ CONFIG_MISC=y CONFIG_ROCKCHIP_EFUSE=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y -CONFIG_PHY_REALTEK=y CONFIG_DM_ETH_PHY=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y +CONFIG_PHY_REALTEK=y +CONFIG_PHY_ROCKCHIP_USB2=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_DM_PMIC=y
@@ -82,7 +83,6 @@ CONFIG_SYS_NS16550_MEM32=y CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_DWC2=y -CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_KEYBOARD=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y
configs/miqi-rk3288_defconfig +2 -2
@@ -59,11 +59,12 @@ CONFIG_MISC=y CONFIG_ROCKCHIP_EFUSE=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y -CONFIG_PHY_REALTEK=y CONFIG_DM_ETH_PHY=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y +CONFIG_PHY_REALTEK=y +CONFIG_PHY_ROCKCHIP_USB2=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_DM_PMIC=y
@@ -79,7 +80,6 @@ CONFIG_SYS_NS16550_MEM32=y CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_DWC2=y -CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_KEYBOARD=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y
configs/mk808_defconfig +1 -1
@@ -86,6 +86,7 @@ CONFIG_MMC_UHS_SUPPORT=y CONFIG_SPL_MMC_UHS_SUPPORT=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y +CONFIG_PHY_ROCKCHIP_USB2=y CONFIG_PINCTRL=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set
@@ -105,7 +106,6 @@ CONFIG_TPL_TIMER=y CONFIG_DESIGNWARE_APB_TIMER=y CONFIG_USB=y CONFIG_USB_DWC2=y -CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_FUNCTION_ROCKUSB=y
configs/phycore-rk3288_defconfig +1 -1
@@ -68,6 +68,7 @@ CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y +CONFIG_PHY_ROCKCHIP_USB2=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_DM_PMIC=y
@@ -82,7 +83,6 @@ CONFIG_SYS_NS16550_MEM32=y CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_DWC2=y -CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_SMSC95XX=y
configs/popmetal-rk3288_defconfig +1 -1
@@ -64,6 +64,7 @@ CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y +CONFIG_PHY_ROCKCHIP_USB2=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_DM_PMIC=y
@@ -78,7 +79,6 @@ CONFIG_SYS_NS16550_MEM32=y CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_DWC2=y -CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_SMSC95XX=y
configs/rock-pi-n8-rk3288_defconfig +1 -1
@@ -63,6 +63,7 @@ CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y +CONFIG_PHY_ROCKCHIP_USB2=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_DM_PMIC=y
@@ -81,7 +82,6 @@ CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y CONFIG_USB_DWC2=y -CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_KEYBOARD=y # CONFIG_USB_KEYBOARD_FN_KEYS is not set CONFIG_USB_GADGET=y
configs/rock2_defconfig +1 -1
@@ -65,6 +65,7 @@ CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y +CONFIG_PHY_ROCKCHIP_USB2=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_DM_PMIC=y
@@ -80,7 +81,6 @@ CONFIG_SYS_NS16550_MEM32=y CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_DWC2=y -CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_KEYBOARD=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y
configs/rock_defconfig +1 -1
@@ -53,6 +53,7 @@ CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_LED=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y +CONFIG_PHY_ROCKCHIP_USB2=y CONFIG_PINCTRL=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set
@@ -68,7 +69,6 @@ CONFIG_TIMER=y CONFIG_SPL_TIMER=y CONFIG_ROCKCHIP_TIMER=y CONFIG_USB=y -CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_RANDOM_UUID=y CONFIG_SPL_TINY_MEMSET=y CONFIG_CMD_DHRYSTONE=y
configs/tinker-rk3288_defconfig +2 -2
@@ -62,11 +62,12 @@ CONFIG_ROCKCHIP_EFUSE=y CONFIG_I2C_EEPROM=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y -CONFIG_PHY_REALTEK=y CONFIG_DM_ETH_PHY=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y +CONFIG_PHY_REALTEK=y +CONFIG_PHY_ROCKCHIP_USB2=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_DM_PMIC=y
@@ -81,7 +82,6 @@ CONFIG_SYS_NS16550_MEM32=y CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_DWC2=y -CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_KEYBOARD=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y
configs/tinker-s-rk3288_defconfig +2 -2
@@ -62,11 +62,12 @@ CONFIG_ROCKCHIP_EFUSE=y CONFIG_I2C_EEPROM=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y -CONFIG_PHY_REALTEK=y CONFIG_DM_ETH_PHY=y CONFIG_PHY_GIGE=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y +CONFIG_PHY_REALTEK=y +CONFIG_PHY_ROCKCHIP_USB2=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_DM_PMIC=y
@@ -81,7 +82,6 @@ CONFIG_SYS_NS16550_MEM32=y CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_DWC2=y -CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_KEYBOARD=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y
configs/vyasa-rk3288_defconfig +1 -1
@@ -72,6 +72,7 @@ CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y +CONFIG_PHY_ROCKCHIP_USB2=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_DM_PMIC=y
@@ -87,7 +88,6 @@ CONFIG_SYS_NS16550_MEM32=y CONFIG_SYSRESET=y CONFIG_USB=y CONFIG_USB_DWC2=y -CONFIG_ROCKCHIP_USB2_PHY=y CONFIG_USB_KEYBOARD=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y
--
2.39.5
PATCH v4 7/10 usb: phy: remove rockchip_usb2_phy.c
In reply to Johan JonkerThe new phy-rockchip-usb2 DM driver is now available, so remove rockchip_usb2_phy related code. Also remove a variable no longer needed from an include file.
---
Changed V4:
(Jonas)
split patch
--- arch/arm/mach-rockchip/board.c | 28 ------- drivers/usb/phy/Kconfig | 3 - drivers/usb/phy/Makefile | 1 - drivers/usb/phy/rockchip_usb2_phy.c | 113 ---------------------------- include/usb/dwc2_udc.h | 1 - 5 files changed, 146 deletions(-) delete mode 100644 drivers/usb/phy/rockchip_usb2_phy.c
arch/arm/mach-rockchip/board.c +0 -28
@@ -269,34 +269,6 @@ int board_usb_init(int index, enum usb_init_type init) } otg_data.regs_otg =ofnode_get_addr (node); -#ifdef CONFIG_ROCKCHIP_USB2_PHY -int ret; -u32 phandle, offset; -ofnode phy_node; - - ret =ofnode_read_u32 (node,"phys" , &phandle); -if (ret) -return ret; - - node =ofnode_get_by_phandle (phandle); -if (!ofnode_valid (node)) { -debug ("Not found usb phy device\n" ); -return -ENODEV ; - } - - phy_node =ofnode_get_parent (node); -if (!ofnode_valid (node)) { -debug ("Not found usb phy device\n" ); -return -ENODEV ; - } - - otg_data.phy_of_node = phy_node; - ret =ofnode_read_u32 (node,"reg" , &offset); -if (ret) -return ret; - otg_data.regs_phy = offset + - (u32 )syscon_get_first_range (ROCKCHIP_SYSCON_GRF ); -#endif return dwc2_udc_probe (&otg_data); }
drivers/usb/phy/Kconfig +0 -3
@@ -7,6 +7,3 @@ comment "USB Phy" config TWL4030_USB bool "TWL4030 PHY" - -config ROCKCHIP_USB2_PHY - bool "Rockchip USB2 PHY"
drivers/usb/phy/Makefile +0 -1
@@ -4,4 +4,3 @@ # Tom Rix <[email protected]> obj-$(CONFIG_TWL4030_USB) += twl4030.o -obj-$(CONFIG_ROCKCHIP_USB2_PHY) += rockchip_usb2_phy.o
drivers/usb/phy/rockchip_usb2_phy.c deleted +0 -113
113 lines not on this page · raw message
include/usb/dwc2_udc.h +0 -1
@@ -15,7 +15,6 @@struct dwc2_plat_otg_data {void *priv; -ofnode phy_of_node;int (*phy_control)(int on);uintptr_t regs_phy;uintptr_t regs_otg;
--
2.39.5
PATCH v4 8/10 rockchip: spl-boot-order: add usb boot option
In reply to Johan JonkerAdd usb boot option to spl-boot-order.c
---
Changed V4:
(Jonas)
use uclass_find_device_by_of_offset
--- arch/arm/mach-rockchip/spl-boot-order.c | 3 +++ 1 file changed, 3 insertions(+)
arch/arm/mach-rockchip/spl-boot-order.c +3 -0
@@ -76,6 +76,9 @@ static int spl_node_to_boot_device(int node)if (!uclass_find_device_by_of_offset (UCLASS_SPI_FLASH , node, &parent))return BOOT_DEVICE_SPI ; +if (!uclass_find_device_by_of_offset (UCLASS_USB , node, &parent)) +return BOOT_DEVICE_USB ; +return -1 ; }
--
2.39.5
PATCH v4 9/10 arm: dts: rockchip: add USB required properties in SPL for mk808
In reply to Johan JonkerAdd USB required properties in SPL for mk808.
--- arch/arm/dts/rk3066a-mk808-u-boot.dtsi | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
arch/arm/dts/rk3066a-mk808-u-boot.dtsi +18 -0
@@ -2,6 +2,12 @@ #include "rk3066a-u-boot.dtsi" +/ { + chosen { + u-boot,spl-boot-order = &mmc0, &usb_host; + }; +}; + &cru { bootph-all; };
@@ -41,3 +47,15 @@ &uart2 { bootph-all; }; + +&usb_host { + bootph-pre-ram; +}; + +&usbphy { + bootph-pre-ram; +}; + +&usbphy1 { + bootph-pre-ram; +};
--
2.39.5
PATCH v4 10/10 rockchip: configs: enable USB in SPL for mk808
In reply to Johan JonkerEnable USB in SPL support for mk808.
---
Changed V4:
remove SPL_DM_RESET
--- configs/mk808_defconfig | 3 +++ 1 file changed, 3 insertions(+)
configs/mk808_defconfig +3 -0
@@ -87,6 +87,7 @@ CONFIG_SPL_MMC_UHS_SUPPORT=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PHY_ROCKCHIP_USB2=y +CONFIG_SPL_PHY_ROCKCHIP_USB2=y CONFIG_PINCTRL=y CONFIG_DM_PMIC=y # CONFIG_SPL_PMIC_CHILDREN is not set
@@ -106,6 +107,8 @@ CONFIG_TPL_TIMER=y CONFIG_DESIGNWARE_APB_TIMER=y CONFIG_USB=y CONFIG_USB_DWC2=y +CONFIG_SPL_USB_DWC2=y +CONFIG_SPL_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_FUNCTION_ROCKUSB=y
--
2.39.5
Re: [PATCH v4 02/10] usb: Kconfig: add SPL_USB_DWC2
In reply to Johan JonkerQuoted 5 lines · Johan Jonker
The config
SPL_DM_USBgives the user the option to be more selective in what phase the USB drivers should enabled.Pass this concept to the
dwc2_usbdriver and make aSPL_USB_DWC2config available in SPL to load U-boot (full) from a USB disk.
U-Boot