uboot-rockchip: don't hardcore USB_OHCI_NEW options

This will only make things complicated.

package/boot/uboot-rockchip/patches/014-uboot-add-Radxa-ROCK-3A-board.patch

@@ -17,9 +17,6 @@ Signed-off-by: Marty Jones <mj8263788@gmail.com>
  9 files changed, 692 insertions(+), 1 deletion(-)
  create mode 100644 arch/arm/dts/rk3568-rock-3a-u-boot.dtsi
  create mode 100644 arch/arm/dts/rk3568-rock-3a.dts
- create mode 100644 board/radxa/rock-3a-rk3568/Kconfig
- create mode 100644 board/radxa/rock-3a-rk3568/Makefile
- create mode 100644 board/radxa/rock-3a-rk3568/rock-3a-rk3568.c
  create mode 100644 configs/rock-3a-rk3568_defconfig
  create mode 100644 include/configs/rock-3a-rk3568.h
 
@@ -37,7 +34,7 @@ Signed-off-by: Marty Jones <mj8263788@gmail.com>
  	rv1108-elgin-r1.dtb \
 --- /dev/null
 +++ b/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi
-@@ -0,0 +1,25 @@
+@@ -0,0 +1,24 @@
 +// SPDX-License-Identifier: GPL-2.0+
 +/*
 + * (C) Copyright 2021 Rockchip Electronics Co., Ltd
@@ -54,13 +51,12 @@ Signed-off-by: Marty Jones <mj8263788@gmail.com>
 +
 +&sdmmc0 {
 +	bus-width = <4>;
-+	u-boot,dm-spl;
 +	u-boot,spl-fifo-mode;
 +};
 +
 +&uart2 {
-+	clock-frequency = <24000000>;
 +	u-boot,dm-spl;
++	clock-frequency = <24000000>;
 +	status = "okay";
 +};
 --- /dev/null
@@ -591,59 +587,9 @@ Signed-off-by: Marty Jones <mj8263788@gmail.com>
 +&usb_host1_ohci {
 +	status = "okay";
 +};
---- a/arch/arm/mach-rockchip/rk3568/Kconfig
-+++ b/arch/arm/mach-rockchip/rk3568/Kconfig
-@@ -18,6 +18,11 @@ config TARGET_QUARTZ64_A_RK3566
- 	help
- 	  Quartz64 Model A RK3566 is a development board from Pine64.
- 
-+config TARGET_ROCK_3A_RK3568
-+	bool "ROCK3 Model A RK3568 development board"
-+	help
-+	  ROCK3 Model A RK3568 is a development board from Radxa.
-+
- endchoice
- 
- config ROCKCHIP_BOOT_MODE_REG
-@@ -35,5 +40,6 @@ config SYS_MALLOC_F_LEN
- source "board/rockchip/bpi-r2-pro-rk3568/Kconfig"
- source "board/rockchip/evb_rk3568/Kconfig"
- source "board/pine64/quartz64-a-rk3566/Kconfig"
-+source "board/radxa/rock-3a-rk3568/Kconfig"
- 
- endif
---- /dev/null
-+++ b/board/radxa/rock-3a-rk3568/Kconfig
-@@ -0,0 +1,15 @@
-+if TARGET_ROCK_3A_RK3568
-+
-+config SYS_BOARD
-+	default "rock-3a-rk3568"
-+
-+config SYS_VENDOR
-+	default "radxa"
-+
-+config SYS_CONFIG_NAME
-+	default "rock-3a-rk3568"
-+
-+config BOARD_SPECIFIC_OPTIONS # dummy
-+	def_bool y
-+
-+endif
---- /dev/null
-+++ b/board/radxa/rock-3a-rk3568/Makefile
-@@ -0,0 +1,4 @@
-+# SPDX-License-Identifier:     GPL-2.0+
-+#
-+
-+obj-y	+= rock-3a-rk3568.o
---- /dev/null
-+++ b/board/radxa/rock-3a-rk3568/rock-3a-rk3568.c
-@@ -0,0 +1 @@
-+// SPDX-License-Identifier: GPL-2.0+
 --- /dev/null
 +++ b/configs/rock-3a-rk3568_defconfig
-@@ -0,0 +1,97 @@
+@@ -0,0 +1,98 @@
 +CONFIG_ARM=y
 +CONFIG_SKIP_LOWLEVEL_INIT=y
 +CONFIG_ARCH_ROCKCHIP=y
@@ -658,7 +604,7 @@ Signed-off-by: Marty Jones <mj8263788@gmail.com>
 +CONFIG_SPL_MMC=y
 +CONFIG_SPL_SERIAL=y
 +CONFIG_SPL_STACK_R_ADDR=0x600000
-+CONFIG_TARGET_ROCK_3A_RK3568=y
++CONFIG_TARGET_EVB_RK3568=y
 +CONFIG_DEBUG_UART_BASE=0xFE660000
 +CONFIG_DEBUG_UART_CLOCK=24000000
 +CONFIG_DEBUG_UART=y
@@ -670,6 +616,7 @@ Signed-off-by: Marty Jones <mj8263788@gmail.com>
 +CONFIG_OF_SYSTEM_SETUP=y
 +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-rock-3a.dtb"
 +# CONFIG_SYS_DEVICE_NULLDEV is not set
++CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
 +# CONFIG_DISPLAY_CPUINFO is not set
 +CONFIG_DISPLAY_BOARDINFO_LATE=y
 +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
@@ -741,23 +688,3 @@ Signed-off-by: Marty Jones <mj8263788@gmail.com>
 +CONFIG_USB_ETHER_LAN78XX=y
 +CONFIG_USB_ETHER_SMSC95XX=y
 +CONFIG_ERRNO_STR=y
---- /dev/null
-+++ b/include/configs/rock-3a-rk3568.h
-@@ -0,0 +1,17 @@
-+/* SPDX-License-Identifier: GPL-2.0+ */
-+
-+#ifndef __ROCK_3A_RK3568_H
-+#define __ROCK_3A_RK3568_H
-+
-+#include <configs/rk3568_common.h>
-+
-+#define CONFIG_SUPPORT_EMMC_RPMB
-+
-+#define ROCKCHIP_DEVICE_SETTINGS \
-+			"stdout=serial,vidconsole\0" \
-+			"stderr=serial,vidconsole\0"
-+
-+#define CONFIG_USB_OHCI_NEW
-+#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS     2
-+
-+#endif

