arm: minor usb config tweaks

17 files changed, 29 insertions, 12 deletions

diff --git a/configs/fedora/generic/CONFIG_USB_OHCI_HCD_SSB b/configs/fedora/generic/CONFIG_USB_OHCI_HCD_SSB
new file mode 100644
index 000000000..eb3e84ce6
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_USB_OHCI_HCD_SSB
@@ -0,0 +1 @@
+# CONFIG_USB_OHCI_HCD_SSB is not set
diff --git a/configs/fedora/generic/arm/CONFIG_USB_EHCI_HCD b/configs/fedora/generic/arm/CONFIG_USB_EHCI_HCD
new file mode 100644
index 000000000..a2df656e0
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_USB_EHCI_HCD
@@ -0,0 +1 @@
+CONFIG_USB_EHCI_HCD=m
diff --git a/configs/fedora/generic/arm/CONFIG_USB_OHCI_HCD b/configs/fedora/generic/arm/CONFIG_USB_OHCI_HCD
new file mode 100644
index 000000000..b57227638
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_USB_OHCI_HCD
@@ -0,0 +1 @@
+CONFIG_USB_OHCI_HCD=m
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 3c83a7a82..bc3f82c13 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -6692,9 +6692,9 @@ CONFIG_USB_DWC3_ULPI=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_EG20T is not set
 CONFIG_USB_EHCI_FSL=m
+CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_HCD_ORION=m
 CONFIG_USB_EHCI_HCD_PLATFORM=m
-CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_MXC is not set
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TEGRA=m
@@ -6864,9 +6864,10 @@ CONFIG_USB_NET_SMSC95XX=m
 CONFIG_USB_NET_SR9700=m
 # CONFIG_USB_NET_SR9800 is not set
 CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_OHCI_HCD_PCI=m
 CONFIG_USB_OHCI_HCD_PLATFORM=m
-CONFIG_USB_OHCI_HCD=y
+# CONFIG_USB_OHCI_HCD_SSB is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 CONFIG_USB_OTG_FSM=m
 # CONFIG_USB_OTG_WHITELIST is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 9c9b9f0ba..1247d620b 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -6670,9 +6670,9 @@ CONFIG_USB_DWC3_ULPI=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_EG20T is not set
 CONFIG_USB_EHCI_FSL=m
+CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_HCD_ORION=m
 CONFIG_USB_EHCI_HCD_PLATFORM=m
-CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_MXC is not set
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TEGRA=m
@@ -6842,9 +6842,10 @@ CONFIG_USB_NET_SMSC95XX=m
 CONFIG_USB_NET_SR9700=m
 # CONFIG_USB_NET_SR9800 is not set
 CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_OHCI_HCD_PCI=m
 CONFIG_USB_OHCI_HCD_PLATFORM=m
-CONFIG_USB_OHCI_HCD=y
+# CONFIG_USB_OHCI_HCD_SSB is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 CONFIG_USB_OTG_FSM=m
 # CONFIG_USB_OTG_WHITELIST is not set
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 0d6a11c76..21a160564 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -6944,11 +6944,11 @@ CONFIG_USB_DWC3_ULPI=y
 # CONFIG_USB_EG20T is not set
 CONFIG_USB_EHCI_EXYNOS=m
 # CONFIG_USB_EHCI_FSL is not set
+CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_HCD_OMAP=m
 CONFIG_USB_EHCI_HCD_ORION=m
 CONFIG_USB_EHCI_HCD_PLATFORM=m
 CONFIG_USB_EHCI_HCD_STI=m
-CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_MV=m
 # CONFIG_USB_EHCI_MV_U2O is not set
 CONFIG_USB_EHCI_MXC=m
@@ -7127,11 +7127,12 @@ CONFIG_USB_NET_SR9700=m
 # CONFIG_USB_NET_SR9800 is not set
 CONFIG_USB_NET_ZAURUS=m
 CONFIG_USB_OHCI_EXYNOS=m
+CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_OHCI_HCD_OMAP3=m
 CONFIG_USB_OHCI_HCD_PCI=m
 CONFIG_USB_OHCI_HCD_PLATFORM=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
 CONFIG_USB_OHCI_HCD_STI=m
-CONFIG_USB_OHCI_HCD=y
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 CONFIG_USB_OTG_FSM=m
 # CONFIG_USB_OTG_WHITELIST is not set
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 68df342ff..bbbc5e1ea 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -6923,11 +6923,11 @@ CONFIG_USB_DWC3_ULPI=y
 # CONFIG_USB_EG20T is not set
 CONFIG_USB_EHCI_EXYNOS=m
 # CONFIG_USB_EHCI_FSL is not set
+CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_HCD_OMAP=m
 CONFIG_USB_EHCI_HCD_ORION=m
 CONFIG_USB_EHCI_HCD_PLATFORM=m
 CONFIG_USB_EHCI_HCD_STI=m
-CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_MV=m
 # CONFIG_USB_EHCI_MV_U2O is not set
 CONFIG_USB_EHCI_MXC=m
@@ -7106,11 +7106,12 @@ CONFIG_USB_NET_SR9700=m
 # CONFIG_USB_NET_SR9800 is not set
 CONFIG_USB_NET_ZAURUS=m
 CONFIG_USB_OHCI_EXYNOS=m
+CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_OHCI_HCD_OMAP3=m
 CONFIG_USB_OHCI_HCD_PCI=m
 CONFIG_USB_OHCI_HCD_PLATFORM=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
 CONFIG_USB_OHCI_HCD_STI=m
-CONFIG_USB_OHCI_HCD=y
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 CONFIG_USB_OTG_FSM=m
 # CONFIG_USB_OTG_WHITELIST is not set
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 91a6fd95c..545bb9f45 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -6612,9 +6612,9 @@ CONFIG_USB_DWC3_ULPI=y
 # CONFIG_USB_EG20T is not set
 CONFIG_USB_EHCI_EXYNOS=m
 # CONFIG_USB_EHCI_FSL is not set
+CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_HCD_ORION=m
 CONFIG_USB_EHCI_HCD_PLATFORM=m
-CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TEGRA=m
 CONFIG_USB_EHCI_TT_NEWSCHED=y
@@ -6782,9 +6782,10 @@ CONFIG_USB_NET_SR9700=m
 # CONFIG_USB_NET_SR9800 is not set
 CONFIG_USB_NET_ZAURUS=m
 CONFIG_USB_OHCI_EXYNOS=m
+CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_OHCI_HCD_PCI=m
 CONFIG_USB_OHCI_HCD_PLATFORM=m
-CONFIG_USB_OHCI_HCD=y
+# CONFIG_USB_OHCI_HCD_SSB is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 CONFIG_USB_OTG_FSM=m
 # CONFIG_USB_OTG_WHITELIST is not set
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 6a15c5191..94bc2eea8 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -6591,9 +6591,9 @@ CONFIG_USB_DWC3_ULPI=y
 # CONFIG_USB_EG20T is not set
 CONFIG_USB_EHCI_EXYNOS=m
 # CONFIG_USB_EHCI_FSL is not set
+CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_HCD_ORION=m
 CONFIG_USB_EHCI_HCD_PLATFORM=m
-CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TEGRA=m
 CONFIG_USB_EHCI_TT_NEWSCHED=y
@@ -6761,9 +6761,10 @@ CONFIG_USB_NET_SR9700=m
 # CONFIG_USB_NET_SR9800 is not set
 CONFIG_USB_NET_ZAURUS=m
 CONFIG_USB_OHCI_EXYNOS=m
+CONFIG_USB_OHCI_HCD=m
 CONFIG_USB_OHCI_HCD_PCI=m
 CONFIG_USB_OHCI_HCD_PLATFORM=m
-CONFIG_USB_OHCI_HCD=y
+# CONFIG_USB_OHCI_HCD_SSB is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 CONFIG_USB_OTG_FSM=m
 # CONFIG_USB_OTG_WHITELIST is not set
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index abbd6606b..24193dcbc 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -6180,6 +6180,7 @@ CONFIG_USB_NET_SR9700=m
 CONFIG_USB_NET_ZAURUS=m
 CONFIG_USB_OHCI_HCD_PCI=y
 # CONFIG_USB_OHCI_HCD_PLATFORM is not set
