Add Rockchip USBPHY DM driver
Subsystems (5)
v2 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 {
};
};
};The usbphy node does not show up in the DM tree to be found by the generic_phy_get_by_index() function. Only by manual transfer to the DT root is gets detected.
=> dm tree
Class Seq Probed Driver Name
-----------------------------------------------------------
root 0 [ + ] root_driver root_driver nop 1 [ + ] rockchip_usbphy |-- usbphy phy 0 [ + ] rockchip_usbphy_port | |-- usb-phy@17c phy 1 [ + ] rockchip_usbphy_port | `-- 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
Johan Jonker (2):
phy: rockchip: add phy-rockchip-usb2.c
usb: phy: remove rockchip_usb2_phy.c
arch/arm/mach-rockchip/board.c | 28 -- arch/arm/mach-rockchip/rk3066/syscon_rk3066.c | 26 ++ arch/arm/mach-rockchip/rk3188/syscon_rk3188.c | 26 ++ arch/arm/mach-rockchip/rk3288/syscon_rk3288.c | 26 ++ 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 | 3 +- configs/popmetal-rk3288_defconfig | 3 +- configs/rock-pi-n8-rk3288_defconfig | 2 +- configs/rock2_defconfig | 3 +- configs/rock_defconfig | 3 +- configs/tinker-rk3288_defconfig | 4 +- configs/tinker-s-rk3288_defconfig | 4 +- configs/vyasa-rk3288_defconfig | 2 +- drivers/phy/rockchip/Kconfig | 28 +- drivers/phy/rockchip/Makefile | 5 +- drivers/phy/rockchip/phy-rockchip-usb2.c | 371 ++++++++++++++++++ drivers/usb/phy/Kconfig | 3 - drivers/usb/phy/Makefile | 1 - drivers/usb/phy/rockchip_usb2_phy.c | 113 ------ include/usb/dwc2_udc.h | 1 - 27 files changed, 494 insertions(+), 178 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 v2 1/2 phy: rockchip: add phy-rockchip-usb2.c
Add phy-rockchip-usb2.c driver with support
for RK3066, RK3188 and RK3288 pdata.
---
Changed V2:
add DM_FLAG_PROBE_AFTER_BIND
restyle
--- drivers/phy/rockchip/Kconfig | 28 +- drivers/phy/rockchip/Makefile | 5 +- drivers/phy/rockchip/phy-rockchip-usb2.c | 371 +++++++++++++++++++++++ 3 files changed, 392 insertions(+), 12 deletions(-) create mode 100644 drivers/phy/rockchip/phy-rockchip-usb2.c
drivers/phy/rockchip/Kconfig +18 -10
@@ -27,7 +27,7 @@ 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
@@ -41,26 +41,34 @@ config PHY_ROCKCHIP_PCIE Enable this to support the 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. + Enable this to support the Rockchip USB TYPEC PHY. -config PHY_ROCKCHIP_TYPEC - bool "Rockchip TYPEC PHY Driver" +config PHY_ROCKCHIP_USB2 + bool "Rockchip USB2 PHY" depends on ARCH_ROCKCHIP select PHY help - Enable this to support the Rockchip USB TYPEC PHY. + Support for Rockchip USB 2.0 PHY. + +config PHY_ROCKCHIP_USBDP + tristate "Rockchip USBDP COMBO PHY Driver" + depends on ARCH_ROCKCHIP + select PHY + help + Enable this to support the Rockchip USB3.0/DP + combo PHY with Samsung IP block. endmenu
drivers/phy/rockchip/Makefile +3 -2
@@ -3,11 +3,12 @@ # 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_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_USB2) += phy-rockchip-usb2.o +obj-$(CONFIG_PHY_ROCKCHIP_USBDP) += phy-rockchip-usbdp.o
drivers/phy/rockchip/phy-rockchip-usb2.c new file +371 -0
371 lines not on this page · raw message
--
2.39.5
PATCH v2 2/2 usb: phy: remove rockchip_usb2_phy.c
In reply to Johan JonkerRemove rockchip_usb2_phy.c and replace it by phy-rockchip-usb2.c Adjust defconfigs. Enable CONFIG_DM_RESET where needed to compile th phy driver. Add grf bind function for usbphy node. Remove a variable no longer needed from an include file.
---
Changed V2:
Add grf bind function
Restyle
--- arch/arm/mach-rockchip/board.c | 28 ----- arch/arm/mach-rockchip/rk3066/syscon_rk3066.c | 26 ++++ arch/arm/mach-rockchip/rk3188/syscon_rk3188.c | 26 ++++ arch/arm/mach-rockchip/rk3288/syscon_rk3288.c | 26 ++++ 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 | 3 +- configs/popmetal-rk3288_defconfig | 3 +- configs/rock-pi-n8-rk3288_defconfig | 2 +- configs/rock2_defconfig | 3 +- configs/rock_defconfig | 3 +- configs/tinker-rk3288_defconfig | 4 +- configs/tinker-s-rk3288_defconfig | 4 +- configs/vyasa-rk3288_defconfig | 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 - 24 files changed, 102 insertions(+), 166 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); }
arch/arm/mach-rockchip/rk3066/syscon_rk3066.c +26 -0
@@ -5,10 +5,33 @@*/ #include <dm.h> +#include <dm/lists.h> #include <log.h> #include <syscon.h> #include <asm/arch-rockchip/clock.h> +#if CONFIG_IS_ENABLED (OF_REAL ) &&IS_ENABLED (CONFIG_PHY_ROCKCHIP_USB2 ) +static int rk3066_syscon_bind (struct udevice *dev) +{ +if (dev->driver_data ==ROCKCHIP_SYSCON_GRF ) { +ofnode subnode =ofnode_find_subnode (dev_ofnode (dev),"usbphy" ); + +if (ofnode_valid (subnode)) { +struct udevice *usbphy_dev; +int ret; + + ret =device_bind_driver_to_node (dev,"rockchip_usbphy" ,"usbphy" , + subnode, &usbphy_dev); +if (ret) +return ret; + + usbphy_dev->driver_data = usbphy_dev->driver->of_match->data; + } + } + +return 0 ; +} +#endif static const struct udevice_id rk3066_syscon_ids[] = { { .compatible ="rockchip,rk3066-noc" , .data =ROCKCHIP_SYSCON_NOC }, { .compatible ="rockchip,rk3066-grf" , .data =ROCKCHIP_SYSCON_GRF },
@@ -20,6 +43,9 @@ U_BOOT_DRIVER(syscon_rk3066) = { .name = "rk3066_syscon", .id = UCLASS_SYSCON, .of_match = rk3066_syscon_ids, +#if CONFIG_IS_ENABLED (OF_REAL ) &&IS_ENABLED (CONFIG_PHY_ROCKCHIP_USB2 ) + .bind = rk3066_syscon_bind, +#endif };#if CONFIG_IS_ENABLED (OF_PLATDATA )
arch/arm/mach-rockchip/rk3188/syscon_rk3188.c +26 -0
@@ -9,6 +9,29 @@#include <syscon.h> #include <asm/arch-rockchip/clock.h> +#if CONFIG_IS_ENABLED (OF_REAL ) &&IS_ENABLED (CONFIG_PHY_ROCKCHIP_USB2 ) +static int rk3188_syscon_bind (struct udevice *dev) +{ +if (dev->driver_data ==ROCKCHIP_SYSCON_GRF ) { +ofnode subnode =ofnode_find_subnode (dev_ofnode (dev),"usbphy" ); + +if (ofnode_valid (subnode)) { +struct udevice *usbphy_dev; +int ret; + + ret =device_bind_driver_to_node (dev,"rockchip_usbphy" ,"usbphy" , + subnode, &usbphy_dev); +if (ret) +return ret; + + usbphy_dev->driver_data = usbphy_dev->driver->of_match->data; + } + } + +return 0 ; +} +#endif +static const struct udevice_id rk3188_syscon_ids[] = { { .compatible ="rockchip,rk3188-noc" , .data =ROCKCHIP_SYSCON_NOC }, { .compatible ="rockchip,rk3188-grf" , .data =ROCKCHIP_SYSCON_GRF },
@@ -20,6 +43,9 @@ U_BOOT_DRIVER(syscon_rk3188) = { .name = "rk3188_syscon", .id = UCLASS_SYSCON, .of_match = rk3188_syscon_ids, +#if CONFIG_IS_ENABLED (OF_REAL ) &&IS_ENABLED (CONFIG_PHY_ROCKCHIP_USB2 ) + .bind = rk3188_syscon_bind, +#endif };#if CONFIG_IS_ENABLED (OF_PLATDATA )
arch/arm/mach-rockchip/rk3288/syscon_rk3288.c +26 -0
@@ -12,6 +12,29 @@#include <syscon.h> #include <asm/arch-rockchip/clock.h> +#if CONFIG_IS_ENABLED (OF_REAL ) &&IS_ENABLED (CONFIG_PHY_ROCKCHIP_USB2 ) +static int rk3288_syscon_bind (struct udevice *dev) +{ +if (dev->driver_data ==ROCKCHIP_SYSCON_GRF ) { +ofnode subnode =ofnode_find_subnode (dev_ofnode (dev),"usbphy" ); + +if (ofnode_valid (subnode)) { +struct udevice *usbphy_dev; +int ret; + + ret =device_bind_driver_to_node (dev,"rockchip_usbphy" ,"usbphy" , + subnode, &usbphy_dev); +if (ret) +return ret; + + usbphy_dev->driver_data = usbphy_dev->driver->of_match->data; + } + } + +return 0 ; +} +#endif +static const struct udevice_id rk3288_syscon_ids[] = { { .compatible ="rockchip,rk3288-noc" , .data =ROCKCHIP_SYSCON_NOC }, { .compatible ="rockchip,rk3288-grf" , .data =ROCKCHIP_SYSCON_GRF },
@@ -24,6 +47,9 @@ U_BOOT_DRIVER(syscon_rk3288) = { .name = "rk3288_syscon", .id = UCLASS_SYSCON, .of_match = rk3288_syscon_ids, +#if CONFIG_IS_ENABLED (OF_REAL ) &&IS_ENABLED (CONFIG_PHY_ROCKCHIP_USB2 ) + .bind = rk3288_syscon_bind, +#endif };#if CONFIG_IS_ENABLED (OF_PLATDATA )
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
@@ -92,6 +92,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
@@ -111,7 +112,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 +2 -1
@@ -9,6 +9,7 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x100000 CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3288-phycore-rdk" +CONFIG_DM_RESET=y CONFIG_SYS_MONITOR_LEN=614400 CONFIG_ROCKCHIP_RK3288=y CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y
@@ -68,6 +69,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 +84,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 +2 -1
@@ -9,6 +9,7 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x100000 CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3288-popmetal" +CONFIG_DM_RESET=y CONFIG_SYS_MONITOR_LEN=614400 CONFIG_ROCKCHIP_RK3288=y CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y
@@ -64,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
@@ -78,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_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 +2 -1
@@ -9,6 +9,7 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x100000 CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3288-rock2-square" +CONFIG_DM_RESET=y CONFIG_SYS_MONITOR_LEN=614400 CONFIG_ROCKCHIP_RK3288=y CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y
@@ -65,6 +66,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 +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_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y
configs/rock_defconfig +2 -1
@@ -12,6 +12,7 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x60100000 CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3188-radxarock" +CONFIG_DM_RESET=y CONFIG_ROCKCHIP_RK3188=y # CONFIG_ROCKCHIP_STIMER is not set CONFIG_TARGET_ROCK=y
@@ -53,6 +54,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 +70,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
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 RESEND v2 2/2 usb: phy: remove rockchip_usb2_phy.c
In reply to Johan JonkerRemove rockchip_usb2_phy.c and replace it by phy-rockchip-usb2.c Adjust defconfigs. Enable CONFIG_DM_RESET where needed to compile the phy driver. Add grf bind function for usbphy node. Remove a variable no longer needed from an include file.
---
Changed V2 RESEND:
Add include
Add grf bind function
Restyle
--- arch/arm/mach-rockchip/board.c | 28 ----- arch/arm/mach-rockchip/rk3066/syscon_rk3066.c | 26 ++++ arch/arm/mach-rockchip/rk3188/syscon_rk3188.c | 27 +++++ arch/arm/mach-rockchip/rk3288/syscon_rk3288.c | 27 +++++ 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 | 3 +- configs/popmetal-rk3288_defconfig | 3 +- configs/rock-pi-n8-rk3288_defconfig | 2 +- configs/rock2_defconfig | 3 +- configs/rock_defconfig | 3 +- configs/tinker-rk3288_defconfig | 4 +- configs/tinker-s-rk3288_defconfig | 4 +- configs/vyasa-rk3288_defconfig | 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 - 24 files changed, 104 insertions(+), 166 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); }
arch/arm/mach-rockchip/rk3066/syscon_rk3066.c +26 -0
@@ -5,10 +5,33 @@*/ #include <dm.h> +#include <dm/lists.h> #include <log.h> #include <syscon.h> #include <asm/arch-rockchip/clock.h> +#if CONFIG_IS_ENABLED (OF_REAL ) &&IS_ENABLED (CONFIG_PHY_ROCKCHIP_USB2 ) +static int rk3066_syscon_bind (struct udevice *dev) +{ +if (dev->driver_data ==ROCKCHIP_SYSCON_GRF ) { +ofnode subnode =ofnode_find_subnode (dev_ofnode (dev),"usbphy" ); + +if (ofnode_valid (subnode)) { +struct udevice *usbphy_dev; +int ret; + + ret =device_bind_driver_to_node (dev,"rockchip_usbphy" ,"usbphy" , + subnode, &usbphy_dev); +if (ret) +return ret; + + usbphy_dev->driver_data = usbphy_dev->driver->of_match->data; + } + } + +return 0 ; +} +#endif static const struct udevice_id rk3066_syscon_ids[] = { { .compatible ="rockchip,rk3066-noc" , .data =ROCKCHIP_SYSCON_NOC }, { .compatible ="rockchip,rk3066-grf" , .data =ROCKCHIP_SYSCON_GRF },
@@ -20,6 +43,9 @@ U_BOOT_DRIVER(syscon_rk3066) = { .name = "rk3066_syscon", .id = UCLASS_SYSCON, .of_match = rk3066_syscon_ids, +#if CONFIG_IS_ENABLED (OF_REAL ) &&IS_ENABLED (CONFIG_PHY_ROCKCHIP_USB2 ) + .bind = rk3066_syscon_bind, +#endif };#if CONFIG_IS_ENABLED (OF_PLATDATA )
arch/arm/mach-rockchip/rk3188/syscon_rk3188.c +27 -0
@@ -5,10 +5,34 @@*/ #include <dm.h> +#include <dm/lists.h> #include <log.h> #include <syscon.h> #include <asm/arch-rockchip/clock.h> +#if CONFIG_IS_ENABLED (OF_REAL ) &&IS_ENABLED (CONFIG_PHY_ROCKCHIP_USB2 ) +static int rk3188_syscon_bind (struct udevice *dev) +{ +if (dev->driver_data ==ROCKCHIP_SYSCON_GRF ) { +ofnode subnode =ofnode_find_subnode (dev_ofnode (dev),"usbphy" ); + +if (ofnode_valid (subnode)) { +struct udevice *usbphy_dev; +int ret; + + ret =device_bind_driver_to_node (dev,"rockchip_usbphy" ,"usbphy" , + subnode, &usbphy_dev); +if (ret) +return ret; + + usbphy_dev->driver_data = usbphy_dev->driver->of_match->data; + } + } + +return 0 ; +} +#endif +static const struct udevice_id rk3188_syscon_ids[] = { { .compatible ="rockchip,rk3188-noc" , .data =ROCKCHIP_SYSCON_NOC }, { .compatible ="rockchip,rk3188-grf" , .data =ROCKCHIP_SYSCON_GRF },
@@ -20,6 +44,9 @@ U_BOOT_DRIVER(syscon_rk3188) = { .name = "rk3188_syscon", .id = UCLASS_SYSCON, .of_match = rk3188_syscon_ids, +#if CONFIG_IS_ENABLED (OF_REAL ) &&IS_ENABLED (CONFIG_PHY_ROCKCHIP_USB2 ) + .bind = rk3188_syscon_bind, +#endif };#if CONFIG_IS_ENABLED (OF_PLATDATA )
arch/arm/mach-rockchip/rk3288/syscon_rk3288.c +27 -0
@@ -5,6 +5,7 @@*/ #include <dm.h> +#include <dm/lists.h> #include <dt-structs.h> #include <log.h> #include <malloc.h>
@@ -12,6 +13,29 @@#include <syscon.h> #include <asm/arch-rockchip/clock.h> +#if CONFIG_IS_ENABLED (OF_REAL ) &&IS_ENABLED (CONFIG_PHY_ROCKCHIP_USB2 ) +static int rk3288_syscon_bind (struct udevice *dev) +{ +if (dev->driver_data ==ROCKCHIP_SYSCON_GRF ) { +ofnode subnode =ofnode_find_subnode (dev_ofnode (dev),"usbphy" ); + +if (ofnode_valid (subnode)) { +struct udevice *usbphy_dev; +int ret; + + ret =device_bind_driver_to_node (dev,"rockchip_usbphy" ,"usbphy" , + subnode, &usbphy_dev); +if (ret) +return ret; + + usbphy_dev->driver_data = usbphy_dev->driver->of_match->data; + } + } + +return 0 ; +} +#endif +static const struct udevice_id rk3288_syscon_ids[] = { { .compatible ="rockchip,rk3288-noc" , .data =ROCKCHIP_SYSCON_NOC }, { .compatible ="rockchip,rk3288-grf" , .data =ROCKCHIP_SYSCON_GRF },
@@ -24,6 +48,9 @@ U_BOOT_DRIVER(syscon_rk3288) = { .name = "rk3288_syscon", .id = UCLASS_SYSCON, .of_match = rk3288_syscon_ids, +#if CONFIG_IS_ENABLED (OF_REAL ) &&IS_ENABLED (CONFIG_PHY_ROCKCHIP_USB2 ) + .bind = rk3288_syscon_bind, +#endif };#if CONFIG_IS_ENABLED (OF_PLATDATA )
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
@@ -92,6 +92,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
@@ -111,7 +112,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 +2 -1
@@ -9,6 +9,7 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x100000 CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3288-phycore-rdk" +CONFIG_DM_RESET=y CONFIG_SYS_MONITOR_LEN=614400 CONFIG_ROCKCHIP_RK3288=y CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y
@@ -68,6 +69,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 +84,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 +2 -1
@@ -9,6 +9,7 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x100000 CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3288-popmetal" +CONFIG_DM_RESET=y CONFIG_SYS_MONITOR_LEN=614400 CONFIG_ROCKCHIP_RK3288=y CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y
@@ -64,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
@@ -78,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_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 +2 -1
@@ -9,6 +9,7 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x100000 CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3288-rock2-square" +CONFIG_DM_RESET=y CONFIG_SYS_MONITOR_LEN=614400 CONFIG_ROCKCHIP_RK3288=y CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y
@@ -65,6 +66,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 +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_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y
configs/rock_defconfig +2 -1
@@ -12,6 +12,7 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x60100000 CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3188-radxarock" +CONFIG_DM_RESET=y CONFIG_ROCKCHIP_RK3188=y # CONFIG_ROCKCHIP_STIMER is not set CONFIG_TARGET_ROCK=y
@@ -53,6 +54,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 +70,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
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