[PATCH] rockchip: Rock960: fix up USB support

[Kever Yang]

Hi Peter,


     Could you add you signature for this patch?


Thanks,

- Kever

On 2020/9/29 下午9:06, Peter Robinson wrote:
> Fix up USB config options so keyboards and other USB devices work.
> ---
>   configs/rock960-rk3399_defconfig | 9 ++++++---
>   include/configs/rock960_rk3399.h | 2 ++
>   2 files changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig
> index 1d997847c2..a5a50785c5 100644
> --- a/configs/rock960-rk3399_defconfig
> +++ b/configs/rock960-rk3399_defconfig
> @@ -3,12 +3,12 @@ CONFIG_ARCH_ROCKCHIP=y
>   CONFIG_SYS_TEXT_BASE=0x00200000
>   CONFIG_ENV_OFFSET=0x3F8000
>   CONFIG_ROCKCHIP_RK3399=y
> -CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x4000
>   CONFIG_TARGET_ROCK960_RK3399=y
>   CONFIG_DEBUG_UART_BASE=0xFF1A0000
>   CONFIG_DEBUG_UART_CLOCK=24000000
>   CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock960"
>   CONFIG_DEBUG_UART=y
> +CONFIG_USE_PREBOOT=y
>   CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock960.dtb"
>   CONFIG_MISC_INIT_R=y
>   CONFIG_DISPLAY_BOARDINFO_LATE=y
> @@ -41,6 +41,8 @@ CONFIG_MMC_SDHCI_ROCKCHIP=y
>   CONFIG_DM_ETH=y
>   CONFIG_NVME=y
>   CONFIG_PCI=y
> +CONFIG_PHY_ROCKCHIP_INNO_USB2=y
> +CONFIG_PHY_ROCKCHIP_TYPEC=y
>   CONFIG_PMIC_RK8XX=y
>   CONFIG_REGULATOR_PWM=y
>   CONFIG_REGULATOR_RK8XX=y
> @@ -54,10 +56,11 @@ 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
> +CONFIG_USB_OHCI_GENERIC=y
>   CONFIG_USB_DWC3=y
> -CONFIG_ROCKCHIP_USB2_PHY=y
> +CONFIG_DM_KEYBOARD=y
>   CONFIG_USB_KEYBOARD=y
> -CONFIG_USB_GADGET=y
>   CONFIG_USB_HOST_ETHER=y
>   CONFIG_USB_ETHER_ASIX=y
>   CONFIG_USB_ETHER_ASIX88179=y
> diff --git a/include/configs/rock960_rk3399.h b/include/configs/rock960_rk3399.h
> index c6f9122154..2edad71028 100644
> --- a/include/configs/rock960_rk3399.h
> +++ b/include/configs/rock960_rk3399.h
> @@ -15,4 +15,6 @@
>   
>   #define SDRAM_BANK_SIZE			(2UL << 30)
>   
> +#define CONFIG_USB_OHCI_NEW
> +#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS     2
>   #endif