package/boot/uboot-rockchip/patches/015-uboot-add-NanoPi-R5S-board.patch

@@ -129,7 +129,7 @@ Signed-off-by: Marty Jones <mj8263788@gmail.com>
 + */
 --- /dev/null
 +++ b/configs/nanopi-r5s-rk3568_defconfig
-@@ -0,0 +1,97 @@
+@@ -0,0 +1,98 @@
 +CONFIG_ARM=y
 +CONFIG_SKIP_LOWLEVEL_INIT=y
 +CONFIG_ARCH_ROCKCHIP=y
@@ -149,6 +149,7 @@ Signed-off-by: Marty Jones <mj8263788@gmail.com>
 +CONFIG_DEBUG_UART_CLOCK=24000000
 +CONFIG_DEBUG_UART=y
 +CONFIG_SYS_LOAD_ADDR=0xc00800
++CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=2
 +CONFIG_API=y
 +CONFIG_FIT=y
 +CONFIG_FIT_VERBOSE=y
@@ -229,7 +230,7 @@ Signed-off-by: Marty Jones <mj8263788@gmail.com>
 +CONFIG_ERRNO_STR=y
 --- /dev/null
 +++ b/include/configs/nanopi-r5s-rk3568.h
-@@ -0,0 +1,17 @@
+@@ -0,0 +1,14 @@
 +/* SPDX-License-Identifier: GPL-2.0+ */
 +
 +#ifndef __NANOPI_R5S_RK3568_H
@@ -243,7 +244,4 @@ Signed-off-by: Marty Jones <mj8263788@gmail.com>
 +			"stdout=serial,vidconsole\0" \
 +			"stderr=serial,vidconsole\0"
 +
-+#define CONFIG_USB_OHCI_NEW
-+#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS     2
-+
 +#endif

package/boot/uboot-rockchip/patches/100-Convert-CONFIG_USB_OHCI_NEW-et-al-to-Kconfig.patch

