usb: host: remove the xhci-zynqmp driver
authorJean-Jacques Hiblot <jjhiblot@ti.com>
Wed, 11 Sep 2019 09:33:44 +0000 (11:33 +0200)
committerMarek Vasut <marek.vasut+renesas@gmail.com>
Thu, 24 Oct 2019 09:28:16 +0000 (11:28 +0200)
This driver is not used anymore.

Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
15 files changed:
configs/avnet_ultra96_rev1_defconfig
configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig
configs/xilinx_zynqmp_zcu100_revC_defconfig
configs/xilinx_zynqmp_zcu102_rev1_0_defconfig
configs/xilinx_zynqmp_zcu102_revA_defconfig
configs/xilinx_zynqmp_zcu102_revB_defconfig
configs/xilinx_zynqmp_zcu104_revA_defconfig
configs/xilinx_zynqmp_zcu104_revC_defconfig
configs/xilinx_zynqmp_zcu106_revA_defconfig
configs/xilinx_zynqmp_zcu111_revA_defconfig
drivers/usb/host/Kconfig
drivers/usb/host/Makefile
drivers/usb/host/xhci-zynqmp.c [deleted file]

index b5e61e621acddae766e33c81bbee8eed8662e107..859c1f8ce8781a958e105a70c3a1c18dd711c7f1 100644 (file)
@@ -73,7 +73,6 @@ CONFIG_ZYNQ_SPI=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
-CONFIG_USB_XHCI_ZYNQMP=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_GENERIC=y
index bbf387a6b0720eb84e9b683df2830c51f5e09faf..6b4cba7f806fe862e9160bfd3aa06a3ed5fa2b5d 100644 (file)
@@ -84,7 +84,6 @@ CONFIG_ZYNQMP_GQSPI=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
-CONFIG_USB_XHCI_ZYNQMP=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_GENERIC=y
index d5434eee85a23fa97d16fadf16afdd16aa29ecba..a2010571e52ccecf934b0cf58e73d47cd07f0f37 100644 (file)
@@ -75,7 +75,6 @@ CONFIG_SPI=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
-CONFIG_USB_XHCI_ZYNQMP=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_GENERIC=y
index 4ff52292fb68faab549adc1088b3a52013cc386d..0d1e0f00c9e08c73fa025f9c5fd3321eea32c2cc 100644 (file)
@@ -72,7 +72,6 @@ CONFIG_SPI=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
-CONFIG_USB_XHCI_ZYNQMP=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_GENERIC=y
index fc917f0b5d2d702c5851786b74b572516e3e5d54..f1b63e6df99d2e5831c139bca6216fa48e7a3d8e 100644 (file)
@@ -72,7 +72,6 @@ CONFIG_ZYNQ_SPI=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
-CONFIG_USB_XHCI_ZYNQMP=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_GENERIC=y
index b64956d5f6a38a45e513b5b52bf7c023ce16b691..2791d0fce35f25e2d5a5bd0e4c5bababdb09f81d 100644 (file)
@@ -100,7 +100,6 @@ CONFIG_ZYNQMP_GQSPI=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
-CONFIG_USB_XHCI_ZYNQMP=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_GENERIC=y
index 8b1a1ce0a2cf80623535592fb3a9bf993cbd3660..adebf1cf44f05cb841cd82826b4b15e55f8a27a1 100644 (file)
@@ -99,7 +99,6 @@ CONFIG_ZYNQMP_GQSPI=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
-CONFIG_USB_XHCI_ZYNQMP=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_GENERIC=y
index 2aab26dd3fb0232b204f8a794dd3952b26bf5cb4..0f575b713515580a2f1d393d78c7d8eac582a569 100644 (file)
@@ -99,7 +99,6 @@ CONFIG_ZYNQMP_GQSPI=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
-CONFIG_USB_XHCI_ZYNQMP=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_GENERIC=y
index 07e58b192ab0a15298419c3674714fc44741e296..a134ba603eadc1386a451a19c781275a9ccf2906 100644 (file)
@@ -83,7 +83,6 @@ CONFIG_ZYNQMP_GQSPI=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
-CONFIG_USB_XHCI_ZYNQMP=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_GENERIC=y
index 4829df62b4102af52b6e31912d59eefb93ef9137..1d2010f354b0d4e70f196fa596b185ce21f11249 100644 (file)
@@ -87,7 +87,6 @@ CONFIG_ZYNQMP_GQSPI=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
-CONFIG_USB_XHCI_ZYNQMP=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_GENERIC=y
index 72b3ce16a88488d39c7277639e92c309bf5af4c6..4b3ea155ef7c5d31ac9e03a22fa121025bddb9f5 100644 (file)
@@ -93,7 +93,6 @@ CONFIG_ZYNQMP_GQSPI=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
-CONFIG_USB_XHCI_ZYNQMP=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_GENERIC=y
index de739ed3b5f103e755f58cc45b98e1490d2fc59e..a84b53fe1dc443cb23acf59d104810ae9fe72ef1 100644 (file)
@@ -85,7 +85,6 @@ CONFIG_ZYNQMP_GQSPI=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
-CONFIG_USB_XHCI_ZYNQMP=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_GENERIC=y
index 30c6b69be89a48ca6d0857f8aa84f7ccdd27e7b1..b674e330ac5163ca278b86be3747c944e9c42b21 100644 (file)
@@ -73,13 +73,6 @@ config USB_XHCI_STI
          STiH407 family SoCs. This is a driver for the dwc3 to provide the glue logic
          to configure the controller.
 
