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>

diff --git a/arch/x86/cpu/broadwell/sdram.c b/arch/x86/cpu/broadwell/sdram.c
index cd534a17cf15943b48a24d1f989002dd4bdb8477..1ba7f403c8a18f41a9d62b0e252f294ad3598e9e 100644 (file)
--- a/arch/x86/cpu/broadwell/sdram.c
+++ b/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,

diff --git a/arch/x86/cpu/ivybridge/early_me.c b/arch/x86/cpu/ivybridge/early_me.c
index ac868025f8edd17c479878682970a3badaa5a772..ca73fc21262e4ee722bed5a07c4516f621b82f57 100644 (file)
--- a/arch/x86/cpu/ivybridge/early_me.c
+++ b/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,

diff --git a/board/liebherr/btt/btt.c b/board/liebherr/btt/btt.c
index dc683bd082ad8b18cef9864196a8ac5d155c4164..e1ff041c54f56d4a61e2275ec26dcc17509092ae 100644 (file)
--- a/board/liebherr/btt/btt.c
+++ b/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,

diff --git a/board/liebherr/xea/xea.c b/board/liebherr/xea/xea.c
index 9630e7f576b2f4700af93ff42fd3c9a294b592e8..a277163683c17480ce7afa49352244c3070e562f 100644 (file)
--- a/board/liebherr/xea/xea.c
+++ b/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,

diff --git a/drivers/block/efi_blk.c b/drivers/block/efi_blk.c
index f3ae70290e7e16199729e1e9148c608614c506b3..a1714c41d00b0737c82422d559eb402b6bbd7f06 100644 (file)
--- a/drivers/block/efi_blk.c
+++ b/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,

diff --git a/drivers/clk/at91/compat.c b/drivers/clk/at91/compat.c
index 1d738f160b6e0881ac6ca6730e54f016e9899b27..2449ac9fae6e58e4ccf0bbcd20d16b8a28fdee46 100644 (file)
--- a/drivers/clk/at91/compat.c
+++ b/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,

diff --git a/drivers/clk/at91/sckc.c b/drivers/clk/at91/sckc.c
index 3fde8ea71382b761f5891f658409d8909398e73f..dcaffd360fdf75e12e678893df5e027b3ac3d99b 100644 (file)
--- a/drivers/clk/at91/sckc.c
+++ b/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,

diff --git a/drivers/clk/meson/a1.c b/drivers/clk/meson/a1.c
index a1b8d79149102183402f470a60511d5300d0232c..669247a9a09cfc5c0a32a4e6984499d90686b21f 100644 (file)
--- a/drivers/clk/meson/a1.c
+++ b/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,

diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c
index 51f124869c9c4043dfe047cf2f694bf59df7e87f..218be45c2cb9c900d12c3b7f4ff21681a7258326 100644 (file)
--- a/drivers/clk/meson/gxbb.c
+++ b/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,

diff --git a/drivers/clk/nuvoton/clk_npcm7xx.c b/drivers/clk/nuvoton/clk_npcm7xx.c
index b23dd37af6c83d62ab9784dfa84c1c569028e4f8..4c787823d0532f00bad3ef36e9480fb9549a9994 100644 (file)
--- a/drivers/clk/nuvoton/clk_npcm7xx.c
+++ b/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,

diff --git a/drivers/clk/nuvoton/clk_npcm8xx.c b/drivers/clk/nuvoton/clk_npcm8xx.c
index d1b32e32371e6829610f3529aefae1ed9dad42d3..c7a510f5c256586b28a3557f3284daf4dc9ca5ef 100644 (file)
--- a/drivers/clk/nuvoton/clk_npcm8xx.c
+++ b/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,

diff --git a/drivers/clk/stm32/clk-stm32mp13.c b/drivers/clk/stm32/clk-stm32mp13.c
index 39ec06a9556cec65ca5daa71122aaad20dfaf08f..5e88cf63e20481fa033634954ac3a91259ac047f 100644 (file)
--- a/drivers/clk/stm32/clk-stm32mp13.c
+++ b/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,

diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c
index 0182431099528bb7f93c0267d1eaa7de3036454e..5b440bb38b80ef6cdd748bfabf0713688000b2ce 100644 (file)
--- a/drivers/dma/ti/k3-udma.c
+++ b/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,

diff --git a/drivers/i2c/tegra186_bpmp_i2c.c b/drivers/i2c/tegra186_bpmp_i2c.c
index d30eb5231229826328dc04d965cd9531092c2586..b76ef016cda3b66cb4bf89aec3ad5581cb7ccd57 100644 (file)
--- a/drivers/i2c/tegra186_bpmp_i2c.c
+++ b/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,

diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c
index 598a51d914a97ccaa7e48b0ac476c6c746ecf2f1..655d9902dfa9bba9c6c0b9cdbc50ea59d6391e1f 100644 (file)
--- a/drivers/mmc/bcm2835_sdhci.c
+++ b/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,

diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c
index 335b44a8a1a0e9565bab511a72d86f576e043d8c..87125493c0dcd6ccae113c53cfe95114e547b7b9 100644 (file)
--- a/drivers/mmc/fsl_esdhc_imx.c
+++ b/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,

diff --git a/drivers/mmc/rockchip_sdhci.c b/drivers/mmc/rockchip_sdhci.c
index 8116e464278f74994e71de95ee7704ac2d19fa37..b685da8643c38d2f2099d1829954be91b2822a5b 100644 (file)
--- a/drivers/mmc/rockchip_sdhci.c
+++ b/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,

diff --git a/drivers/net/calxedaxgmac.c b/drivers/net/calxedaxgmac.c
index ebb399457fb58041f402742478db54cfe87b6c40..92990fa6d479e736b9214fe44aad3d8d3d895729 100644 (file)
--- a/drivers/net/calxedaxgmac.c
+++ b/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,

diff --git a/drivers/net/dwc_eth_xgmac.c b/drivers/net/dwc_eth_xgmac.c
index 2ab5ec5f0d90a11728abad3ce5cf217f302bc684..311b57011c34127c753400d5f0e080c62ce3dcbb 100644 (file)
--- a/drivers/net/dwc_eth_xgmac.c
+++ b/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),

diff --git a/drivers/net/qe/dm_qe_uec_phy.c b/drivers/net/qe/dm_qe_uec_phy.c
index 8c0168be859e03f138b8010a64844e1f7ed71112..107c7686b3b5e345fb45283e8cf7ad2685c85a46 100644 (file)
--- a/drivers/net/qe/dm_qe_uec_phy.c
+++ b/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,

diff --git a/drivers/net/sni_netsec.c b/drivers/net/sni_netsec.c
index 71afe78fd28a562b8c177149f7a9d5ed6adcab9b..b74a5c27cae1b7e30d55ea6285c5c5755e5b163a 100644 (file)
--- a/drivers/net/sni_netsec.c
+++ b/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,

diff --git a/drivers/pinctrl/meson/pinctrl-meson-g12a.c b/drivers/pinctrl/meson/pinctrl-meson-g12a.c
index 67114df6824ac4efbd0f5a324c2fa13dff0a302e..29cfdcaa7f89064ed53de36c4551632a8ea460cc 100644 (file)
--- a/drivers/pinctrl/meson/pinctrl-meson-g12a.c
+++ b/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),

diff --git a/drivers/pinctrl/tegra/pinctrl-tegra20.c b/drivers/pinctrl/tegra/pinctrl-tegra20.c
index c32d590a7e0ed5819b24bd3914297695e0ba9cae..b3727b917dc87730c168a27c391983351c56e7bc 100644 (file)
--- a/drivers/pinctrl/tegra/pinctrl-tegra20.c
+++ b/drivers/pinctrl/tegra/pinctrl-tegra20.c
@@ -182,8 +182,8 @@ static const struct udevice_id tegra_pinctrl_ids[] = {
        { },
 };
 
