From patchwork Sun Mar 8 13:20:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Heemeryck X-Patchwork-Id: 243371 List-Id: U-Boot discussion From: nicolas.heemeryck at gmail.com (Nicolas Heemeryck) Date: Sun, 8 Mar 2020 14:20:56 +0100 Subject: [PATCH 1/2] timer: sti: convert to livetree In-Reply-To: <20200308132057.256-1-nicolas.heemeryck@gmail.com> References: <20200308132057.256-1-nicolas.heemeryck@gmail.com> Message-ID: <20200308132057.256-2-nicolas.heemeryck@gmail.com> Update STI timer to support a live tree Signed-off-by: Nicolas Heemeryck Acked-by: Patrice Chotard --- 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); From patchwork Sun Mar 8 13:20:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Heemeryck X-Patchwork-Id: 243372 List-Id: U-Boot discussion From: nicolas.heemeryck at gmail.com (Nicolas Heemeryck) Date: Sun, 8 Mar 2020 14:20:57 +0100 Subject: [PATCH 2/2] timer: sti: use clk API to get timer clock rate In-Reply-To: <20200308132057.256-1-nicolas.heemeryck@gmail.com> References: <20200308132057.256-1-nicolas.heemeryck@gmail.com> Message-ID: <20200308132057.256-3-nicolas.heemeryck@gmail.com> Retrieve clock rate through device tree. This mimics the behavior of arm_global_timer in Linux. Signed-off-by: Nicolas Heemeryck --- drivers/timer/sti-timer.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/timer/sti-timer.c b/drivers/timer/sti-timer.c index eac22ae39b..123fac04a9 100644 --- a/drivers/timer/sti-timer.c +++ b/drivers/timer/sti-timer.c @@ -6,6 +6,7 @@ #include #include +#include #include #include @@ -41,14 +42,22 @@ 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); - - uc_priv->clock_rate = CONFIG_SYS_HZ_CLOCK; + struct clk clk; + int ret; /* get arm global timer base address */ priv->global_timer = (struct globaltimer *)dev_read_addr_ptr(dev); if (!priv->global_timer) return -ENOENT; + ret = clk_get_by_index(dev, 0, &clk); + if (ret) + return ret; + + uc_priv->clock_rate = clk_get_rate(&clk); + if (!uc_priv->clock_rate) + return -EINVAL; + /* init timer */ writel(0x01, &priv->global_timer->ctl);