-config USB_XHCI_ZYNQMP
-       bool "Support for Xilinx ZynqMP on-chip xHCI USB controller"
-       depends on ARCH_ZYNQMP
-       depends on DM_USB
-       help
-         Enables support for the on-chip xHCI controller on Xilinx ZynqMP SoCs.
-
 config USB_XHCI_DRA7XX_INDEX
        int "DRA7XX xHCI USB index"
        range 0 1
index dd13528475cd0f538006ec95a8a97ab45926bdb9..7feeff679c5d2010c98eaca8c98065e765e53fc4 100644 (file)
@@ -48,7 +48,6 @@ obj-$(CONFIG_USB_XHCI_HCD) += xhci.o xhci-mem.o xhci-ring.o
 obj-$(CONFIG_USB_XHCI_DWC3) += xhci-dwc3.o
 obj-$(CONFIG_USB_XHCI_DWC3_OF_SIMPLE) += dwc3-of-simple.o
 obj-$(CONFIG_USB_XHCI_ROCKCHIP) += xhci-rockchip.o
-obj-$(CONFIG_USB_XHCI_ZYNQMP) += xhci-zynqmp.o
 obj-$(CONFIG_USB_XHCI_EXYNOS) += xhci-exynos5.o
 obj-$(CONFIG_USB_XHCI_FSL) += xhci-fsl.o
 obj-$(CONFIG_USB_XHCI_MVEBU) += xhci-mvebu.o
