diff options
| author | Tom Rini <trini@konsulko.com> | 2020-11-06 08:41:49 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-11-06 09:46:43 -0500 |
| commit | d062c1344cefb6c368b96efea4c2a20e63657b8d (patch) | |
| tree | 56dcc373217bbcb248c35f7253c9478c1ba7e715 /drivers/timer/tsc_timer.c | |
| parent | 71d3fa7efa4fc07e6f161c742397ddbe4466c631 (diff) | |
| parent | e4f8e543f1a905857a753a1d411997a81f4f52aa (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
- Add a new SMBIOS parser and enable it when booting from coreboot
- Fix up various driver names to avoid dtoc warnings
- Fully enable ACPI support on Google Chromebook Coral
- Add a way to set SMBIOS properties using the devicetree
- Update existing boards to use devicetree for SMBIOS using a new
default sysinfo driver
Diffstat (limited to 'drivers/timer/tsc_timer.c')
| -rw-r--r-- | drivers/timer/tsc_timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/timer/tsc_timer.c b/drivers/timer/tsc_timer.c index abc0a1da05..e3677704b3 100644 --- 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, |