[PATCH v2 1/2] timer: sti: convert to livetree

Patrice CHOTARD patrice.chotard at st.com
Tue Mar 17 16:32:41 CET 2020


Hi Nicolas

On 3/13/20 11:42 PM, Nicolas Heemeryck wrote:
> Update STI timer to support a live tree
>
> Signed-off-by: Nicolas Heemeryck <nicolas.heemeryck at gmail.com>
> Cc: Patrice Chotard <patrice.chotard at st.com>
>
> ---
>
> Changes for v2: None
> ---
>  drivers/timer/sti-timer.c | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/timer/sti-timer.c b/drivers/timer/sti-timer.c
> index 9def7e02f4..eac22ae39b 100644
> --- a/drivers/timer/sti-timer.c
> +++ b/drivers/timer/sti-timer.c
> @@ -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);

Acked-by: Patrice Chotard <patrice.chotard at st.com>

Thanks

Patrice



More information about the U-Boot mailing list