| Message ID | 1523364701-15383-3-git-send-email-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Apr 10, 2018 at 02:51:38PM +0200, Geert Uytterhoeven wrote: > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > This depends on "[PATCH v2 1/5] clk: Extract OF clock helpers in > <linux/of_clk.h>". > > v2: > - of_clk_get_parent_count() was moved to <linux/of_clk.h>, > - Dropped RFC, as a dummy is now available in the !CONFIG_COMMON_CLK > case. > --- Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
On Tue, Apr 10, 2018 at 2:51 PM, Geert Uytterhoeven <geert+renesas@glider.be> wrote: > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > This depends on "[PATCH v2 1/5] clk: Extract OF clock helpers in > <linux/of_clk.h>". > > v2: > - of_clk_get_parent_count() was moved to <linux/of_clk.h>, > - Dropped RFC, as a dummy is now available in the !CONFIG_COMMON_CLK > case. Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
diff --git a/drivers/clocksource/timer-sp804.c b/drivers/clocksource/timer-sp804.c index 3ac9dec9a03852f9..e01222ea888ff9d2 100644 --- a/drivers/clocksource/timer-sp804.c +++ b/drivers/clocksource/timer-sp804.c @@ -27,6 +27,7 @@ #include <linux/io.h> #include <linux/of.h> #include <linux/of_address.h> +#include <linux/of_clk.h> #include <linux/of_irq.h> #include <linux/sched_clock.h> @@ -245,7 +246,7 @@ static int __init sp804_of_init(struct device_node *np) clk1 = NULL; /* Get the 2nd clock if the timer has 3 timer clocks */ - if (of_count_phandle_with_args(np, "clocks", "#clock-cells") == 3) { + if (of_clk_get_parent_count(np) == 3) { clk2 = of_clk_get(np, 1); if (IS_ERR(clk2)) { pr_err("sp804: %s clock not found: %d\n", np->name,
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- This depends on "[PATCH v2 1/5] clk: Extract OF clock helpers in <linux/of_clk.h>". v2: - of_clk_get_parent_count() was moved to <linux/of_clk.h>, - Dropped RFC, as a dummy is now available in the !CONFIG_COMMON_CLK case. --- drivers/clocksource/timer-sp804.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)