+# CONFIG_USB_OHCI_HCD_SSB is not set
 CONFIG_USB_OHCI_HCD=y
 # CONFIG_USB_OTG_FSM is not set
 # CONFIG_USB_OTG is not set
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 74ad25121..011d52613 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -6159,6 +6159,7 @@ CONFIG_USB_NET_SR9700=m
 CONFIG_USB_NET_ZAURUS=m
 CONFIG_USB_OHCI_HCD_PCI=y
 # CONFIG_USB_OHCI_HCD_PLATFORM is not set
+# CONFIG_USB_OHCI_HCD_SSB is not set
 CONFIG_USB_OHCI_HCD=y
 # CONFIG_USB_OTG_FSM is not set
 # CONFIG_USB_OTG is not set
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 459d8630b..7518e82a2 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -5813,6 +5813,7 @@ CONFIG_USB_OHCI_HCD_PCI=y
 CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
 CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
 CONFIG_USB_OHCI_HCD_PPC_OF=y
+# CONFIG_USB_OHCI_HCD_SSB is not set
 CONFIG_USB_OHCI_HCD=y
 # CONFIG_USB_OTG_FSM is not set
 # CONFIG_USB_OTG is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 13d8d9d1c..b2d84eee8 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -5790,6 +5790,7 @@ CONFIG_USB_OHCI_HCD_PCI=y
 CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
 CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
 CONFIG_USB_OHCI_HCD_PPC_OF=y
+# CONFIG_USB_OHCI_HCD_SSB is not set
 CONFIG_USB_OHCI_HCD=y
 # CONFIG_USB_OTG_FSM is not set
 # CONFIG_USB_OTG is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 9a2501c95..7ef9ab9ca 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -5750,6 +5750,7 @@ CONFIG_USB_NET_SR9700=m
 CONFIG_USB_NET_ZAURUS=m
 CONFIG_USB_OHCI_HCD_PCI=y
 # CONFIG_USB_OHCI_HCD_PLATFORM is not set
+# CONFIG_USB_OHCI_HCD_SSB is not set
 CONFIG_USB_OHCI_HCD=y
 # CONFIG_USB_OTG_FSM is not set
 # CONFIG_USB_OTG is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 237b2a434..e477b11a2 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -5727,6 +5727,7 @@ CONFIG_USB_NET_SR9700=m
 CONFIG_USB_NET_ZAURUS=m
 CONFIG_USB_OHCI_HCD_PCI=y
 # CONFIG_USB_OHCI_HCD_PLATFORM is not set
+# CONFIG_USB_OHCI_HCD_SSB is not set
 CONFIG_USB_OHCI_HCD=y
 # CONFIG_USB_OTG_FSM is not set
 # CONFIG_USB_OTG is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 4ff2b06d2..512606e79 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -6235,6 +6235,7 @@ CONFIG_USB_NET_SR9700=m
 CONFIG_USB_NET_ZAURUS=m
 CONFIG_USB_OHCI_HCD_PCI=y
 # CONFIG_USB_OHCI_HCD_PLATFORM is not set
+# CONFIG_USB_OHCI_HCD_SSB is not set
 CONFIG_USB_OHCI_HCD=y
 # CONFIG_USB_OTG_FSM is not set
 # CONFIG_USB_OTG is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index d03767fad..29bc442fc 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -6214,6 +6214,7 @@ CONFIG_USB_NET_SR9700=m
 CONFIG_USB_NET_ZAURUS=m
 CONFIG_USB_OHCI_HCD_PCI=y
 # CONFIG_USB_OHCI_HCD_PLATFORM is not set
+# CONFIG_USB_OHCI_HCD_SSB is not set
 CONFIG_USB_OHCI_HCD=y
 # CONFIG_USB_OTG_FSM is not set
 # CONFIG_USB_OTG is not set