usb: host: remove dead EHCI support for on-chip PMC MSP71xx USB controller
authorLukas Bulwahn <lukas.bulwahn@gmail.com>
Wed, 18 Aug 2021 07:11:35 +0000 (09:11 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Aug 2021 13:32:19 +0000 (15:32 +0200)
Commit 1b00767fd8e1 ("MIPS: Remove PMC MSP71xx platform") deletes
./arch/mips/pmcs-msp71xx/Kconfig, including its config  MSP_HAS_USB.

Hence, since then, the corresponding EHCI support for on-chip PMC MSP71xx
USB controller is dead code. Remove this dead driver.

Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Link: https://lore.kernel.org/r/20210818071137.22711-2-lukas.bulwahn@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/Kconfig
drivers/usb/host/ehci-hcd.c
drivers/usb/host/ehci-pmcmsp.c [deleted file]

index df9428f..c4736d1 100644 (file)
@@ -187,15 +187,6 @@ config USB_EHCI_PCI
        depends on USB_PCI
        default y
 
-config USB_EHCI_HCD_PMC_MSP
-       tristate "EHCI support for on-chip PMC MSP71xx USB controller"
-       depends on MSP_HAS_USB
-       select USB_EHCI_BIG_ENDIAN_DESC
-       select USB_EHCI_BIG_ENDIAN_MMIO
-       help
-               Enables support for the onchip USB controller on the PMC_MSP7100 Family SoC's.
-               If unsure, say N.
-
 config XPS_USB_HCD_XILINX
        bool "Use Xilinx usb host EHCI controller core"
        depends on (PPC32 || MICROBLAZE)
index 10b0365..6bdc6d6 100644 (file)
@@ -1296,11 +1296,6 @@ MODULE_LICENSE ("GPL");
 #define XILINX_OF_PLATFORM_DRIVER      ehci_hcd_xilinx_of_driver
 #endif
 
-#ifdef CONFIG_USB_EHCI_HCD_PMC_MSP
-#include "ehci-pmcmsp.c"
-#define        PLATFORM_DRIVER         ehci_hcd_msp_driver
-#endif
-
 #ifdef CONFIG_SPARC_LEON
 #include "ehci-grlib.c"
 #define PLATFORM_DRIVER                ehci_grlib_driver
diff --git a/drivers/usb/host/ehci-pmcmsp.c b/drivers/usb/host/ehci-pmcmsp.c
deleted file mode 100644 (file)
index 5fb92b9..0000000
+++ /dev/null
@@ -1,328 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * PMC MSP EHCI (Host Controller Driver) for USB.
- *
- * (C) Copyright 2006-2010 PMC-Sierra Inc
- */
-
-/* includes */
-#include <linux/platform_device.h>
-#include <linux/gpio.h>
-#include <linux/usb.h>
-#include <msp_usb.h>
-
-/* stream disable*/
-#define USB_CTRL_MODE_STREAM_DISABLE   0x10
-
-/* threshold */
-#define USB_CTRL_FIFO_THRESH           0x00300000
-
-/* register offset for usb_mode */
-#define USB_EHCI_REG_USB_MODE          0x68
-
-/* register offset for usb fifo */
-#define USB_EHCI_REG_USB_FIFO          0x24
-
-/* register offset for usb status */
-#define USB_EHCI_REG_USB_STATUS                0x44
-
-/* serial/parallel transceiver */
-#define USB_EHCI_REG_BIT_STAT_STS      (1<<29)
-
-/* TWI USB0 host device pin */
-#define MSP_PIN_USB0_HOST_DEV          49
-
-/* TWI USB1 host device pin */
-#define MSP_PIN_USB1_HOST_DEV          50
-
-
-static void usb_hcd_tdi_set_mode(struct ehci_hcd *ehci)
-{
-       u8 *base;
-       u8 *statreg;
-       u8 *fiforeg;
-       u32 val;
-       struct ehci_regs *reg_base = ehci->regs;
-
-       /* get register base */
-       base = (u8 *)reg_base + USB_EHCI_REG_USB_MODE;
-       statreg = (u8 *)reg_base + USB_EHCI_REG_USB_STATUS;
-       fiforeg = (u8 *)reg_base + USB_EHCI_REG_USB_FIFO;
-
-       /* Disable controller mode stream */
-       val = ehci_readl(ehci, (u32 *)base);
-       ehci_writel(ehci, (val | USB_CTRL_MODE_STREAM_DISABLE),
-                       (u32 *)base);
-
-       /* clear STS to select parallel transceiver interface */
-       val = ehci_readl(ehci, (u32 *)statreg);
-       val = val & ~USB_EHCI_REG_BIT_STAT_STS;
-       ehci_writel(ehci, val, (u32 *)statreg);
-
-       /* write to set the proper fifo threshold */
-       ehci_writel(ehci, USB_CTRL_FIFO_THRESH, (u32 *)fiforeg);
-
-       /* set TWI GPIO USB_HOST_DEV pin high */
-       gpio_direction_output(MSP_PIN_USB0_HOST_DEV, 1);
-}
-
-/* called during probe() after chip reset completes */
-static int ehci_msp_setup(struct usb_hcd *hcd)
-{
-       struct ehci_hcd         *ehci = hcd_to_ehci(hcd);
-       int                     retval;
-
-       ehci->big_endian_mmio = 1;
-       ehci->big_endian_desc = 1;
-
-       ehci->caps = hcd->regs;
-       hcd->has_tt = 1;
-
-       retval = ehci_setup(hcd);
-       if (retval)
-               return retval;
-
-       usb_hcd_tdi_set_mode(ehci);
-
-       return retval;
-}
-
-
-/* configure so an HC device and id are always provided
- * always called with process context; sleeping is OK
- */
-
-static int usb_hcd_msp_map_regs(struct mspusb_device *dev)
-{
-       struct resource *res;
-       struct platform_device *pdev = &dev->dev;
-       u32 res_len;
-       int retval;
-
-       /* MAB register space */
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-       if (res == NULL)
-               return -ENOMEM;
-       res_len = resource_size(res);
-       if (!request_mem_region(res->start, res_len, "mab regs"))
-               return -EBUSY;
-
-       dev->mab_regs = ioremap(res->start, res_len);
-       if (dev->mab_regs == NULL) {
-               retval = -ENOMEM;
-               goto err1;
-       }
-
-       /* MSP USB register space */
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
-       if (res == NULL) {
-               retval = -ENOMEM;
-               goto err2;
-       }
-       res_len = resource_size(res);
-       if (!request_mem_region(res->start, res_len, "usbid regs")) {
-               retval = -EBUSY;
-               goto err2;
-       }
-       dev->usbid_regs = ioremap(res->start, res_len);
-       if (dev->usbid_regs == NULL) {
-               retval = -ENOMEM;
-               goto err3;
-       }
-
-       return 0;
-err3:
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
-       res_len = resource_size(res);
-       release_mem_region(res->start, res_len);
-err2:
-       iounmap(dev->mab_regs);
-err1:
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-       res_len = resource_size(res);
-       release_mem_region(res->start, res_len);
-       dev_err(&pdev->dev, "Failed to map non-EHCI regs.\n");
-       return retval;
-}
-
-/**
- * usb_hcd_msp_probe - initialize PMC MSP-based HCDs
- * @driver:    Pointer to hc driver instance
- * @dev:       USB controller to probe
- *
- * Context: task context, might sleep
- *
- * Allocates basic resources for this USB host controller, and
- * then invokes the start() method for the HCD associated with it
- * through the hotplug entry's driver_data.
- */
-int usb_hcd_msp_probe(const struct hc_driver *driver,
-                         struct platform_device *dev)
-{
-       int retval;
-       struct usb_hcd *hcd;
-       struct resource *res;
-       struct ehci_hcd         *ehci ;
-
-       hcd = usb_create_hcd(driver, &dev->dev, "pmcmsp");
-       if (!hcd)
-               return -ENOMEM;
-
-       res = platform_get_resource(dev, IORESOURCE_MEM, 0);
-       if (res == NULL) {
-               pr_debug("No IOMEM resource info for %s.\n", dev->name);
-               retval = -ENOMEM;
-               goto err1;
-       }
-       hcd->rsrc_start = res->start;
-       hcd->rsrc_len = resource_size(res);
-       if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, dev->name)) {
-               retval = -EBUSY;
-               goto err1;
-       }
-       hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
-       if (!hcd->regs) {
-               pr_debug("ioremap failed");
-               retval = -ENOMEM;
-               goto err2;
-       }
-
-       res = platform_get_resource(dev, IORESOURCE_IRQ, 0);
-       if (res == NULL) {
-               dev_err(&dev->dev, "No IRQ resource info for %s.\n", dev->name);
-               retval = -ENOMEM;
-               goto err3;
-       }
-
-       /* Map non-EHCI register spaces */
-       retval = usb_hcd_msp_map_regs(to_mspusb_device(dev));
-       if (retval != 0)
-               goto err3;
-
-       ehci = hcd_to_ehci(hcd);
-       ehci->big_endian_mmio = 1;
-       ehci->big_endian_desc = 1;
-
-
-       retval = usb_add_hcd(hcd, res->start, IRQF_SHARED);
-       if (retval == 0) {
-               device_wakeup_enable(hcd->self.controller);
-               return 0;
-       }
-
-       usb_remove_hcd(hcd);
-err3:
-       iounmap(hcd->regs);
-err2:
-       release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
-err1:
-       usb_put_hcd(hcd);
-
-       return retval;
-}
-
-
-
-/**
- * usb_hcd_msp_remove - shutdown processing for PMC MSP-based HCDs
- * @hcd: USB Host Controller being removed
- *
- * Context: task context, might sleep
- *
- * Reverses the effect of usb_hcd_msp_probe(), first invoking
- * the HCD's stop() method.  It is always called from a thread
- * context, normally "rmmod", "apmd", or something similar.
- *
- * may be called without controller electrically present
- * may be called with controller, bus, and devices active
- */
-static void usb_hcd_msp_remove(struct usb_hcd *hcd)
-{
-       usb_remove_hcd(hcd);
-       iounmap(hcd->regs);
-       release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
-       usb_put_hcd(hcd);
-}
-
-static const struct hc_driver ehci_msp_hc_driver = {
-       .description =          hcd_name,
-       .product_desc =         "PMC MSP EHCI",
-       .hcd_priv_size =        sizeof(struct ehci_hcd),
-
-       /*
-        * generic hardware linkage
-        */
-       .irq =                  ehci_irq,
-       .flags =                HCD_MEMORY | HCD_DMA | HCD_USB2 | HCD_BH,
-
-       /*
-        * basic lifecycle operations
-        */
-       .reset                  = ehci_msp_setup,
-       .shutdown               = ehci_shutdown,
-       .start                  = ehci_run,
-       .stop                   = ehci_stop,
-
-       /*
-        * managing i/o requests and associated device resources
-        */
-       .urb_enqueue            = ehci_urb_enqueue,
-       .urb_dequeue            = ehci_urb_dequeue,
-       .endpoint_disable       = ehci_endpoint_disable,
-       .endpoint_reset         = ehci_endpoint_reset,
-
-       /*
-        * scheduling support
-        */
-       .get_frame_number       = ehci_get_frame,
-
-       /*
-        * root hub support
-        */
-       .hub_status_data        = ehci_hub_status_data,
-       .hub_control            = ehci_hub_control,
-       .bus_suspend            = ehci_bus_suspend,
-       .bus_resume             = ehci_bus_resume,
-       .relinquish_port        = ehci_relinquish_port,
-       .port_handed_over       = ehci_port_handed_over,
-
-       .clear_tt_buffer_complete       = ehci_clear_tt_buffer_complete,
-};
-
-static int ehci_hcd_msp_drv_probe(struct platform_device *pdev)
-{
-       int ret;
-
-       pr_debug("In ehci_hcd_msp_drv_probe");
-
-       if (usb_disabled())
-               return -ENODEV;
-
-       gpio_request(MSP_PIN_USB0_HOST_DEV, "USB0_HOST_DEV_GPIO");
-
-       ret = usb_hcd_msp_probe(&ehci_msp_hc_driver, pdev);
-
-       return ret;
-}
-
-static int ehci_hcd_msp_drv_remove(struct platform_device *pdev)
-{
-       struct usb_hcd *hcd = platform_get_drvdata(pdev);
-
-       usb_hcd_msp_remove(hcd);
-
-       /* free TWI GPIO USB_HOST_DEV pin */
-       gpio_free(MSP_PIN_USB0_HOST_DEV);
-
-       return 0;
-}
-
-MODULE_ALIAS("pmcmsp-ehci");
-
-static struct platform_driver ehci_hcd_msp_driver = {
-       .probe          = ehci_hcd_msp_drv_probe,
-       .remove         = ehci_hcd_msp_drv_remove,
-       .driver         = {
-               .name   = "pmcmsp-ehci",
-       },
-};