usb: remove ehci-w90x900 driver

The ARM w90x900 platform is getting removed, so this driver is obsolete.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20190809202749.742267-16-arnd@arndb.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index d040408f5baaff306458d4182eef66ca35f639ef..f39f24f107f45afa347e6ff180ea8673f744a445 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -287,12 +287,6 @@ config USB_EHCI_MV
          Dova, Armada 370 and Armada XP. See "Support for Marvell EBU
          on-chip EHCI USB controller" for those.
 
-config USB_W90X900_EHCI
-       tristate "W90X900(W90P910) EHCI support"
-       depends on ARCH_W90X900
-       ---help---
-               Enables support for the W90X900 USB controller
-
 config USB_CNS3XXX_EHCI
        bool "Cavium CNS3XXX EHCI Module (DEPRECATED)"
        depends on ARCH_CNS3XXX

diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
index 59b39e6b350b3ebf26b696be97512d32ec02c519..b191361257cc5d0d738624edd744a68bcb5d4b3e 100644 (file)
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
@@ -49,7 +49,6 @@ obj-$(CONFIG_USB_EHCI_HCD_STI)        += ehci-st.o
 obj-$(CONFIG_USB_EHCI_EXYNOS)  += ehci-exynos.o
 obj-$(CONFIG_USB_EHCI_HCD_AT91) += ehci-atmel.o
 obj-$(CONFIG_USB_EHCI_TEGRA)   += ehci-tegra.o
-obj-$(CONFIG_USB_W90X900_EHCI) += ehci-w90x900.o
 
 obj-$(CONFIG_USB_OXU210HP_HCD) += oxu210hp-hcd.o
 obj-$(CONFIG_USB_ISP116X_HCD)  += isp116x-hcd.o

diff --git a/drivers/usb/host/ehci-w90x900.c b/drivers/usb/host/ehci-w90x900.c
deleted file mode 100644 (file)
index 6d77ace..0000000
--- a/drivers/usb/host/ehci-w90x900.c
+++ /dev/null
@@ -1,130 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * linux/driver/usb/host/ehci-w90x900.c
- *
- * Copyright (c) 2008 Nuvoton technology corporation.
- *
- * Wan ZongShun <mcuos.com@gmail.com>
- */
-
-#include <linux/dma-mapping.h>
-#include <linux/io.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/of.h>
-#include <linux/platform_device.h>
-#include <linux/usb.h>
-#include <linux/usb/hcd.h>
-
-#include "ehci.h"
-
-/* enable phy0 and phy1 for w90p910 */
-#define        ENPHY           (0x01<<8)
-#define PHY0_CTR       (0xA4)
-#define PHY1_CTR       (0xA8)
-
-#define DRIVER_DESC "EHCI w90x900 driver"
-
-static const char hcd_name[] = "ehci-w90x900 ";
-
-static struct hc_driver __read_mostly ehci_w90x900_hc_driver;
-
-static int ehci_w90x900_probe(struct platform_device *pdev)
-{
-       struct usb_hcd *hcd;
-       struct ehci_hcd *ehci;
-       struct resource *res;
-       int retval = 0, irq;
-       unsigned long val;
-
-       hcd = usb_create_hcd(&ehci_w90x900_hc_driver,
-                       &pdev->dev, "w90x900 EHCI");
-       if (!hcd) {
-               retval = -ENOMEM;
-               goto err1;
-       }
-
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       hcd->regs = devm_ioremap_resource(&pdev->dev, res);
-       if (IS_ERR(hcd->regs)) {
-               retval = PTR_ERR(hcd->regs);
-               goto err2;
-       }
-       hcd->rsrc_start = res->start;
-       hcd->rsrc_len = resource_size(res);
-
-       ehci = hcd_to_ehci(hcd);
-       ehci->caps = hcd->regs;
-       ehci->regs = hcd->regs +
-               HC_LENGTH(ehci, ehci_readl(ehci, &ehci->caps->hc_capbase));
-
-       /* enable PHY 0,1,the regs only apply to w90p910
-        *  0xA4,0xA8 were offsets of PHY0 and PHY1 controller of
-        *  w90p910 IC relative to ehci->regs.
-        */
-       val = __raw_readl(ehci->regs+PHY0_CTR);
-       val |= ENPHY;
-       __raw_writel(val, ehci->regs+PHY0_CTR);
-
-       val = __raw_readl(ehci->regs+PHY1_CTR);
-       val |= ENPHY;
-       __raw_writel(val, ehci->regs+PHY1_CTR);
-
-       irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               retval = irq;
-               goto err2;
-       }
-
-       retval = usb_add_hcd(hcd, irq, IRQF_SHARED);
-       if (retval != 0)
-               goto err2;
-
-       device_wakeup_enable(hcd->self.controller);
-       return retval;
-err2:
-       usb_put_hcd(hcd);
-err1:
-       return retval;
-}
-
-static int ehci_w90x900_remove(struct platform_device *pdev)
-{
-       struct usb_hcd *hcd = platform_get_drvdata(pdev);
-
-       usb_remove_hcd(hcd);
-       usb_put_hcd(hcd);
-
-       return 0;
-}
-
-static struct platform_driver ehci_hcd_w90x900_driver = {
-       .probe  = ehci_w90x900_probe,
-       .remove = ehci_w90x900_remove,
-       .driver = {
-               .name = "w90x900-ehci",
-       },
-};
-
-static int __init ehci_w90X900_init(void)
-{
-       if (usb_disabled())
-               return -ENODEV;
-
-       pr_info("%s: " DRIVER_DESC "\n", hcd_name);
-
-       ehci_init_driver(&ehci_w90x900_hc_driver, NULL);
-       return platform_driver_register(&ehci_hcd_w90x900_driver);
-}
-module_init(ehci_w90X900_init);
-
-static void __exit ehci_w90X900_cleanup(void)
-{
-       platform_driver_unregister(&ehci_hcd_w90x900_driver);
-}
-module_exit(ehci_w90X900_cleanup);
-
-MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_AUTHOR("Wan ZongShun <mcuos.com@gmail.com>");
-MODULE_ALIAS("platform:w90p910-ehci");
-MODULE_LICENSE("GPL v2");