From 000f06974d6a2bdf4d8ad09c27738cc4dcba92b8 Mon Sep 17 00:00:00 2001
From: Tom Rini <trini@konsulko.com>
Date: Sat, 25 Jun 2022 11:02:33 -0400
Subject: [PATCH] usb: Remove some unused CONFIG settings

On platforms that use CONFIG_USB_OHCI_NEW we do not need to set
CONFIG_SYS_USB_OHCI_REGS_BASE nor CONFIG_SYS_USB_OHCI_SLOT_NAME.  Drop
these from platforms that we can.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 include/configs/at91sam9n12ek.h    | 5 -----
 include/configs/at91sam9x5ek.h     | 7 -------
 include/configs/ethernut5.h        | 5 -----
 include/configs/sama5d3_xplained.h | 5 -----
 include/configs/sama5d3xek.h       | 5 -----
 include/configs/smartweb.h         | 3 ---
 include/configs/snapper9260.h      | 3 ---
 include/configs/taurus.h           | 3 ---
 include/configs/usb_a9263.h        | 5 -----
 9 files changed, 41 deletions(-)

diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h
index 4fac0aad42..4d492988eb 100644
--- a/include/configs/at91sam9n12ek.h
+++ b/include/configs/at91sam9n12ek.h
@@ -39,11 +39,6 @@
 	"bootargs_nand=rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs rw\0"\
 	"bootargs_mmc=root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait\0"
 
-/* USB host */
-#ifdef CONFIG_CMD_USB
-#define CONFIG_SYS_USB_OHCI_REGS_BASE	ATMEL_BASE_OHCI
-#endif
-
 /* SPL */
 
 #define CONFIG_SYS_MONITOR_LEN		(512 << 10)
diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index 758a91cdaa..0e7665843d 100644
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -38,13 +38,6 @@
 #define CONFIG_SYS_NAND_READY_PIN	AT91_PIN_PD5
 #endif
 
-/* USB */
-#ifdef CONFIG_CMD_USB
-#ifndef CONFIG_USB_EHCI_HCD
-#define CONFIG_SYS_USB_OHCI_REGS_BASE		ATMEL_BASE_OHCI
-#endif
-#endif
-
 /* SPL */
 
 #define CONFIG_SYS_MONITOR_LEN		(512 << 10)
diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h
index 529b983731..88a702f1af 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -59,11 +59,6 @@
 #define CONFIG_SYS_MMC_CD_PIN		AT91_PIO_PORTC, 8
 #endif
 
-/* USB */
-#ifdef CONFIG_CMD_USB
-#define CONFIG_SYS_USB_OHCI_REGS_BASE	0x00500000
-#endif
-
 /* RTC */
 #if defined(CONFIG_CMD_DATE) || defined(CONFIG_CMD_SNTP)
 #define CONFIG_SYS_I2C_RTC_ADDR		0x51
diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h
index 22839d544a..fad65cb112 100644
--- a/include/configs/sama5d3_xplained.h
+++ b/include/configs/sama5d3_xplained.h
@@ -37,11 +37,6 @@
 #define CONFIG_SYS_NAND_MASK_CLE	(1 << 22)
 #endif
 
-/* USB */
-#ifdef CONFIG_CMD_USB
-#define CONFIG_SYS_USB_OHCI_REGS_BASE		0x00600000
-#endif
-
 /* SPL */
 
 /* size of u-boot.bin to load */
diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h
index dc89148a04..7bc3f91e77 100644
--- a/include/configs/sama5d3xek.h
+++ b/include/configs/sama5d3xek.h
@@ -50,11 +50,6 @@
 #define CONFIG_SYS_NAND_MASK_CLE	(1 << 22)
 #endif
 
-/* USB */
-#ifdef CONFIG_CMD_USB
-#define CONFIG_SYS_USB_OHCI_REGS_BASE		ATMEL_BASE_OHCI
-#endif
-
 /* SPL */
 
 #define CONFIG_SYS_MONITOR_LEN		(512 << 10)
diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index 65bc3c672e..1a3ac817fb 100644
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -66,9 +66,6 @@
 #define CONFIG_USART_BASE		ATMEL_BASE_DBGU
 #define CONFIG_USART_ID			ATMEL_ID_SYS
 
-/* USB configuration */
-#define CONFIG_SYS_USB_OHCI_REGS_BASE	ATMEL_UHP_BASE
-
 /* USB DFU support */
 
 #define CONFIG_USB_GADGET_AT91
diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h
index 2b7afb5d25..7adb349f9a 100644
--- a/include/configs/snapper9260.h
+++ b/include/configs/snapper9260.h
@@ -37,9 +37,6 @@
 #define CONFIG_SYS_NAND_ENABLE_PIN	AT91_PIN_PC14
 #define CONFIG_SYS_NAND_READY_PIN	AT91_PIN_PC13
 
-/* USB */
-#define CONFIG_SYS_USB_OHCI_REGS_BASE	ATMEL_UHP_BASE
-
 /* GPIOs and IO expander */
 #define CONFIG_PCA953X
 #define CONFIG_SYS_I2C_PCA953X_ADDR	0x28
diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index ab2dc3d714..4758e23f55 100644
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -63,10 +63,7 @@
 #define CONFIG_SYS_NAND_READY_PIN	AT91_PIN_PC13
 #endif
 
-/* USB */
 #if defined(CONFIG_BOARD_TAURUS)
-#define CONFIG_SYS_USB_OHCI_REGS_BASE		0x00500000
-
 /* USB DFU support */
 
 #define CONFIG_USB_GADGET_AT91
diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h
index 8cb8c609d0..e0dde1cc83 100644
--- a/include/configs/usb_a9263.h
+++ b/include/configs/usb_a9263.h
@@ -43,11 +43,6 @@
 #define CONFIG_SYS_NAND_READY_PIN		GPIO_PIN_PA(22)
 #endif
 
-/* USB */
-#ifdef CONFIG_CMD_USB
-#define CONFIG_SYS_USB_OHCI_REGS_BASE		0x00a00000
-#endif
-
 /* bootstrap + u-boot + env + linux in dataflash on CS0 */
 #define CONFIG_EXTRA_ENV_SETTINGS \
 
-- 
2.39.5