@@ -0,0 +1,137 @@
+From cd6a45a41fb2c19884ac87afade87b4d53601929 Mon Sep 17 00:00:00 2001
+From: Tom Rini <trini@konsulko.com>
+Date: Sat, 25 Jun 2022 11:02:31 -0400
+Subject: [PATCH] Convert CONFIG_USB_OHCI_NEW et al to Kconfig
+
+This converts the following to Kconfig:
+    CONFIG_SYS_OHCI_SWAP_REG_ACCESS
+    CONFIG_SYS_USB_OHCI_CPU_INIT
+    CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS
+    CONFIG_SYS_USB_OHCI_SLOT_NAME
+    CONFIG_USB_ATMEL
+    CONFIG_USB_ATMEL_CLK_SEL_PLLB
+    CONFIG_USB_ATMEL_CLK_SEL_UPLL
+    CONFIG_USB_OHCI_LPC32XX
+    CONFIG_USB_OHCI_NEW
+
+Signed-off-by: Tom Rini <trini@konsulko.com>
+---
+
+diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
+index 0b82c2fdaf71..31ae9f74e7ac 100644
+--- a/drivers/usb/host/Kconfig
++++ b/drivers/usb/host/Kconfig
+@@ -297,10 +297,17 @@ config USB_EHCI_TXFIFO_THRESH
+	  Enables support for the on-chip EHCI controller on FSL chips.
+ endif # USB_EHCI_HCD
+ 
++config USB_OHCI_NEW
++	bool
++
++config SYS_USB_OHCI_CPU_INIT
++	bool
++
+ config USB_OHCI_HCD
+ 	bool "OHCI HCD (USB 1.1) support"
+ 	depends on DM && OF_CONTROL
+ 	select USB_HOST
++	select USB_OHCI_NEW
+ 	---help---
+ 	  The Open Host Controller Interface (OHCI) is a standard for accessing
+ 	  USB 1.1 host controller hardware.  It does more in hardware than Intel's
+@@ -332,6 +339,19 @@ config USB_OHCI_DA8XX
+ 
+ endif # USB_OHCI_HCD
+ 
++config SYS_USB_OHCI_SLOT_NAME
++	string "Display name for the OHCI controller"
++	depends on USB_OHCI_NEW && !DM_USB
++
++config SYS_USB_OHCI_MAX_ROOT_PORTS
++	int "Maximal number of ports of the root hub"
++	depends on USB_OHCI_NEW
++	default 1 if ARCH_SUNXI
++
++config SYS_OHCI_SWAP_REG_ACCESS
++	bool "Perform byte swapping on OHCI controller register accesses"
++	depends on USB_OHCI_NEW
++
+ config USB_UHCI_HCD
+ 	bool "UHCI HCD (most Intel and VIA) support"
+ 	select USB_HOST
+@@ -381,3 +401,27 @@ config USB_R8A66597_HCD
+ 	---help---
+ 	  This enables support for the on-chip Renesas R8A66597 USB 2.0
+ 	  controller, present in various RZ and SH SoCs.
++
++config USB_ATMEL
++	bool "AT91 OHCI USB support"
++	depends on ARCH_AT91
++	select SYS_USB_OHCI_CPU_INIT
++	select USB_OHCI_NEW
++
++choice
++	prompt "Clock for OHCI"
++	depends on USB_ATMEL
++
++config USB_ATMEL_CLK_SEL_PLLB
++	bool "PLLB"
++
++config USB_ATMEL_CLK_SEL_UPLL
++	bool "UPLL"
++
++endchoice
++
++config USB_OHCI_LPC32XX
++	bool "LPC32xx USB OHCI support"
++	depends on ARCH_LPC32XX
++	select SYS_USB_OHCI_CPU_INIT
++	select USB_OHCI_NEW
+diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
+index 8ceabaf45c1b..9b955c1bd678 100644
+--- a/drivers/usb/host/ohci-at91.c
++++ b/drivers/usb/host/ohci-at91.c
+@@ -5,9 +5,6 @@
+  */
+ 
+ #include <common.h>
+-
+-#if defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_CPU_INIT)
+-
+ #include <asm/arch/clk.h>
+ 
+ int usb_cpu_init(void)
+@@ -65,5 +62,3 @@ int usb_cpu_init_fail(void)
+ {
+ 	return usb_cpu_stop();
+ }
+-
+-#endif /* defined(CONFIG_USB_OHCI) && defined(CONFIG_SYS_USB_OHCI_CPU_INIT) */
+diff --git a/drivers/usb/host/ohci-generic.c b/drivers/usb/host/ohci-generic.c
+index 163f0ef17b11..5d23058aaf6a 100644
+--- a/drivers/usb/host/ohci-generic.c
++++ b/drivers/usb/host/ohci-generic.c
+@@ -14,10 +14,6 @@
+ #include <reset.h>
+ #include "ohci.h"
+ 
+-#if !defined(CONFIG_USB_OHCI_NEW)
+-# error "Generic OHCI driver requires CONFIG_USB_OHCI_NEW"
+-#endif
+-
+ struct generic_ohci {
+ 	ohci_t ohci;
+ 	struct clk *clocks;	/* clock list */
+diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h
+index a38cd25eb85f..7699f2e6b15a 100644
+--- a/drivers/usb/host/ohci.h
++++ b/drivers/usb/host/ohci.h
+@@ -151,7 +151,7 @@ struct ohci_hcca {
+  * Maximum number of root hub ports.
+  */
+ #ifndef CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS
+-# error "CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS undefined!"
++#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1
+ #endif
+ 
+ /*