global: Correct duplicate U_BOOT_DRIVER entry names

The U_BOOT_DRIVER macro creates a list of drivers used at link time, and
all entries here must be unique. This in turn means that all entries in
the code should also be unique in order to not lead to build failures
later with unexpected build combinations. Typically, the problem we have
here is when a driver is obviously based on another driver and didn't
update this particular field and so while the name field reflects
something unique the linker entry itself is not. In a few places this
provides a more suitable string name as well, however.

Reviewed-by: Marek Vasut <marek.vasut+usb@mailbox.org>
Reviewed-by: Svyatoslav Ryhel <clamor95@gmail.com> # Tegra
Reviewed-by: Peter Robinson <pbrobinson@gmail.com>
Reviewed-by: Heiko Schocher <hs@nabladev.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Rini <trini@konsulko.com>

arch/x86/cpu/broadwell/sdram.c

@@ -205,7 +205,7 @@ static const struct udevice_id broadwell_syscon_ids[] = {
 	{ }
 };
 
-U_BOOT_DRIVER(syscon_intel_me) = {
+U_BOOT_DRIVER(syscon_intel_me_broadwell) = {
 	.name = "intel_me_syscon",
 	.id = UCLASS_SYSCON,
 	.of_match = broadwell_syscon_ids,

arch/x86/cpu/ivybridge/early_me.c

@@ -166,7 +166,7 @@ static const struct udevice_id ivybridge_syscon_ids[] = {
 	{ }
 };
 
-U_BOOT_DRIVER(syscon_intel_me) = {
+U_BOOT_DRIVER(syscon_intel_me_ivybridge) = {
 	.name = "intel_me_syscon",
 	.id = UCLASS_SYSCON,
 	.of_match = ivybridge_syscon_ids,

board/liebherr/btt/btt.c

@@ -421,7 +421,7 @@ static const struct udevice_id imx28_clk_ids[] = {
 	{ }
 };
 
-U_BOOT_DRIVER(fsl_imx28_clkctrl) = {
+U_BOOT_DRIVER(btt_dummy_fsl_imx28_clkctrl) = {
 	.name           = "fsl_imx28_clkctrl",
 	.id             = UCLASS_CLK,
 	.of_match       = imx28_clk_ids,

board/liebherr/xea/xea.c

@@ -351,7 +351,7 @@ static const struct udevice_id imx28_clk_ids[] = {
 	{ }
 };
 
-U_BOOT_DRIVER(fsl_imx28_clkctrl) = {
+U_BOOT_DRIVER(xea_dummy_fsl_imx28_clkctrl) = {
 	.name           = "fsl_imx28_clkctrl",
 	.id             = UCLASS_CLK,
 	.of_match       = imx28_clk_ids,

drivers/block/efi_blk.c

@@ -79,7 +79,7 @@ static const struct blk_ops efi_blk_ops = {
 	.write	= efi_bl_write,
 };
 
-U_BOOT_DRIVER(efi_block) = {
+U_BOOT_DRIVER(efi_media_block) = {
 	.name		= "efi_block",
 	.id		= UCLASS_BLK,
 	.ops		= &efi_blk_ops,

drivers/clk/at91/compat.c

@@ -136,7 +136,7 @@ static const struct udevice_id at91_sckc_match[] = {
 	{}
 };
 
-U_BOOT_DRIVER(at91_sckc) = {
+U_BOOT_DRIVER(at91sam9x5_sckc) = {
 	.name = "at91-sckc",
 	.id = UCLASS_SIMPLE_BUS,
 	.of_match = at91_sckc_match,
@@ -368,7 +368,7 @@ static const struct udevice_id at91_system_clk_match[] = {
 	{}
 };
 
-U_BOOT_DRIVER(at91_system_clk) = {
+U_BOOT_DRIVER(at91rm9200_system_clk) = {
 	.name = "at91-system-clk",
 	.id = UCLASS_MISC,
 	.of_match = at91_system_clk_match,

drivers/clk/at91/sckc.c

@@ -162,7 +162,7 @@ static const struct udevice_id sam9x60_sckc_ids[] = {
 	{ /* Sentinel. */ },
 };
 
-U_BOOT_DRIVER(at91_sckc) = {
+U_BOOT_DRIVER(sam9x60_sckc) = {
 	.name = UBOOT_DM_CLK_AT91_SCKC,
 	.id = UCLASS_CLK,
 	.of_match = sam9x60_sckc_ids,

drivers/clk/meson/a1.c

@@ -712,7 +712,7 @@ static struct clk_ops meson_clk_ops = {
 #endif
 };
 
-U_BOOT_DRIVER(meson_clk) = {
+U_BOOT_DRIVER(meson_clk_a1) = {
 	.name		= "meson-clk-a1",
 	.id		= UCLASS_CLK,
 	.of_match	= meson_clk_ids,

drivers/clk/meson/gxbb.c

@@ -962,7 +962,7 @@ static const struct udevice_id meson_clk_ids[] = {
 	{ }
 };
 
-U_BOOT_DRIVER(meson_clk) = {
+U_BOOT_DRIVER(meson_clk_gxbb) = {
 	.name		= "meson_clk",
 	.id		= UCLASS_CLK,
 	.of_match	= meson_clk_ids,

drivers/clk/nuvoton/clk_npcm7xx.c

@@ -84,7 +84,7 @@ static const struct udevice_id npcm7xx_clk_ids[] = {
 	{ }
 };
 
-U_BOOT_DRIVER(clk_npcm) = {
+U_BOOT_DRIVER(clk_npcm750) = {
 	.name           = "clk_npcm",
 	.id             = UCLASS_CLK,
 	.of_match       = npcm7xx_clk_ids,

drivers/clk/nuvoton/clk_npcm8xx.c

@@ -87,7 +87,7 @@ static const struct udevice_id npcm8xx_clk_ids[] = {
 	{ }
 };
 
-U_BOOT_DRIVER(clk_npcm) = {
+U_BOOT_DRIVER(clk_npcm845) = {
 	.name           = "clk_npcm",
 	.id             = UCLASS_CLK,
 	.of_match       = npcm8xx_clk_ids,

drivers/clk/stm32/clk-stm32mp13.c

@@ -2193,7 +2193,7 @@ static int stm32mp1_clk_probe(struct udevice *dev)
 	return 0;
 }
 
-U_BOOT_DRIVER(stm32mp1_clock) = {
+U_BOOT_DRIVER(stm32mp13_clock) = {
 	.name = "stm32mp13_clk",
 	.id = UCLASS_CLK,
 	.ops = &stm32_clk_ops,

drivers/dma/ti/k3-udma.c

@@ -2866,7 +2866,7 @@ static const struct udevice_id udma_ids[] = {
 	{ /* Sentinel */ },
 };
 
-U_BOOT_DRIVER(ti_edma3) = {
+U_BOOT_DRIVER(ti_udma) = {
 	.name	= "ti-udma",
 	.id	= UCLASS_DMA,
 	.of_match = udma_ids,

drivers/i2c/tegra186_bpmp_i2c.c

@@ -117,7 +117,7 @@ static const struct udevice_id tegra186_bpmp_i2c_ids[] = {
 	{ }
 };
 
-U_BOOT_DRIVER(i2c_gpio) = {
+U_BOOT_DRIVER(tegra186_bpmp_i2c) = {
 	.name	= "tegra186_bpmp_i2c",
 	.id	= UCLASS_I2C,
 	.of_match = tegra186_bpmp_i2c_ids,

drivers/mmc/bcm2835_sdhci.c

@@ -243,7 +243,7 @@ static const struct udevice_id bcm2835_sdhci_match[] = {
 	{ /* sentinel */ }
 };
 
-U_BOOT_DRIVER(sdhci_cdns) = {
+U_BOOT_DRIVER(sdhci_bcm2835) = {
 	.name = "sdhci-bcm2835",
 	.id = UCLASS_MMC,
 	.of_match = bcm2835_sdhci_match,

drivers/mmc/fsl_esdhc_imx.c

@@ -1686,7 +1686,7 @@ static int fsl_esdhc_bind(struct udevice *dev)
 	return mmc_bind(dev, &plat->mmc, &plat->cfg);
 }
 
-U_BOOT_DRIVER(fsl_esdhc) = {
+U_BOOT_DRIVER(fsl_esdhc_imx) = {
 	.name	= "fsl_esdhc",
 	.id	= UCLASS_MMC,
 	.of_match = fsl_esdhc_ids,

drivers/mmc/rockchip_sdhci.c

@@ -745,7 +745,7 @@ static const struct udevice_id sdhci_ids[] = {
 	{ }
 };
 
-U_BOOT_DRIVER(arasan_sdhci_drv) = {
+U_BOOT_DRIVER(rockchip_sdhci_5_1_drv) = {
 	.name		= "rockchip_sdhci_5_1",
 	.id		= UCLASS_MMC,
 	.of_match	= sdhci_ids,

drivers/net/calxedaxgmac.c

@@ -597,7 +597,7 @@ static const struct udevice_id xgmac_eth_ids[] = {
 	{ }
 };
 
-U_BOOT_DRIVER(eth_xgmac) = {
+U_BOOT_DRIVER(calxeda_hb_xgmac) = {
 	.name		= "eth_xgmac",
 	.id		= UCLASS_ETH,
 	.of_match	= xgmac_eth_ids,

drivers/net/dwc_eth_xgmac.c

@@ -1206,7 +1206,7 @@ static const struct udevice_id xgmac_ids[] = {
 	{ }
 };
 
-U_BOOT_DRIVER(eth_xgmac) = {
+U_BOOT_DRIVER(dwc_eth_xgmac) = {
 	.name = "eth_xgmac",
 	.id = UCLASS_ETH,
 	.of_match = of_match_ptr(xgmac_ids),

drivers/net/qe/dm_qe_uec_phy.c

@@ -152,7 +152,7 @@ static const struct udevice_id qe_uec_mdio_ids[] = {
 	{ }
 };
 
-U_BOOT_DRIVER(mvmdio) = {
+U_BOOT_DRIVER(qe_uec_mdio) = {
 	.name			= "qe_uec_mdio",
 	.id			= UCLASS_MDIO,
 	.of_match		= qe_uec_mdio_ids,

drivers/net/sni_netsec.c

@@ -1138,7 +1138,7 @@ static const struct udevice_id netsec_ids[] = {
 	{}
 };
 
-U_BOOT_DRIVER(ave) = {
+U_BOOT_DRIVER(synquacer_netsec) = {
 	.name     = "synquacer_netsec",
 	.id       = UCLASS_ETH,
 	.of_match = netsec_ids,

drivers/pinctrl/meson/pinctrl-meson-g12a.c

@@ -1283,7 +1283,7 @@ static const struct udevice_id meson_g12a_pinctrl_match[] = {
 	{ },
 };
 
-U_BOOT_DRIVER(meson_axg_pinctrl) = {
+U_BOOT_DRIVER(meson_g12a_pinctrl) = {
 	.name = "meson-g12a-pinctrl",
 	.id = UCLASS_PINCTRL,
 	.of_match = of_match_ptr(meson_g12a_pinctrl_match),

drivers/pinctrl/tegra/pinctrl-tegra20.c

@@ -182,8 +182,8 @@ static const struct udevice_id tegra_pinctrl_ids[] = {
 	{ },
 };
 
-U_BOOT_DRIVER(tegra_pinctrl) = {
+U_BOOT_DRIVER(tegra20_pinctrl) = {
-	.name		= "tegra_pinctrl",
+	.name		= "tegra20_pinctrl",
 	.id		= UCLASS_PINCTRL,
 	.of_match	= tegra_pinctrl_ids,
 	.bind		= tegra_pinctrl_bind,

drivers/reset/stm32/stm32-reset-mp1.c

@@ -46,7 +46,7 @@ static int stm32_reset_probe(struct udevice *dev)
 	return stm32_reset_core_probe(dev, &stm32mp1_reset_data);
 }
 
-U_BOOT_DRIVER(stm32mp25_rcc_reset) = {
+U_BOOT_DRIVER(stm32mp1_rcc_reset) = {
 	.name		= "stm32mp1_reset",
 	.id		= UCLASS_RESET,
 	.probe		= stm32_reset_probe,

drivers/spi/kirkwood_spi.c

@@ -347,8 +347,8 @@ static const struct udevice_id mvebu_spi_ids[] = {
 	{ }
 };
 
-U_BOOT_DRIVER(mvebu_spi) = {
+U_BOOT_DRIVER(kirkwood_spi) = {
-	.name = "mvebu_spi",
+	.name = "kirkwood_spi",
 	.id = UCLASS_SPI,
 	.of_match = mvebu_spi_ids,
 	.ops = &mvebu_spi_ops,

drivers/spi/mvebu_a3700_spi.c

@@ -307,8 +307,8 @@ static const struct udevice_id mvebu_spi_ids[] = {
 	{ }
 };
 
-U_BOOT_DRIVER(mvebu_spi) = {
+U_BOOT_DRIVER(mvebu_a3700_spi) = {
-	.name = "mvebu_spi",
+	.name = "mvebu_a3700_spi",
 	.id = UCLASS_SPI,
 	.of_match = mvebu_spi_ids,
 	.ops = &mvebu_spi_ops,

drivers/sysreset/sysreset_socfpga_soc64.c

@@ -80,7 +80,7 @@ static struct sysreset_ops socfpga_sysreset = {
 	.request = socfpga_sysreset_request,
 };
 
-U_BOOT_DRIVER(sysreset_socfpga) = {
+U_BOOT_DRIVER(sysreset_socfpga_soc64) = {
 	.id	= UCLASS_SYSRESET,
 	.name	= "socfpga_sysreset",
 	.ops	= &socfpga_sysreset,

drivers/usb/dwc3/dwc3-meson-g12a.c

@@ -533,7 +533,7 @@ static const struct udevice_id dwc3_meson_g12a_ids[] = {
 	{ }
 };
 
-U_BOOT_DRIVER(dwc3_generic_wrapper) = {
+U_BOOT_DRIVER(dwc3_meson_g12a) = {
 	.name	= "dwc3-meson-g12a",
 	.id	= UCLASS_SIMPLE_BUS,
 	.of_match = dwc3_meson_g12a_ids,

drivers/usb/dwc3/dwc3-meson-gxl.c

@@ -430,7 +430,7 @@ static const struct udevice_id dwc3_meson_gxl_ids[] = {
 	{ }
 };
 
-U_BOOT_DRIVER(dwc3_generic_wrapper) = {
+U_BOOT_DRIVER(dwc3_meson_gxl) = {
 	.name	= "dwc3-meson-gxl",
 	.id	= UCLASS_SIMPLE_BUS,
 	.of_match = dwc3_meson_gxl_ids,

drivers/usb/host/ehci-exynos.c

@@ -249,7 +249,7 @@ static const struct udevice_id ehci_usb_ids[] = {
 	{ }
 };
 
-U_BOOT_DRIVER(usb_ehci) = {
+U_BOOT_DRIVER(ehci_exynos) = {
 	.name	= "ehci_exynos",
 	.id	= UCLASS_USB,
 	.of_match = ehci_usb_ids,

drivers/usb/host/ehci-msm.c

@@ -117,7 +117,7 @@ void ci_init_after_reset(struct ehci_ctrl *ctrl)
 }
 #endif
 
-U_BOOT_DRIVER(usb_ehci) = {
+U_BOOT_DRIVER(ehci_msm) = {
 	.name	= "ehci_msm",
 	.id	= UCLASS_USB,
 	.of_to_plat = ehci_usb_of_to_plat,

drivers/usb/host/ehci-tegra.c

@@ -969,7 +969,7 @@ static const struct udevice_id ehci_usb_ids[] = {
 	{ }
 };
 
-U_BOOT_DRIVER(usb_ehci) = {
+U_BOOT_DRIVER(ehci_tegra) = {
 	.name	= "ehci_tegra",
 	.id	= UCLASS_USB,
 	.of_match = ehci_usb_ids,

drivers/usb/host/ehci-vf.c

@@ -344,7 +344,7 @@ static const struct udevice_id vf_usb_ids[] = {
 	{ }
 };
 
-U_BOOT_DRIVER(usb_ehci) = {
+U_BOOT_DRIVER(ehci_vf) = {
 	.name = "ehci_vf",
 	.id = UCLASS_USB,
 	.of_match = vf_usb_ids,

drivers/usb/host/ohci-da8xx.c

@@ -165,7 +165,7 @@ static const struct udevice_id da8xx_ohci_ids[] = {
 	{ }
 };
 
-U_BOOT_DRIVER(ohci_generic) = {
+U_BOOT_DRIVER(ohci_da8xx) = {
 	.name	= "ohci-da8xx",
 	.id	= UCLASS_USB,
 	.of_match = da8xx_ohci_ids,

drivers/usb/musb-new/pic32.c

@@ -279,7 +279,7 @@ static const struct udevice_id pic32_musb_ids[] = {
 	{ }
 };
 
-U_BOOT_DRIVER(usb_musb) = {
+U_BOOT_DRIVER(musb_pic32) = {
 	.name		= "pic32-musb",
 	.id		= UCLASS_USB,
 	.of_match	= pic32_musb_ids,

drivers/usb/musb-new/sc5xx.c

@@ -188,7 +188,7 @@ static const struct udevice_id sc5xx_musb_ids[] = {
 	{ }
 };
 
-U_BOOT_DRIVER(usb_musb) = {
+U_BOOT_DRIVER(musb_sc5xx) = {
 	.name		= "sc5xx-musb",
 	.id		= UCLASS_USB,
 	.of_match	= sc5xx_musb_ids,

drivers/usb/musb-new/sunxi.c

@@ -545,7 +545,7 @@ static const struct udevice_id sunxi_musb_ids[] = {
 	{ }
 };
 
-U_BOOT_DRIVER(usb_musb) = {
+U_BOOT_DRIVER(musb_sunxi) = {
 	.name		= "sunxi-musb",
 #ifdef CONFIG_USB_MUSB_HOST
 	.id		= UCLASS_USB,

drivers/video/rockchip/rk3288_mipi.c

@@ -177,8 +177,8 @@ static const struct udevice_id rk_mipi_dsi_ids[] = {
 	{ }
 };
 
-U_BOOT_DRIVER(rk_mipi_dsi) = {
+U_BOOT_DRIVER(rk3288_mipi_dsi) = {
-	.name	= "rk_mipi_dsi",
+	.name	= "rk3288_mipi_dsi",
 	.id	= UCLASS_DISPLAY,
 	.of_match = rk_mipi_dsi_ids,
 	.of_to_plat = rk_mipi_of_to_plat,

drivers/video/rockchip/rk3399_mipi.c

@@ -168,8 +168,8 @@ static const struct udevice_id rk_mipi_dsi_ids[] = {
 	{ }
 };
 
-U_BOOT_DRIVER(rk_mipi_dsi) = {
+U_BOOT_DRIVER(rk3399_mipi_dsi) = {
-	.name	= "rk_mipi_dsi",
+	.name	= "rk3399_mipi_dsi",
 	.id	= UCLASS_DISPLAY,
 	.of_match = rk_mipi_dsi_ids,
 	.of_to_plat = rk_mipi_of_to_plat,

drivers/watchdog/arm_smc_wdt.c

@@ -130,7 +130,7 @@ static const struct udevice_id smcwd_dt_ids[] = {
 	{}
 };
 
-U_BOOT_DRIVER(wdt_sandbox) = {
+U_BOOT_DRIVER(arm_smc_wdt) = {
 	.name = "smcwd",
 	.id = UCLASS_WDT,
 	.of_match = smcwd_dt_ids,