]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
timer: sti: convert to livetree
authorNicolas Heemeryck <nicolas.heemeryck@gmail.com>
Fri, 13 Mar 2020 22:42:43 +0000 (23:42 +0100)
committerPatrick Delaunay <patrick.delaunay@st.com>
Tue, 24 Mar 2020 13:23:33 +0000 (14:23 +0100)
Update STI timer to support a live tree

Signed-off-by: Nicolas Heemeryck <nicolas.heemeryck@gmail.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
Acked-by: Patrice Chotard <patrice.chotard@st.com>
drivers/timer/sti-timer.c

index 9def7e02f4bd88b61a2b064221825828a82c9501..eac22ae39b01c7b1c885b21f19f48bba6ff88b6e 100644 (file)
@@ -6,14 +6,11 @@
 
 #include <common.h>
 #include <dm.h>
-#include <fdtdec.h>
 #include <timer.h>
 
 #include <asm/io.h>
 #include <asm/arch-armv7/globaltimer.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
 struct sti_timer_priv {
        struct globaltimer *global_timer;
 };
@@ -44,13 +41,13 @@ static int sti_timer_probe(struct udevice *dev)
 {
        struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev);
        struct sti_timer_priv *priv = dev_get_priv(dev);
-       fdt_addr_t addr;
 
        uc_priv->clock_rate = CONFIG_SYS_HZ_CLOCK;
 
        /* get arm global timer base address */
-       addr = fdtdec_get_addr(gd->fdt_blob, dev_of_offset(dev), "reg");
-       priv->global_timer = (struct globaltimer *)addr;
+       priv->global_timer = (struct globaltimer *)dev_read_addr_ptr(dev);
+       if (!priv->global_timer)
+               return -ENOENT;
 
        /* init timer */
        writel(0x01, &priv->global_timer->ctl);