[PATCH 2/2] x86: Fix up driver names to avoid dtoc warnings
Simon Glass
sjg at chromium.org
Mon Oct 5 13:27:01 CEST 2020
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 at chromium.org>
---
arch/x86/cpu/apollolake/cpu.c | 4 ++--
arch/x86/cpu/apollolake/hostbridge.c | 2 +-
arch/x86/cpu/apollolake/lpc.c | 2 +-
arch/x86/cpu/apollolake/pch.c | 4 ++--
arch/x86/cpu/apollolake/pmc.c | 2 +-
arch/x86/cpu/apollolake/punit.c | 4 ++--
arch/x86/cpu/apollolake/uart.c | 2 +-
arch/x86/cpu/intel_common/itss.c | 2 +-
arch/x86/cpu/intel_common/p2sb.c | 2 +-
drivers/gpio/intel_gpio.c | 4 ++--
drivers/pinctrl/intel/pinctrl_apl.c | 2 +-
drivers/rtc/mc146818.c | 4 ++--
drivers/sysreset/sysreset_x86.c | 4 ++--
drivers/timer/tsc_timer.c | 4 ++--
14 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/arch/x86/cpu/apollolake/cpu.c b/arch/x86/cpu/apollolake/cpu.c
index 8da2e64e226..a4c9c96cfdc 100644
--- 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 7fd67dcfb6e..cafd9d65b24 100644
--- 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 a29832c879a..d8e05f6a8f4 100644
--- 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 1a5a985221f..d9832ff2496 100644
--- 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 576d0187570..cacaa007e05 100644
--- 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 e76f2805d7f..e67c011e22c 100644
--- 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 f368f7d2db4..c522aa97803 100644
--- 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 fe84ebe29f7..53dd09d8f54 100644
--- 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 361d4c90cb9..a0a4001e03b 100644
--- 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 6a3a8c4cfaa..c3b67f24d8f 100644
--- 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 7624a9974fe..727bacfd043 100644
--- 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 b98c39d8219..71f96e282e8 100644
--- 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 bc911435602..7682ffbd294 100644
--- 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 93c959ff444..5c943b8bd11 100644
--- a/drivers/timer/tsc_timer.c
+++ b/drivers/timer/tsc_timer.c
@@ -484,8 +484,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,
--
2.28.0.806.g8561365e88-goog
More information about the U-Boot
mailing list