usb: host: Remove the deprecated ATH79 USB host config options

The options USB_EHCI_ATH79 and USB_OHCI_ATH79 only enable the
generic EHCI and OHCI platform drivers, and have been marked as
deprecated since 2012.

These can be safely removed if we make sure that USB_EHCI_ROOT_HUB_TT
still get enabled for the EHCI driver. This is now done be selecting
this option when the EHCI platform driver is enabled on the ATH79
platform.

Signed-off-by: Alban Bedel <albeu@free.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 8128c3b68d6b013f022e3fbe51da21976913551e..61e9a24297b7d6f3ca06104c56d2f261b3e97e9e 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -200,6 +200,7 @@ config ATH79
        select SYS_SUPPORTS_MIPS16
        select SYS_SUPPORTS_ZBOOT_UART_PROM
        select USE_OF
+       select USB_EHCI_ROOT_HUB_TT if USB_EHCI_HCD_PLATFORM
        help
          Support for the Atheros AR71XX/AR724X/AR913X SoCs.
 

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 4fcfb3084b3689102657641cfd674656fd1ca5c3..55b45dcd7a4b8bfcb8e6e2bb7bf8a077bfcc64a8 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -293,19 +293,6 @@ config USB_CNS3XXX_EHCI
          It is needed for high-speed (480Mbit/sec) USB 2.0 device
          support.
 
-config USB_EHCI_ATH79
-       bool "EHCI support for AR7XXX/AR9XXX SoCs (DEPRECATED)"
-       depends on (SOC_AR71XX || SOC_AR724X || SOC_AR913X || SOC_AR933X)
-       select USB_EHCI_ROOT_HUB_TT
-       select USB_EHCI_HCD_PLATFORM
-       default y
-       ---help---
-         This option is deprecated now and the driver was removed, use
-         USB_EHCI_HCD_PLATFORM instead.
-
-         Enables support for the built-in EHCI controller present
-         on the Atheros AR7XXX/AR9XXX SoCs.
-
 config USB_EHCI_HCD_PLATFORM
        tristate "Generic EHCI driver for a platform device"
        default n
@@ -489,18 +476,6 @@ config USB_OHCI_HCD_DAVINCI
          controller. This driver cannot currently be a loadable
          module because it lacks a proper PHY abstraction.
 
-config USB_OHCI_ATH79
-       bool "USB OHCI support for the Atheros AR71XX/AR7240 SoCs (DEPRECATED)"
-       depends on (SOC_AR71XX || SOC_AR724X)
-       select USB_OHCI_HCD_PLATFORM
-       default y
-       help
-         This option is deprecated now and the driver was removed, use
-         USB_OHCI_HCD_PLATFORM instead.
-
-         Enables support for the built-in OHCI controller present on the
-         Atheros AR71XX/AR7240 SoCs.
-
 config USB_OHCI_HCD_PPC_OF_BE
        bool "OHCI support for OF platform bus (big endian)"
        depends on PPC