ARM: tegra: don't set CONFIG_USB_MAX_CONTROLLER_COUNT

This option is no longer used now that DM_USB is enabled.

Fixes: 534f9d3feffd ("dm: tegra: usb: Move USB to driver model")
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>

diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index e1eb700404c8c055c38ea576c6ace43408234d1d..32e9ba38d9df9b21ae9cdc4c57a421926b47fbb8 100644 (file)
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -43,7 +43,6 @@
 /* USB host support */
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_TEGRA
-#define CONFIG_USB_MAX_CONTROLLER_COUNT        3
 #define CONFIG_USB_STORAGE
 #define CONFIG_CMD_USB
 

diff --git a/include/configs/beaver.h b/include/configs/beaver.h
index 89c7446d265d34cc8d9e5c15e5f3dd44da46a86a..c672a8e40cec1e51163b92aac8dfda19900cd842 100644 (file)
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -51,7 +51,6 @@
 /* USB Host support */
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_TEGRA
-#define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 #define CONFIG_USB_STORAGE
 #define CONFIG_CMD_USB
 

diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index f3a1c9609bb1654140f8b87f6dd44f024dfb82a8..b7ad189af32fad3bd3d35b84a908eec8d40c5a47 100644 (file)
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -38,7 +38,6 @@
 #define CONFIG_USB_EHCI_TEGRA
 #define CONFIG_USB_ULPI
 #define CONFIG_USB_ULPI_VIEWPORT
-#define CONFIG_USB_MAX_CONTROLLER_COUNT        3
 #define CONFIG_USB_STORAGE
 #define CONFIG_CMD_USB
 

diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index ef743b0d33cc5749f469e01e0699d17550e0a7b7..47914c767987c521234173641f87affe60a2253d 100644 (file)
--- a/include/configs/colibri_t30.h
+++ b/include/configs/colibri_t30.h
@@ -43,7 +43,6 @@
 /* USB host support */
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_TEGRA
-#define CONFIG_USB_MAX_CONTROLLER_COUNT        3
 #define CONFIG_USB_STORAGE
 #define CONFIG_CMD_USB
 

diff --git a/include/configs/e2220-1170.h b/include/configs/e2220-1170.h
index 18a63d7ec71446e5b8c4302ec777093e9b9f2dc7..33ebb7c7afaa8fcfdfd6332cc98118b0e9b4a656 100644 (file)
--- a/include/configs/e2220-1170.h
+++ b/include/configs/e2220-1170.h
@@ -44,7 +44,6 @@
 /* USB2.0 Host support */
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_TEGRA
-#define CONFIG_USB_MAX_CONTROLLER_COUNT        1
 #define CONFIG_USB_STORAGE
 #define CONFIG_CMD_USB
 

diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index 353caec22f95d84e87fc78307b5929620d8ad5b8..f66ac7087e8775a0810d8781c953eecb91ef5b27 100644 (file)
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -42,7 +42,6 @@
 #define CONFIG_ENV_OFFSET      (SZ_512M - SZ_128K) /* 128K sector size */
 
 /* USB Host support */
-#define CONFIG_USB_MAX_CONTROLLER_COUNT 3
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_TEGRA
 #define CONFIG_USB_ULPI

diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index 23b2e436167c3a078f470c4c417c05b62fac49ab..763d2ec71eee2870e81d81d40aac53ee7a3ac818 100644 (file)
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -48,7 +48,6 @@
 /* USB Host support */
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_TEGRA
-#define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 #define CONFIG_USB_STORAGE
 #define CONFIG_CMD_USB
 

diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h
index d99d93c18ba098644ccc4d5ef57e967198592d48..d528fac8c8926d3f2b49bf8607671dcc466346d6 100644 (file)
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -55,7 +55,6 @@
 /* USB Host support */
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_TEGRA
-#define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 #define CONFIG_USB_STORAGE
 #define CONFIG_CMD_USB
 

diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h
index fffe5c9df80cad6515d35a21f98835cd92a98660..9ca29f8b4ee19712d0f60cef7e2a9fa25c981b84 100644 (file)
--- a/include/configs/p2371-0000.h
+++ b/include/configs/p2371-0000.h
@@ -44,7 +44,6 @@
 /* USB2.0 Host support */
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_TEGRA
-#define CONFIG_USB_MAX_CONTROLLER_COUNT        1
 #define CONFIG_USB_STORAGE
 #define CONFIG_CMD_USB
 

diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h
index 7dbf4221f437a380d8ba26cfb762b47c9115bb34..01fd743d823b0a8778c8ebeeda7909efb9d66783 100644 (file)
--- a/include/configs/p2371-2180.h
+++ b/include/configs/p2371-2180.h
@@ -44,7 +44,6 @@
 /* USB2.0 Host support */
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_TEGRA
-#define CONFIG_USB_MAX_CONTROLLER_COUNT        1
 #define CONFIG_USB_STORAGE
 #define CONFIG_CMD_USB
 

diff --git a/include/configs/p2571.h b/include/configs/p2571.h
index f3357d1e0d5dce56faaba20dfb8d2a2d650c046a..d35e25524f9a42f93e37cde83fc11c1b8d8604d3 100644 (file)
--- a/include/configs/p2571.h
+++ b/include/configs/p2571.h
@@ -45,7 +45,6 @@
 /* USB2.0 Host support */
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_TEGRA
-#define CONFIG_USB_MAX_CONTROLLER_COUNT        1
 #define CONFIG_USB_STORAGE
 #define CONFIG_CMD_USB
 

diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h
index fb9a106da3c5914f223f6f82a6f4fbf29b4b4083..06112139ea8f326dcdf629951402e5c5499b4ee2 100644 (file)
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -45,7 +45,6 @@
 #define CONFIG_SYS_MMC_ENV_PART 2
 
 /* USB Host support */
-#define CONFIG_USB_MAX_CONTROLLER_COUNT 3
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_TEGRA
 #define CONFIG_USB_STORAGE

diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h
index 8761f8de093309b30d75060a2c3f2345fadad587..92ebb6aa4cd714b64a7b384b7d0f4379ec8c3eb2 100644 (file)
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -44,7 +44,6 @@
 #define CONFIG_ENV_OFFSET              (512 * 1024)
 
 /* USB Host support */
-#define CONFIG_USB_MAX_CONTROLLER_COUNT 3
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_TEGRA
 #define CONFIG_USB_STORAGE

diff --git a/include/configs/venice2.h b/include/configs/venice2.h
index 4a0b4483325c38ae6a010b2fffbeecd465a4ebe9..75f7268d10c26a0cb4ea6c9c868683017f6f1537 100644 (file)
--- a/include/configs/venice2.h
+++ b/include/configs/venice2.h
@@ -45,7 +45,6 @@
 /* USB Host support */
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_TEGRA
-#define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 #define CONFIG_USB_STORAGE
 #define CONFIG_CMD_USB