drivers: usb: Remove !DM_USB code from host driver

Glue logic depends on DM_USB that's why remove !DM_USB
code because only this default case is tested.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/include/asm/arch-zynqmp/hardware.h b/arch/arm/include/asm/arch-zynqmp/hardware.h
index 5908c50d09460a359150a73d65a1a60d9da0d914..b0dc1cade394773b220b31269308beda258f7aa9 100644 (file)
--- a/arch/arm/include/asm/arch-zynqmp/hardware.h
+++ b/arch/arm/include/asm/arch-zynqmp/hardware.h
@@ -20,9 +20,6 @@
 
 #define ZYNQMP_SATA_BASEADDR   0xFD0C0000
 
-#define ZYNQMP_USB0_XHCI_BASEADDR      0xFE200000
-#define ZYNQMP_USB1_XHCI_BASEADDR      0xFE300000
-
 #define ZYNQMP_CRL_APB_BASEADDR        0xFF5E0000
 #define ZYNQMP_CRL_APB_TIMESTAMP_REF_CTRL_CLKACT       0x1000000
 #define ZYNQMP_CRL_APB_BOOT_PIN_CTRL_OUT_EN_SHIFT      0

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 5129a573042ce5e5211c3b35da9b9755078dc28b..1f72bc0c078d5af4e4757b76aec894fefbc9c9a7 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -39,7 +39,7 @@ config USB_XHCI_ROCKCHIP
 
 config USB_XHCI_ZYNQMP
        bool "Support for Xilinx ZynqMP on-chip xHCI USB controller"
-       depends on ARCH_ZYNQMP
+       depends on ARCH_ZYNQMP && DM_USB
        help
          Enables support for the on-chip xHCI controller on Xilinx ZynqMP SoCs.
 

diff --git a/drivers/usb/host/xhci-zynqmp.c b/drivers/usb/host/xhci-zynqmp.c
index 09753ebab54c49b41c36cfcd683c949d16d17c13..bffdc14609bab9eec95c9d7aa163f6bc0a911b9c 100644 (file)
--- a/drivers/usb/host/xhci-zynqmp.c
+++ b/drivers/usb/host/xhci-zynqmp.c
@@ -58,23 +58,15 @@ DECLARE_GLOBAL_DATA_PTR;
 #define USBOTGSS_IRQ_SET_1_DMADISABLECLR_EN    BIT(17)
 
 struct zynqmp_xhci {
-#ifdef CONFIG_DM_USB
        struct usb_platdata usb_plat;
-#endif
        struct xhci_ctrl ctrl;
        struct xhci_hccr *hcd;
        struct dwc3 *dwc3_reg;
 };
 
-#ifdef CONFIG_DM_USB
 struct zynqmp_xhci_platdata {
        fdt_addr_t hcd_base;
 };
-#else
-static struct zynqmp_xhci zynqmp_xhci;
-
-unsigned long ctr_addr[] = CONFIG_ZYNQMP_XHCI_LIST;
-#endif
 
 static int zynqmp_xhci_core_init(struct zynqmp_xhci *zynqmp_xhci)
 {
@@ -92,42 +84,6 @@ static int zynqmp_xhci_core_init(struct zynqmp_xhci *zynqmp_xhci)
        return ret;
 }
 
