mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
138 lines
3.7 KiB
Diff
138 lines
3.7 KiB
Diff
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
|
|
|
|
/*
|