From: Patrice CHOTARD Date: Tue, 17 Mar 2020 15:32:41 +0000 Subject: [PATCH v2 1/2] timer: sti: convert to livetree In-Reply-To: <20200313224244.4502-2-nicolas.heemeryck@gmail.com> References: <6f1bcf09-4a30-99a5-bade-400d222502fd@st.com> <20200313224244.4502-1-nicolas.heemeryck@gmail.com> <20200313224244.4502-2-nicolas.heemeryck@gmail.com> Message-ID: <2cdbb811-e87d-8a9d-d9dd-ec12fd900831@st.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 > Cc: Patrice Chotard > > --- > > 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 > #include > -#include > #include > > #include > #include > > -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 Thanks Patrice