Change driver names for MediaTek mt7629 clocks to be globally unique. This will allow better build bot testing by allowing all clocks to be compiled at the same time.
Signed-off-by: David Lechner <[email protected]> --- arch/arm/mach-mediatek/mt7629/init.c | 4 ++-- drivers/clk/mediatek/clk-mt7629.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm/mach-mediatek/mt7629/init.c b/arch/arm/mach-mediatek/mt7629/init.c index ff027ed03ef..d12eb5339e9 100644 --- a/arch/arm/mach-mediatek/mt7629/init.c +++ b/arch/arm/mach-mediatek/mt7629/init.c @@ -41,7 +41,7 @@ static int mtk_pll_early_init(void) int ret, i; ret = uclass_get_device_by_driver(UCLASS_CLK, - DM_DRIVER_GET(mtk_clk_apmixedsys), &dev); + DM_DRIVER_GET(mt7629_clk_apmixedsys), &dev); if (ret) return ret; @@ -60,7 +60,7 @@ static int mtk_pll_early_init(void) /* setup mcu bus */ ret = uclass_get_device_by_driver(UCLASS_SYSCON, - DM_DRIVER_GET(mtk_mcucfg), &dev); + DM_DRIVER_GET(mt7629_mcucfg), &dev); if (ret) return ret; diff --git a/drivers/clk/mediatek/clk-mt7629.c b/drivers/clk/mediatek/clk-mt7629.c index 793cabf8490..f3a1610e307 100644 --- a/drivers/clk/mediatek/clk-mt7629.c +++ b/drivers/clk/mediatek/clk-mt7629.c @@ -724,7 +724,7 @@ static const struct udevice_id mt7629_mcucfg_compat[] = { { } }; -U_BOOT_DRIVER(mtk_mcucfg) = { +U_BOOT_DRIVER(mt7629_mcucfg) = { .name = "mt7629-mcucfg", .id = UCLASS_SYSCON, .of_match = mt7629_mcucfg_compat, @@ -732,7 +732,7 @@ U_BOOT_DRIVER(mtk_mcucfg) = { .flags = DM_FLAG_PRE_RELOC, }; -U_BOOT_DRIVER(mtk_clk_apmixedsys) = { +U_BOOT_DRIVER(mt7629_clk_apmixedsys) = { .name = "mt7629-clock-apmixedsys", .id = UCLASS_CLK, .of_match = mt7629_apmixed_compat, @@ -742,7 +742,7 @@ U_BOOT_DRIVER(mtk_clk_apmixedsys) = { .flags = DM_FLAG_PRE_RELOC, }; -U_BOOT_DRIVER(mtk_clk_topckgen) = { +U_BOOT_DRIVER(mt7629_clk_topckgen) = { .name = "mt7629-clock-topckgen", .id = UCLASS_CLK, .of_match = mt7629_topckgen_compat, @@ -752,7 +752,7 @@ U_BOOT_DRIVER(mtk_clk_topckgen) = { .flags = DM_FLAG_PRE_RELOC, }; -U_BOOT_DRIVER(mtk_clk_infracfg) = { +U_BOOT_DRIVER(mt7629_clk_infracfg) = { .name = "mt7629-clock-infracfg", .id = UCLASS_CLK, .of_match = mt7629_infracfg_compat, @@ -762,7 +762,7 @@ U_BOOT_DRIVER(mtk_clk_infracfg) = { .flags = DM_FLAG_PRE_RELOC, }; -U_BOOT_DRIVER(mtk_clk_pericfg) = { +U_BOOT_DRIVER(mt7629_clk_pericfg) = { .name = "mt7629-clock-pericfg", .id = UCLASS_CLK, .of_match = mt7629_pericfg_compat, @@ -772,7 +772,7 @@ U_BOOT_DRIVER(mtk_clk_pericfg) = { .flags = DM_FLAG_PRE_RELOC, }; -U_BOOT_DRIVER(mtk_clk_ethsys) = { +U_BOOT_DRIVER(mt7629_clk_ethsys) = { .name = "mt7629-clock-ethsys", .id = UCLASS_CLK, .of_match = mt7629_ethsys_compat, @@ -782,7 +782,7 @@ U_BOOT_DRIVER(mtk_clk_ethsys) = { .ops = &mtk_clk_gate_ops, }; -U_BOOT_DRIVER(mtk_clk_sgmiisys) = { +U_BOOT_DRIVER(mt7629_clk_sgmiisys) = { .name = "mt7629-clock-sgmiisys", .id = UCLASS_CLK, .of_match = mt7629_sgmiisys_compat, @@ -791,7 +791,7 @@ U_BOOT_DRIVER(mtk_clk_sgmiisys) = { .ops = &mtk_clk_gate_ops, }; -U_BOOT_DRIVER(mtk_clk_ssusbsys) = { +U_BOOT_DRIVER(mt7629_clk_ssusbsys) = { .name = "mt7629-clock-ssusbsys", .id = UCLASS_CLK, .of_match = mt7629_ssusbsys_compat, -- 2.43.0