diff --git a/drivers/usb/host/xhci-zynqmp.c b/drivers/usb/host/xhci-zynqmp.c
deleted file mode 100644 (file)
index e44e1ae..0000000
+++ /dev/null
@@ -1,146 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Copyright 2015 Xilinx, Inc.
- *
- * Zynq USB HOST xHCI Controller
- *
- * Author: Siva Durga Prasad Paladugu<sivadur@xilinx.com>
- *
- * This file was reused from Freescale USB xHCI
- */
-
-#include <common.h>
-#include <dm.h>
-#include <usb.h>
-#include <linux/errno.h>
-#include <asm/arch/hardware.h>
-#include <linux/compat.h>
-#include <linux/usb/dwc3.h>
-#include "xhci.h"
-
-/* Declare global data pointer */
-/* Default to the ZYNQMP XHCI defines */
-#define USB3_PWRCTL_CLK_CMD_MASK       0x3FE000
-#define USB3_PWRCTL_CLK_FREQ_MASK      0xFFC
-#define USB3_PHY_PARTIAL_RX_POWERON     BIT(6)
-#define USB3_PHY_RX_POWERON            BIT(14)
-#define USB3_PHY_TX_POWERON            BIT(15)
-#define USB3_PHY_TX_RX_POWERON (USB3_PHY_RX_POWERON | USB3_PHY_TX_POWERON)
-#define USB3_PWRCTL_CLK_CMD_SHIFT   14
-#define USB3_PWRCTL_CLK_FREQ_SHIFT     22
-
-/* USBOTGSS_WRAPPER definitions */
-#define USBOTGSS_WRAPRESET     BIT(17)
-#define USBOTGSS_DMADISABLE BIT(16)
-#define USBOTGSS_STANDBYMODE_NO_STANDBY BIT(4)
-#define USBOTGSS_STANDBYMODE_SMRT              BIT(5)
-#define USBOTGSS_STANDBYMODE_SMRT_WKUP (0x3 << 4)
-#define USBOTGSS_IDLEMODE_NOIDLE BIT(2)
-#define USBOTGSS_IDLEMODE_SMRT BIT(3)
-#define USBOTGSS_IDLEMODE_SMRT_WKUP (0x3 << 2)
-
-/* USBOTGSS_IRQENABLE_SET_0 bit */
-#define USBOTGSS_COREIRQ_EN    BIT(1)
-
-/* USBOTGSS_IRQENABLE_SET_1 bits */
-#define USBOTGSS_IRQ_SET_1_IDPULLUP_FALL_EN    BIT(1)
-#define USBOTGSS_IRQ_SET_1_DISCHRGVBUS_FALL_EN BIT(3)
-#define USBOTGSS_IRQ_SET_1_CHRGVBUS_FALL_EN    BIT(4)
-#define USBOTGSS_IRQ_SET_1_DRVVBUS_FALL_EN     BIT(5)
-#define USBOTGSS_IRQ_SET_1_IDPULLUP_RISE_EN    BIT(8)
-#define USBOTGSS_IRQ_SET_1_DISCHRGVBUS_RISE_EN BIT(11)
-#define USBOTGSS_IRQ_SET_1_CHRGVBUS_RISE_EN    BIT(12)
-#define USBOTGSS_IRQ_SET_1_DRVVBUS_RISE_EN     BIT(13)
-#define USBOTGSS_IRQ_SET_1_OEVT_EN             BIT(16)
-#define USBOTGSS_IRQ_SET_1_DMADISABLECLR_EN    BIT(17)
-
-struct zynqmp_xhci {
-       struct usb_platdata usb_plat;
-       struct xhci_ctrl ctrl;
-       struct xhci_hccr *hcd;
-       struct dwc3 *dwc3_reg;
-};
-
-struct zynqmp_xhci_platdata {
-       fdt_addr_t hcd_base;
-};
-
-static int zynqmp_xhci_core_init(struct zynqmp_xhci *zynqmp_xhci)
-{
-       int ret = 0;
-
-       ret = dwc3_core_init(zynqmp_xhci->dwc3_reg);
-       if (ret) {
-               debug("%s:failed to initialize core\n", __func__);
-               return ret;
-       }
-
-       /* We are hard-coding DWC3 core to Host Mode */
-       dwc3_set_mode(zynqmp_xhci->dwc3_reg, DWC3_GCTL_PRTCAP_HOST);
-
-       return ret;
-}
-
-void xhci_hcd_stop(int index)
-{
-       /*
-        * Currently zynqmp socs do not support PHY shutdown from
-        * sw. But this support may be added in future socs.
-        */
-
-       return;
-}
-
-static int xhci_usb_probe(struct udevice *dev)
-{
-       struct zynqmp_xhci_platdata *plat = dev_get_platdata(dev);
-       struct zynqmp_xhci *ctx = dev_get_priv(dev);
-       struct xhci_hcor *hcor;
-       int ret;
-
-       ctx->hcd = (struct xhci_hccr *)plat->hcd_base;
-       ctx->dwc3_reg = (struct dwc3 *)((char *)(ctx->hcd) + DWC3_REG_OFFSET);
-
-       ret = zynqmp_xhci_core_init(ctx);
-       if (ret) {
-               puts("XHCI: failed to initialize controller\n");
-               return -EINVAL;
-       }
-
-       hcor = (struct xhci_hcor *)((ulong)ctx->hcd +
-                                 HC_LENGTH(xhci_readl(&ctx->hcd->cr_capbase)));
-
-       return xhci_register(dev, ctx->hcd, hcor);
-}
-
-static int xhci_usb_remove(struct udevice *dev)
-{
-       return xhci_deregister(dev);
-}
-
-static int xhci_usb_ofdata_to_platdata(struct udevice *dev)
-{
-       struct zynqmp_xhci_platdata *plat = dev_get_platdata(dev);
-       const void *blob = gd->fdt_blob;
-
-       /* Get the base address for XHCI controller from the device node */
-       plat->hcd_base = fdtdec_get_addr(blob, dev_of_offset(dev), "reg");
-       if (plat->hcd_base == FDT_ADDR_T_NONE) {
-               debug("Can't get the XHCI register base address\n");
-               return -ENXIO;
-       }
-
-       return 0;
-}
-
-U_BOOT_DRIVER(dwc3_generic_host) = {
-       .name = "dwc3-generic-host",
-       .id = UCLASS_USB,
-       .ofdata_to_platdata = xhci_usb_ofdata_to_platdata,
-       .probe = xhci_usb_probe,
-       .remove = xhci_usb_remove,
-       .ops = &xhci_usb_ops,
-       .platdata_auto_alloc_size = sizeof(struct zynqmp_xhci_platdata),
-       .priv_auto_alloc_size = sizeof(struct zynqmp_xhci),
-       .flags = DM_FLAG_ALLOC_PRIV_DMA,
-};