-#ifndef CONFIG_DM_USB
-int xhci_hcd_init(int index, struct xhci_hccr **hccr, struct xhci_hcor **hcor)
-{
-       struct zynqmp_xhci *ctx = &zynqmp_xhci;
-       int ret = 0;
-       uint32_t hclen;
-
-       if (index < 0 || index >= ARRAY_SIZE(ctr_addr))
-               return -EINVAL;
-
-       ctx->hcd = (struct xhci_hccr *)ctr_addr[index];
-       ctx->dwc3_reg = (struct dwc3 *)((void *)ctx->hcd + DWC3_REG_OFFSET);
-
-       ret = board_usb_init(index, USB_INIT_HOST);
-       if (ret != 0) {
-               puts("Failed to initialize board for USB\n");
-               return ret;
-       }
-
-       ret = zynqmp_xhci_core_init(ctx);
-       if (ret < 0) {
-               puts("Failed to initialize xhci\n");
-               return ret;
-       }
-
-       *hccr = (struct xhci_hccr *)ctx->hcd;
-       hclen = HC_LENGTH(xhci_readl(&(*hccr)->cr_capbase));
-       *hcor = (struct xhci_hcor *)((uintptr_t) *hccr + hclen);
-
-       debug("zynqmp-xhci: init hccr %p and hcor %p hc_length %d\n",
-             *hccr, *hcor, hclen);
-
-       return ret;
-}
-#endif
-
 void xhci_hcd_stop(int index)
 {
        /*
@@ -138,7 +94,6 @@ void xhci_hcd_stop(int index)
        return;
 }
 
-#ifdef CONFIG_DM_USB
 static int xhci_usb_probe(struct udevice *dev)
 {
        struct zynqmp_xhci_platdata *plat = dev_get_platdata(dev);
@@ -193,4 +148,3 @@ U_BOOT_DRIVER(dwc3_generic_host) = {
        .priv_auto_alloc_size = sizeof(struct zynqmp_xhci),
        .flags  = DM_FLAG_ALLOC_PRIV_DMA,
 };
-#endif

diff --git a/include/configs/xilinx_zynqmp_ep.h b/include/configs/xilinx_zynqmp_ep.h
index d0ce768e6e14f1e447f2989aa64735fa3e1e2d68..fb7f1dcc102c558d0529ba4bb02cbb764d1af1c7 100644 (file)
--- a/include/configs/xilinx_zynqmp_ep.h
+++ b/include/configs/xilinx_zynqmp_ep.h
@@ -17,8 +17,6 @@
 #define CONFIG_ZYNQ_SDHCI_MIN_FREQ     (CONFIG_ZYNQ_SDHCI_MAX_FREQ >> 9)
 #define CONFIG_ZYNQ_EEPROM
 #define CONFIG_SATA_CEVA
-#define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR, \
-                                ZYNQMP_USB1_XHCI_BASEADDR}
 
 #define COUNTER_FREQUENCY      4000000
 

diff --git a/include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h b/include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h
index b19a55219aa0c326730d9abdbab3f4fb063c9a7c..b80ade5b535db946629a4a84bb9bc8359c81acd2 100644 (file)
--- a/include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h
+++ b/include/configs/xilinx_zynqmp_zc1751_xm015_dc1.h
@@ -13,7 +13,6 @@
 #define CONFIG_ZYNQ_SDHCI0
 #define CONFIG_ZYNQ_SDHCI1
 #define CONFIG_AHCI
-#define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR}
 
 #include <configs/xilinx_zynqmp.h>
 

diff --git a/include/configs/xilinx_zynqmp_zc1751_xm016_dc2.h b/include/configs/xilinx_zynqmp_zc1751_xm016_dc2.h
index 0714d729117b7d689a1f4148fd299231cd6e5e29..6f860e66440d7d5b65389786f0e28016555ded2e 100644 (file)
--- a/include/configs/xilinx_zynqmp_zc1751_xm016_dc2.h
+++ b/include/configs/xilinx_zynqmp_zc1751_xm016_dc2.h
@@ -10,8 +10,6 @@
 #ifndef __CONFIG_ZYNQMP_ZC1751_XM016_DC2_H
 #define __CONFIG_ZYNQMP_ZC1751_XM016_DC2_H
 
-#define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB1_XHCI_BASEADDR}
-
 #include <configs/xilinx_zynqmp.h>
 
 #endif /* __CONFIG_ZYNQMP_ZC1751_XM016_DC2_H */

diff --git a/include/configs/xilinx_zynqmp_zc1751_xm017_dc3.h b/include/configs/xilinx_zynqmp_zc1751_xm017_dc3.h
index c86bae6bb9f3172c62f4a928421fc86361bcd572..a822b0022d463630826f4fc63fcc0e4f085d0535 100644 (file)
--- a/include/configs/xilinx_zynqmp_zc1751_xm017_dc3.h
+++ b/include/configs/xilinx_zynqmp_zc1751_xm017_dc3.h
@@ -14,8 +14,6 @@
 #define CONFIG_ZYNQ_I2C0
 #define CONFIG_ZYNQ_I2C1
 
-#define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR, ZYNQMP_USB1_XHCI_BASEADDR}
-
 #define CONFIG_AHCI
 #define CONFIG_SATA_CEVA
 

diff --git a/include/configs/xilinx_zynqmp_zcu100.h b/include/configs/xilinx_zynqmp_zcu100.h
index 22e195e54494ddc5b67a3b27798658f95c83a4d7..12976a915817190681051b927bde3e224501fa19 100644 (file)
--- a/include/configs/xilinx_zynqmp_zcu100.h
+++ b/include/configs/xilinx_zynqmp_zcu100.h
@@ -30,9 +30,6 @@
 /* #define CONFIG_ZYNQ_I2C1 */ /* FIXME for 96 compatible bitstream */
 #define CONFIG_SYS_I2C_ZYNQ
 
-#define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR, \
-                                ZYNQMP_USB1_XHCI_BASEADDR}
-
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_ASIX
 

diff --git a/include/configs/xilinx_zynqmp_zcu102.h b/include/configs/xilinx_zynqmp_zcu102.h
index adf2321c5d4f726ab57675704197b9bdc95a0f9d..5b993f320bbbab59fc61add5123577a04e73c9a1 100644 (file)
--- a/include/configs/xilinx_zynqmp_zcu102.h
+++ b/include/configs/xilinx_zynqmp_zcu102.h
@@ -43,8 +43,6 @@
 
 #define CONFIG_SATA_CEVA
 
-#define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR}
-
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
 #define CONFIG_CMD_EEPROM
 #define CONFIG_ZYNQ_EEPROM_BUS         5

diff --git a/include/configs/xilinx_zynqmp_zcu106.h b/include/configs/xilinx_zynqmp_zcu106.h
index 898473bae5e8fe76a341bbc307a7e3820e2b812d..ceb626c0d4b5544cb377b0014da22e404d319cf9 100644 (file)
--- a/include/configs/xilinx_zynqmp_zcu106.h
+++ b/include/configs/xilinx_zynqmp_zcu106.h
@@ -43,8 +43,6 @@
 
 #define CONFIG_SATA_CEVA
 
-#define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR}
-
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
 #define CONFIG_CMD_EEPROM
 #define CONFIG_ZYNQ_EEPROM_BUS         5