-U_BOOT_DRIVER(tegra_pinctrl) = {
-       .name           = "tegra_pinctrl",
+U_BOOT_DRIVER(tegra20_pinctrl) = {
+       .name           = "tegra20_pinctrl",
        .id             = UCLASS_PINCTRL,
        .of_match       = tegra_pinctrl_ids,
        .bind           = tegra_pinctrl_bind,

diff --git a/drivers/reset/stm32/stm32-reset-mp1.c b/drivers/reset/stm32/stm32-reset-mp1.c
index ce4532561e5edbe0e28dd21457c0f5c88b7b7922..e7ac2c6f066b5591204a5cc8a6500a269e9400e5 100644 (file)
--- a/drivers/reset/stm32/stm32-reset-mp1.c
+++ b/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,

diff --git a/drivers/spi/kirkwood_spi.c b/drivers/spi/kirkwood_spi.c
index 095cbea0fca9c6e12148d60067030c703728ac60..bb5ab26685c4555e61ca2d3e9691e19ecd2c2802 100644 (file)
--- a/drivers/spi/kirkwood_spi.c
+++ b/drivers/spi/kirkwood_spi.c
@@ -347,8 +347,8 @@ static const struct udevice_id mvebu_spi_ids[] = {
        { }
 };
 
-U_BOOT_DRIVER(mvebu_spi) = {
-       .name = "mvebu_spi",
+U_BOOT_DRIVER(kirkwood_spi) = {
+       .name = "kirkwood_spi",
        .id = UCLASS_SPI,
        .of_match = mvebu_spi_ids,
        .ops = &mvebu_spi_ops,

diff --git a/drivers/spi/mvebu_a3700_spi.c b/drivers/spi/mvebu_a3700_spi.c
index 79836d7e271502a349f7c15c8d7f8fcce148cbfe..370a52a90b3df5f184e8b6ce8c17212b3c904dc9 100644 (file)
--- a/drivers/spi/mvebu_a3700_spi.c
+++ b/drivers/spi/mvebu_a3700_spi.c
@@ -307,8 +307,8 @@ static const struct udevice_id mvebu_spi_ids[] = {
        { }
 };
 
-U_BOOT_DRIVER(mvebu_spi) = {
-       .name = "mvebu_spi",
+U_BOOT_DRIVER(mvebu_a3700_spi) = {
+       .name = "mvebu_a3700_spi",
        .id = UCLASS_SPI,
        .of_match = mvebu_spi_ids,
        .ops = &mvebu_spi_ops,

diff --git a/drivers/sysreset/sysreset_socfpga_soc64.c b/drivers/sysreset/sysreset_socfpga_soc64.c
index 6ce30d9eaf0b7923cb544e87d0bc89c9e550fc3c..e1267ac118ae71dd7b71d03a2a855109dc444aad 100644 (file)
--- a/drivers/sysreset/sysreset_socfpga_soc64.c
+++ b/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,

diff --git a/drivers/usb/dwc3/dwc3-meson-g12a.c b/drivers/usb/dwc3/dwc3-meson-g12a.c
index 41d15996e5b2afdee2460c940f5650e8424da412..49e9c3fa0e9940f3b06d4e3bb683270c50e6f9a8 100644 (file)
--- a/drivers/usb/dwc3/dwc3-meson-g12a.c
+++ b/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,

diff --git a/drivers/usb/dwc3/dwc3-meson-gxl.c b/drivers/usb/dwc3/dwc3-meson-gxl.c
index 5fb9b477adaf07add31a0c37cc0b06984fbabcf7..0edf41a4720a2197d6ac314b82aad4d422a889dc 100644 (file)
--- a/drivers/usb/dwc3/dwc3-meson-gxl.c
+++ b/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,

diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c
index e1fc04efd2e986f11eb2e3add74da84dce74f208..ec21b7c6246c62e4922f210167e93cc706066499 100644 (file)
--- a/drivers/usb/host/ehci-exynos.c
+++ b/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,

diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c
index 8aeb6a915563453ad2a02721d4828fd1b300a4e4..a58eff7cb9c8278a7c68124cf6ae00702ed8fe75 100644 (file)
--- a/drivers/usb/host/ehci-msm.c
+++ b/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,

diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index 89b87886da18d7a4c212d7d725fc5dff23d899f2..c1f76752cb1eaf88eb4cc0bd2f8c92ae2569113f 100644 (file)
--- a/drivers/usb/host/ehci-tegra.c
+++ b/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,

diff --git a/drivers/usb/host/ehci-vf.c b/drivers/usb/host/ehci-vf.c
index 5afe28ea303321a15905c17778a9a6317a9064e9..96d1363a76eac80dde6790aab37079d7dc69a8c2 100644 (file)
--- a/drivers/usb/host/ehci-vf.c
+++ b/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,

diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c
index d321d147c2f957e6d54053f7c869514529803c90..a36950082afb1380a17adf8b94364058f4e13710 100644 (file)
--- a/drivers/usb/host/ohci-da8xx.c
+++ b/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,

diff --git a/drivers/usb/musb-new/pic32.c b/drivers/usb/musb-new/pic32.c
index 0b25e5893b3cbaf9711eb36796c826a30b562bee..b878e979d93d752f131af21e241d367a1c01b9b5 100644 (file)
--- a/drivers/usb/musb-new/pic32.c
+++ b/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,

diff --git a/drivers/usb/musb-new/sc5xx.c b/drivers/usb/musb-new/sc5xx.c
index 991846818a22ca5b6a06243acfa6b1dc5f0bf6d5..b1765abe8279ed2fe966aca020eb699317998369 100644 (file)
--- a/drivers/usb/musb-new/sc5xx.c
+++ b/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,

diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c
index b577ba4187807f6cd350ec5859fb347030c58f6c..0747f025f2a128ab30fddb8c331243430aa786c3 100644 (file)
--- a/drivers/usb/musb-new/sunxi.c
+++ b/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,

diff --git a/drivers/video/rockchip/rk3288_mipi.c b/drivers/video/rockchip/rk3288_mipi.c
index 850fe310754959e6ce7e260ce35d911020ade153..574ba8c695730beac5b7a820c70fd866844fbf1e 100644 (file)
--- a/drivers/video/rockchip/rk3288_mipi.c
+++ b/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) = {
-       .name   = "rk_mipi_dsi",
+U_BOOT_DRIVER(rk3288_mipi_dsi) = {
+       .name   = "rk3288_mipi_dsi",
        .id     = UCLASS_DISPLAY,
        .of_match = rk_mipi_dsi_ids,
        .of_to_plat = rk_mipi_of_to_plat,

diff --git a/drivers/video/rockchip/rk3399_mipi.c b/drivers/video/rockchip/rk3399_mipi.c
index 57e36eed6a999497c21223a019649c3749bccc9b..68316df871cbcaaebf5bc5405af2963daf3fa07e 100644 (file)
--- a/drivers/video/rockchip/rk3399_mipi.c
+++ b/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) = {
-       .name   = "rk_mipi_dsi",
+U_BOOT_DRIVER(rk3399_mipi_dsi) = {
+       .name   = "rk3399_mipi_dsi",
        .id     = UCLASS_DISPLAY,
        .of_match = rk_mipi_dsi_ids,
        .of_to_plat = rk_mipi_of_to_plat,

diff --git a/drivers/watchdog/arm_smc_wdt.c b/drivers/watchdog/arm_smc_wdt.c
index f6854aa9ac931cb8b0b0111e8d31763939c5e2ed..151dc42d1164445dada6af79fae8e3bdffe77440 100644 (file)
--- a/drivers/watchdog/arm_smc_wdt.c
+++ b/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,