Mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-06-02 09:46:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source
This commit is contained in:
Tom Rini
2023-03-27 15:19:57 -04:00
parent fde439219f 41a88ad529
commit 605bc145f9
471 changed files with 1553 additions and 646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/timer/rockchip_timer.c
View File

@@ -20,7 +20,7 @@ DECLARE_GLOBAL_DATA_PTR;
#if CONFIG_IS_ENABLED(OF_PLATDATA)
struct rockchip_timer_plat {
struct dtd_rockchip_rk3368_timer dtd;
struct dtd_rockchip_rk3288_timer dtd;
};
#endif
@@ -152,14 +152,12 @@ static const struct timer_ops rockchip_timer_ops = {
};
static const struct udevice_id rockchip_timer_ids[] = {
{ .compatible = "rockchip,rk3188-timer" },
{ .compatible = "rockchip,rk3288-timer" },
{ .compatible = "rockchip,rk3368-timer" },
{}
};
U_BOOT_DRIVER(rockchip_rk3368_timer) = {
.name = "rockchip_rk3368_timer",
U_BOOT_DRIVER(rockchip_rk3288_timer) = {
.name = "rockchip_rk3288_timer",
.id = UCLASS_TIMER,
.of_match = rockchip_timer_ids,
.probe = rockchip_timer_probe,