dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-10-31 02:15:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

rockchip: timer: add OF_PLATDATA support for dw-apb-timer

Browse Source 
The Rockchip rk3066 SoC has 3 dw-apb-timer nodes.
U-boot is compiled with OF_PLATDATA TPL/SPL options,
so add OF_PLATDATA support for the dw-apb-timer.
Also change driver name to be able to compile with
U-boot scripts. No reset OF_PLATDATA support was added,
because the rk3066 nodes don't need/have them.

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
This commit is contained in:
Johan Jonker
2022-04-09 18:55:06 +02:00
committed by Kever Yang
parent 30a7b824aa
commit 516e216a78
1 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/timer/dw-apb-timer.c
View File

@@ -8,10 +8,12 @@
#include <common.h> #include <common.h>
#include <dm.h> #include <dm.h>
#include <clk.h> #include <clk.h>
#include <dt-structs.h>
#include <malloc.h> #include <malloc.h>
#include <reset.h> #include <reset.h>
#include <timer.h> #include <timer.h>
#include <dm/device_compat.h> #include <dm/device_compat.h>
#include <linux/kconfig.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/timer.h> #include <asm/arch/timer.h>
@@ -25,6 +27,12 @@ struct dw_apb_timer_priv {
struct reset_ctl_bulk resets; struct reset_ctl_bulk resets;
}; };
struct dw_apb_timer_plat {
#if CONFIG_IS_ENABLED(OF_PLATDATA)
struct dtd_snps_dw_apb_timer dtplat;
#endif
};
static u64 dw_apb_timer_get_count(struct udevice *dev) static u64 dw_apb_timer_get_count(struct udevice *dev)
{ {
struct dw_apb_timer_priv *priv = dev_get_priv(dev); struct dw_apb_timer_priv *priv = dev_get_priv(dev);
@@ -43,7 +51,19 @@ static int dw_apb_timer_probe(struct udevice *dev)
struct dw_apb_timer_priv *priv = dev_get_priv(dev); struct dw_apb_timer_priv *priv = dev_get_priv(dev);
struct clk clk; struct clk clk;
int ret; int ret;
#if CONFIG_IS_ENABLED(OF_PLATDATA)
struct dw_apb_timer_plat *plat = dev_get_plat(dev);
struct dtd_snps_dw_apb_timer *dtplat = &plat->dtplat;
priv->regs = dtplat->reg[0];
ret = clk_get_by_phandle(dev, &dtplat->clocks[0], &clk);
if (ret < 0)
return ret;
uc_priv->clock_rate = dtplat->clock_frequency;
#endif
if (CONFIG_IS_ENABLED(OF_REAL)) {
ret = reset_get_bulk(dev, &priv->resets); ret = reset_get_bulk(dev, &priv->resets);
if (ret) if (ret)
dev_warn(dev, "Can't get reset: %d\n", ret); dev_warn(dev, "Can't get reset: %d\n", ret);
@@ -57,6 +77,7 @@ static int dw_apb_timer_probe(struct udevice *dev)
uc_priv->clock_rate = clk_get_rate(&clk); uc_priv->clock_rate = clk_get_rate(&clk);
clk_free(&clk); clk_free(&clk);
}
/* init timer */ /* init timer */
writel(0xffffffff, priv->regs + DW_APB_LOAD_VAL); writel(0xffffffff, priv->regs + DW_APB_LOAD_VAL);
@@ -68,9 +89,11 @@ static int dw_apb_timer_probe(struct udevice *dev)
static int dw_apb_timer_of_to_plat(struct udevice *dev) static int dw_apb_timer_of_to_plat(struct udevice *dev)
{ {
if (CONFIG_IS_ENABLED(OF_REAL)) {
struct dw_apb_timer_priv *priv = dev_get_priv(dev); struct dw_apb_timer_priv *priv = dev_get_priv(dev);
priv->regs = dev_read_addr(dev); priv->regs = dev_read_addr(dev);
}
return 0; return 0;
} }
@@ -91,8 +114,8 @@ static const struct udevice_id dw_apb_timer_ids[] = {
{} {}
}; };
U_BOOT_DRIVER(dw_apb_timer) = { U_BOOT_DRIVER(snps_dw_apb_timer) = {
.name = "dw_apb_timer", .name = "snps_dw_apb_timer",
.id = UCLASS_TIMER, .id = UCLASS_TIMER,
.ops = &dw_apb_timer_ops, .ops = &dw_apb_timer_ops,
.probe = dw_apb_timer_probe, .probe = dw_apb_timer_probe,
@@ -100,4 +123,5 @@ U_BOOT_DRIVER(dw_apb_timer) = {
.of_to_plat = dw_apb_timer_of_to_plat, .of_to_plat = dw_apb_timer_of_to_plat,
.remove = dw_apb_timer_remove, .remove = dw_apb_timer_remove,
.priv_auto = sizeof(struct dw_apb_timer_priv), .priv_auto = sizeof(struct dw_apb_timer_priv),
.plat_auto = sizeof(struct dw_apb_timer_plat),
}; };