usb: host: xhci: Make U_BOOT_DRIVER entries unique

All instances of the U_BOOT_DRIVER must use a unique name or they will
lead to link time failures due to name space conflicts when both are
present. Most of the XHCI drivers follow pattern of xhci_xxx in their
name, but a few used "usb_xhci". Change these to follow the pattern of
the rest of the XHCI glue drivers.

Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Peter Robinson <pbrobinson@gmail.com>

diff --git a/drivers/usb/host/xhci-brcm.c b/drivers/usb/host/xhci-brcm.c
index 2ffad148dea65a3597e45aff760e8396419a106e..595839fac3c91c893f744042d58cb3add3bfa6ee 100644 (file)
--- a/drivers/usb/host/xhci-brcm.c
+++ b/drivers/usb/host/xhci-brcm.c
@@ -85,7 +85,7 @@ static const struct udevice_id xhci_brcm_ids[] = {
        { }
 };
 
-U_BOOT_DRIVER(usb_xhci) = {
+U_BOOT_DRIVER(xhci_brcm) = {
        .name                           = "xhci_brcm",
        .id                             = UCLASS_USB,
        .probe                          = xhci_brcm_probe,

diff --git a/drivers/usb/host/xhci-exynos5.c b/drivers/usb/host/xhci-exynos5.c
index c509ce1620a079d684146d6f3470a1d10663e3c5..500696ccae7100e4768df04bc1a04eefdd6599e6 100644 (file)
--- a/drivers/usb/host/xhci-exynos5.c
+++ b/drivers/usb/host/xhci-exynos5.c
@@ -246,7 +246,7 @@ static const struct udevice_id xhci_usb_ids[] = {
        { }
 };
 
-U_BOOT_DRIVER(usb_xhci) = {
+U_BOOT_DRIVER(xhci_exynos) = {
        .name   = "xhci_exynos",
        .id     = UCLASS_USB,
        .of_match = xhci_usb_ids,

diff --git a/drivers/usb/host/xhci-generic.c b/drivers/usb/host/xhci-generic.c
index 355d4883176db47ebfd536765970e3a720a63468..8bb4e27742308002f2a94d978d2132013d4d773d 100644 (file)
--- a/drivers/usb/host/xhci-generic.c
+++ b/drivers/usb/host/xhci-generic.c
@@ -61,7 +61,7 @@ static const struct udevice_id xhci_usb_ids[] = {
        { }
 };
 
-U_BOOT_DRIVER(usb_xhci) = {
+U_BOOT_DRIVER(xhci_generic) = {
        .name   = "xhci_generic",
        .id     = UCLASS_USB,
        .of_match = xhci_usb_ids,

diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c
index 7e288f0575b6c8064e6c60a466519c0a1b10de86..ffe80c0bbdc6c771bfefe1320ba8862b6f238eb1 100644 (file)
--- a/drivers/usb/host/xhci-mtk.c
+++ b/drivers/usb/host/xhci-mtk.c
@@ -357,7 +357,7 @@ static const struct udevice_id xhci_mtk_ids[] = {
        { }
 };
 
-U_BOOT_DRIVER(usb_xhci) = {
+U_BOOT_DRIVER(xhci_mtk) = {
        .name = "xhci-mtk",
        .id = UCLASS_USB,
        .of_match = xhci_mtk_ids,

diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c
index 1338b1021c644facb8243cd1caba0b0fb32f097c..12dc61aee9db042e84c031c49977495afe3de199 100644 (file)
--- a/drivers/usb/host/xhci-mvebu.c
+++ b/drivers/usb/host/xhci-mvebu.c
@@ -87,7 +87,7 @@ static const struct udevice_id xhci_usb_ids[] = {
        { }
 };
 
-U_BOOT_DRIVER(usb_xhci) = {
+U_BOOT_DRIVER(xhci_mvebu) = {
        .name   = "xhci_mvebu",
        .id     = UCLASS_USB,
        .of_match = xhci_usb_ids,

diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c
index b72807053c4282f2f8972a3c8543b51e141e4ff9..95dfa2c3f87469c90e93228687db9dedafbae27c 100644 (file)
--- a/drivers/usb/host/xhci-rcar.c
+++ b/drivers/usb/host/xhci-rcar.c
@@ -149,7 +149,7 @@ static const struct udevice_id xhci_rcar_ids[] = {
        { }
 };
 
-U_BOOT_DRIVER(usb_xhci) = {
+U_BOOT_DRIVER(xhci_rcar) = {
        .name           = "xhci_rcar",
        .id             = UCLASS_USB,
        .probe          = xhci_rcar_probe,