usb: remove UniPhier EHCI driver

Now, all this driver does can be covered by the generic EHCI driver
(drivers/usb/host/ehci-generic.c).  UniPhier SoCs have switched to
use it.  Delete this driver rather than bothering to convert it to
Driver Model.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Marek Vasut <marex@denx.de>

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 39f7185e8600686e9cadebb3c5b4feda1acf569b..93323741938294b8269149fc617ecbba3a8eeb56 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -74,13 +74,6 @@ config USB_EHCI_MX6
        ---help---
          Enables support for the on-chip EHCI controller on i.MX6 SoCs.
 
-config USB_EHCI_UNIPHIER
-       bool "Support for UniPhier on-chip EHCI USB controller"
-       depends on ARCH_UNIPHIER && OF_CONTROL
-       default y
-       ---help---
-         Enables support for the on-chip EHCI controller on UniPhier SoCs.
-
 config USB_EHCI_GENERIC
        bool "Support for generic EHCI USB controller"
        depends on OF_CONTROL

diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
index 6183b80c75b89152292395338cea01579415682b..9a87d2bf62d2e79255a7e5e70066ebf7760661c3 100644 (file)
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
@@ -47,7 +47,6 @@ obj-$(CONFIG_USB_EHCI_PCI) += ehci-pci.o
 obj-$(CONFIG_USB_EHCI_SPEAR) += ehci-spear.o
 obj-$(CONFIG_USB_EHCI_SUNXI) += ehci-sunxi.o
 obj-$(CONFIG_USB_EHCI_TEGRA) += ehci-tegra.o
-obj-$(CONFIG_USB_EHCI_UNIPHIER) += ehci-uniphier.o
 obj-$(CONFIG_USB_EHCI_VCT) += ehci-vct.o
 obj-$(CONFIG_USB_EHCI_VF) += ehci-vf.o
 obj-$(CONFIG_USB_EHCI_RMOBILE) += ehci-rmobile.o

diff --git a/drivers/usb/host/ehci-uniphier.c b/drivers/usb/host/ehci-uniphier.c
deleted file mode 100644 (file)
index c3f827c..0000000
--- a/drivers/usb/host/ehci-uniphier.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <linux/err.h>
-#include <linux/io.h>
-#include <usb.h>
-#include <mach/mio-regs.h>
-#include <fdtdec.h>
-#include "ehci.h"
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#define FDT            gd->fdt_blob
-#define COMPAT         "socionext,uniphier-ehci"
-
-static int get_uniphier_ehci_base(int index, struct ehci_hccr **base)
-{
-       int offset;
-
-       for (offset = fdt_node_offset_by_compatible(FDT, 0, COMPAT);
-            offset >= 0;
-            offset = fdt_node_offset_by_compatible(FDT, offset, COMPAT)) {
-               if (index == 0) {
-                       *base = (struct ehci_hccr *)
-                                       fdtdec_get_addr(FDT, offset, "reg");
-                       return 0;
-               }
-               index--;
-       }
-
-       return -ENODEV; /* not found */
-}
-
-static void uniphier_ehci_reset(int index, int on)
-{
-       u32 tmp;
-
-       tmp = readl(MIO_USB_RSTCTRL(index));
-       if (on)
-               tmp &= ~MIO_USB_RSTCTRL_XRST;
-       else
-               tmp |= MIO_USB_RSTCTRL_XRST;
-       writel(tmp, MIO_USB_RSTCTRL(index));
-}
-
-int ehci_hcd_init(int index, enum usb_init_type init, struct ehci_hccr **hccr,
-                 struct ehci_hcor **hcor)
-{
-       int ret;
-       struct ehci_hccr *cr;
-       struct ehci_hcor *or;
-
-       uniphier_ehci_reset(index, 0);
-
-       ret = get_uniphier_ehci_base(index, &cr);
-       if (ret < 0)
-               return ret;
-       or = (void *)cr + HC_LENGTH(ehci_readl(&cr->cr_capbase));
-
-       *hccr = cr;
-       *hcor = or;
-
-       return 0;
-}
-
-int ehci_hcd_stop(int index)
-{
-       uniphier_ehci_reset(index, 1);
-
-       return 0;
-}