[U-Boot] [PATCH 0/2] Kconfig USB_XHCI_ROCKCHIP fixup
New config option must using Kconfig, move USB_XHCI_ROCKCHIP into Kconfig to follow the rule.
Kever Yang (2): usb: host: add Kconfig for USB_XHCI_ROCKCHIP rk3399: move the USB_XHCI_ROCKCHIP into Kconfig
configs/evb-rk3399_defconfig | 2 ++ drivers/usb/host/Kconfig | 7 +++++++ include/configs/rk3399_common.h | 4 ---- 3 files changed, 9 insertions(+), 4 deletions(-)
Add a Kconfig for Rockchip xhci controller.
Signed-off-by: Kever Yang kever.yang@rock-chips.com ---
drivers/usb/host/Kconfig | 7 +++++++ 1 file changed, 7 insertions(+)
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index e0699d4..afb2e97 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -28,6 +28,13 @@ config USB_XHCI_DWC3 Say Y or if your system has a Dual Role SuperSpeed USB controller based on the DesignWare USB3 IP Core.
+config USB_XHCI_ROCKCHIP + bool "Support for Rockchip on-chip xHCI USB controller" + depends on ARCH_ROCKCHIP + default y + help + Enables support for the on-chip xHCI controller on Rockchip SoCs. + endif # USB_XHCI_HCD
config USB_EHCI_HCD
On 09/21/2016 05:35 AM, Kever Yang wrote:
Add a Kconfig for Rockchip xhci controller.
Signed-off-by: Kever Yang kever.yang@rock-chips.com
Acked-by: Marek Vasut marex@denx.de
Feel free to pick it through rockchip tree .
On 21 September 2016 at 03:55, Marek Vasut marex@denx.de wrote:
On 09/21/2016 05:35 AM, Kever Yang wrote:
Add a Kconfig for Rockchip xhci controller.
Signed-off-by: Kever Yang kever.yang@rock-chips.com
Acked-by: Marek Vasut marex@denx.de
Feel free to pick it through rockchip tree .
Applied to u-boot-rockchip, thanks!
Move USB_XHCI_ROCKCHIP define from soc header file into board defconfig.
Signed-off-by: Kever Yang kever.yang@rock-chips.com ---
configs/evb-rk3399_defconfig | 2 ++ include/configs/rk3399_common.h | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig index 6468620..4ec2e7b 100644 --- a/configs/evb-rk3399_defconfig +++ b/configs/evb-rk3399_defconfig @@ -58,6 +58,8 @@ CONFIG_FASTBOOT_BUF_SIZE=0x08000000 CONFIG_USB_STORAGE=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_XHCI_ROCKCHIP=y +CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS=2 CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y CONFIG_DM_REGULATOR=y diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index bcc54b7..f5815e5 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -94,8 +94,4 @@ #define CONFIG_USB_ETHER_SMSC95XX #define CONFIG_USB_ETHER_RTL8152
-/* rockchip xhci host driver */ -#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 -#define CONFIG_USB_XHCI_ROCKCHIP - #endif
Hi Kever,
On 20 September 2016 at 21:35, Kever Yang kever.yang@rock-chips.com wrote:
Move USB_XHCI_ROCKCHIP define from soc header file into board defconfig.
Signed-off-by: Kever Yang kever.yang@rock-chips.com
configs/evb-rk3399_defconfig | 2 ++ include/configs/rk3399_common.h | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-)
I've squashed part of this into the offending patch, thanks.
We cannot put CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS into the defconfig as it is not in Kconfig yet.
diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig index 6468620..4ec2e7b 100644 --- a/configs/evb-rk3399_defconfig +++ b/configs/evb-rk3399_defconfig @@ -58,6 +58,8 @@ CONFIG_FASTBOOT_BUF_SIZE=0x08000000 CONFIG_USB_STORAGE=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_XHCI_ROCKCHIP=y +CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS=2 CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y CONFIG_DM_REGULATOR=y diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index bcc54b7..f5815e5 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -94,8 +94,4 @@ #define CONFIG_USB_ETHER_SMSC95XX #define CONFIG_USB_ETHER_RTL8152
-/* rockchip xhci host driver */ -#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 -#define CONFIG_USB_XHCI_ROCKCHIP
#endif
1.9.1
Regards, Simon
participants (3)
-
Kever Yang -
Marek Vasut -
Simon Glass