x86: Fix up driver names to avoid dtoc warnings

At present there are a lot of dtoc warnings reported when building
chromebook_coral, of the form:

   WARNING: the driver intel_apl_lpc was not found in the driver list

Correct these by using driver names that matches their compatible string.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/arch/x86/cpu/apollolake/cpu.c b/arch/x86/cpu/apollolake/cpu.c
index 8da2e64e226a70a033d3ed1416fe36e27080d345..a4c9c96cfdca5c8d59c976bdbe2d64bfeaef9f07 100644 (file)
--- a/arch/x86/cpu/apollolake/cpu.c
+++ b/arch/x86/cpu/apollolake/cpu.c
@@ -102,8 +102,8 @@ static const struct udevice_id cpu_x86_apl_ids[] = {
        { }
 };
 
-U_BOOT_DRIVER(cpu_x86_apl_drv) = {
-       .name           = "cpu_x86_apl",
+U_BOOT_DRIVER(intel_apl_cpu) = {
+       .name           = "intel_apl_cpu",
        .id             = UCLASS_CPU,
        .of_match       = cpu_x86_apl_ids,
        .bind           = cpu_x86_bind,

diff --git a/arch/x86/cpu/apollolake/hostbridge.c b/arch/x86/cpu/apollolake/hostbridge.c
index 7fd67dcfb6e44ba9491bf83f774f4036ee320388..cafd9d65b24a5d80b21b580b9e39097d3deacd8e 100644 (file)
--- a/arch/x86/cpu/apollolake/hostbridge.c
+++ b/arch/x86/cpu/apollolake/hostbridge.c
@@ -396,7 +396,7 @@ static const struct udevice_id apl_hostbridge_ids[] = {
        { }
 };
 
-U_BOOT_DRIVER(apl_hostbridge_drv) = {
+U_BOOT_DRIVER(intel_apl_hostbridge) = {
        .name           = "intel_apl_hostbridge",
        .id             = UCLASS_NORTHBRIDGE,
        .of_match       = apl_hostbridge_ids,

diff --git a/arch/x86/cpu/apollolake/lpc.c b/arch/x86/cpu/apollolake/lpc.c
index a29832c879a4cb21c6eb6867d88d29691b76baf6..d8e05f6a8f46d15274f64b56abfe83830633134a 100644 (file)
--- a/arch/x86/cpu/apollolake/lpc.c
+++ b/arch/x86/cpu/apollolake/lpc.c
@@ -133,7 +133,7 @@ static const struct udevice_id apl_lpc_ids[] = {
 };
 
 /* All pads are LPC already configured by the hostbridge, so no probing here */
-U_BOOT_DRIVER(apl_lpc_drv) = {
+U_BOOT_DRIVER(intel_apl_lpc) = {
        .name           = "intel_apl_lpc",
        .id             = UCLASS_LPC,
        .of_match       = apl_lpc_ids,

diff --git a/arch/x86/cpu/apollolake/pch.c b/arch/x86/cpu/apollolake/pch.c
index 1a5a985221f18a3779d8655aecef562f5ba57007..d9832ff24966a6f05830301a216a75da559f615c 100644 (file)
--- a/arch/x86/cpu/apollolake/pch.c
+++ b/arch/x86/cpu/apollolake/pch.c
@@ -28,8 +28,8 @@ static const struct udevice_id apl_pch_ids[] = {
        { }
 };
 
-U_BOOT_DRIVER(apl_pch) = {
-       .name           = "apl_pch",
+U_BOOT_DRIVER(intel_apl_pch) = {
+       .name           = "intel_apl_pch",
        .id             = UCLASS_PCH,
        .of_match       = apl_pch_ids,
        .ops            = &apl_pch_ops,

diff --git a/arch/x86/cpu/apollolake/pmc.c b/arch/x86/cpu/apollolake/pmc.c
index 576d0187570d446c60a4e091696ed4a761e06cfd..cacaa007e05deea7f4375a67d8478d942fe07426 100644 (file)
--- a/arch/x86/cpu/apollolake/pmc.c
+++ b/arch/x86/cpu/apollolake/pmc.c
@@ -217,7 +217,7 @@ static const struct udevice_id apl_pmc_ids[] = {
        { }
 };
 
-U_BOOT_DRIVER(apl_pmc) = {
+U_BOOT_DRIVER(intel_apl_pmc) = {
        .name           = "intel_apl_pmc",
        .id             = UCLASS_ACPI_PMC,
        .of_match       = apl_pmc_ids,

diff --git a/arch/x86/cpu/apollolake/punit.c b/arch/x86/cpu/apollolake/punit.c
index e76f2805d7f92f6896abbb6933989108aaa98f39..e67c011e22c2ba8fff40737880272e9e5e23a0dc 100644 (file)
--- a/arch/x86/cpu/apollolake/punit.c
+++ b/arch/x86/cpu/apollolake/punit.c
@@ -88,8 +88,8 @@ static const struct udevice_id apl_syscon_ids[] = {
        { }
 };
 
-U_BOOT_DRIVER(syscon_intel_punit) = {
-       .name           = "intel_punit_syscon",
+U_BOOT_DRIVER(intel_apl_punit) = {
+       .name           = "intel_apl_punit",
        .id             = UCLASS_SYSCON,
        .of_match       = apl_syscon_ids,
        .probe          = apl_punit_probe,

diff --git a/arch/x86/cpu/apollolake/uart.c b/arch/x86/cpu/apollolake/uart.c
index f368f7d2db4e9ef55d532a73dec6968e24a1412f..c522aa97803272c56bc7e6ae9dd1c71f1e538c6e 100644 (file)
--- a/arch/x86/cpu/apollolake/uart.c
+++ b/arch/x86/cpu/apollolake/uart.c
@@ -122,7 +122,7 @@ static const struct udevice_id apl_ns16550_serial_ids[] = {
        { },
 };
 
-U_BOOT_DRIVER(apl_ns16550) = {
+U_BOOT_DRIVER(intel_apl_ns16550) = {
        .name   = "intel_apl_ns16550",
        .id     = UCLASS_SERIAL,
        .of_match = apl_ns16550_serial_ids,

diff --git a/arch/x86/cpu/intel_common/itss.c b/arch/x86/cpu/intel_common/itss.c
index fe84ebe29f78d49348e89210c77d0419332e7412..53dd09d8f54f6aa7ddb9e5d198515803226e3999 100644 (file)
--- a/arch/x86/cpu/intel_common/itss.c
+++ b/arch/x86/cpu/intel_common/itss.c
@@ -235,7 +235,7 @@ static const struct udevice_id itss_ids[] = {
        { }
 };
 
-U_BOOT_DRIVER(itss_drv) = {
+U_BOOT_DRIVER(intel_itss) = {
        .name           = "intel_itss",
        .id             = UCLASS_IRQ,
        .of_match       = itss_ids,

diff --git a/arch/x86/cpu/intel_common/p2sb.c b/arch/x86/cpu/intel_common/p2sb.c
index 361d4c90cb91d233b4e2920eb68ae40f2e4c53f1..a0a4001e03b4c9bdf27bc88bed4264a6abd6d528 100644 (file)
--- a/arch/x86/cpu/intel_common/p2sb.c
+++ b/arch/x86/cpu/intel_common/p2sb.c
@@ -189,7 +189,7 @@ static const struct udevice_id p2sb_ids[] = {
        { }
 };
 
-U_BOOT_DRIVER(p2sb_drv) = {
+U_BOOT_DRIVER(intel_p2sb) = {
        .name           = "intel_p2sb",
        .id             = UCLASS_P2SB,
        .of_match       = p2sb_ids,

diff --git a/drivers/gpio/intel_gpio.c b/drivers/gpio/intel_gpio.c
index 6a3a8c4cfaae459fe3b2fe448f7a999899789636..c3b67f24d8f56c5e1236099fb21d363eca1efef6 100644 (file)
--- a/drivers/gpio/intel_gpio.c
+++ b/drivers/gpio/intel_gpio.c
@@ -193,8 +193,8 @@ static const struct udevice_id intel_intel_gpio_ids[] = {
        { }
 };
 
-U_BOOT_DRIVER(gpio_intel) = {
-       .name   = "gpio_intel",
+U_BOOT_DRIVER(intel_gpio) = {
+       .name   = "intel_gpio",
        .id     = UCLASS_GPIO,
        .of_match = intel_intel_gpio_ids,
        .ops    = &gpio_intel_ops,

diff --git a/drivers/pinctrl/intel/pinctrl_apl.c b/drivers/pinctrl/intel/pinctrl_apl.c
index 7624a9974fe3f43b08d62dcbfcb37d428bbbbe02..727bacfd0439a0bb9c6996bcf68cf95ff00a7656 100644 (file)
--- a/drivers/pinctrl/intel/pinctrl_apl.c
+++ b/drivers/pinctrl/intel/pinctrl_apl.c
@@ -174,7 +174,7 @@ static const struct udevice_id apl_gpio_ids[] = {
        { }
 };
 
-U_BOOT_DRIVER(apl_pinctrl_drv) = {
+U_BOOT_DRIVER(intel_apl_pinctrl) = {
        .name           = "intel_apl_pinctrl",
        .id             = UCLASS_PINCTRL,
        .of_match       = apl_gpio_ids,

diff --git a/drivers/rtc/mc146818.c b/drivers/rtc/mc146818.c
index b98c39d8219cc4714ad47713c81a7fdd59fc8fb1..71f96e282e822dd0c7abd1743c988ab5dcf6eaee 100644 (file)
--- a/drivers/rtc/mc146818.c
+++ b/drivers/rtc/mc146818.c
@@ -246,8 +246,8 @@ static const struct udevice_id rtc_mc146818_ids[] = {
        { }
 };
 
-U_BOOT_DRIVER(rtc_mc146818) = {
-       .name = "rtc_mc146818",
+U_BOOT_DRIVER(motorola_mc146818) = {
+       .name = "motorola_mc146818",
        .id = UCLASS_RTC,
        .of_match = rtc_mc146818_ids,
        .probe = rtc_mc146818_probe,

diff --git a/drivers/sysreset/sysreset_x86.c b/drivers/sysreset/sysreset_x86.c
index bc911435602a2f56dd105829cd640a5b2a672a68..7682ffbd2944d974765a99c3bd9c909a97fe91fb 100644 (file)
--- a/drivers/sysreset/sysreset_x86.c
+++ b/drivers/sysreset/sysreset_x86.c
@@ -148,8 +148,8 @@ static struct sysreset_ops x86_sysreset_ops = {
        .get_last = x86_sysreset_get_last,
 };
 
-U_BOOT_DRIVER(x86_sysreset) = {
-       .name = "x86-sysreset",
+U_BOOT_DRIVER(x86_reset) = {
+       .name = "x86_reset",
        .id = UCLASS_SYSRESET,
        .of_match = x86_sysreset_ids,
        .ops = &x86_sysreset_ops,

diff --git a/drivers/timer/tsc_timer.c b/drivers/timer/tsc_timer.c
index abc0a1da05e985f5cbe0f30531f46f910f197e2a..e3677704b33ddd62e9f5b3c0c5dd3afdc9fc21f9 100644 (file)
--- a/drivers/timer/tsc_timer.c
+++ b/drivers/timer/tsc_timer.c
@@ -482,8 +482,8 @@ static const struct udevice_id tsc_timer_ids[] = {
        { }
 };
 
-U_BOOT_DRIVER(tsc_timer) = {
-       .name   = "tsc_timer",
+U_BOOT_DRIVER(x86_tsc_timer) = {
+       .name   = "x86_tsc_timer",
        .id     = UCLASS_TIMER,
        .of_match = tsc_timer_ids,
        .probe = tsc_timer_probe,