| Message ID | 1524063005-1716-6-git-send-email-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Apr 18, 2018 at 4:50 PM, Geert Uytterhoeven <geert+renesas@glider.be> wrote: > A new open coder has crept in since 470b73a38470e8ba ("pinctrl: sunxi: > Use of_clk_get_parent_count() instead of open coding"), replace it. > > of_clk_get_parent_count() was moved to <linux/of_clk.h>, so include that > instead of <linux/clk-provider.h>. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > Acked-by: Maxime Ripard <maxime.ripard@bootlin.com> > --- > This depends on "[PATCH v3 1/5] clk: Extract OF clock helpers in > <linux/of_clk.h>". > > v3: > - Add Acked-by, Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Please merge this through the clk tree. Yours, Linus Walleij
On Wed, Apr 18, 2018 at 04:50:05PM +0200, Geert Uytterhoeven wrote: > A new open coder has crept in since 470b73a38470e8ba ("pinctrl: sunxi: > Use of_clk_get_parent_count() instead of open coding"), replace it. > > of_clk_get_parent_count() was moved to <linux/of_clk.h>, so include that > instead of <linux/clk-provider.h>. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > Acked-by: Maxime Ripard <maxime.ripard@bootlin.com> > --- > This depends on "[PATCH v3 1/5] clk: Extract OF clock helpers in > <linux/of_clk.h>". > > v3: > - Add Acked-by, > > v2: > - New. > --- Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Quoting Geert Uytterhoeven (2018-04-18 07:50:05) > A new open coder has crept in since 470b73a38470e8ba ("pinctrl: sunxi: > Use of_clk_get_parent_count() instead of open coding"), replace it. > > of_clk_get_parent_count() was moved to <linux/of_clk.h>, so include that > instead of <linux/clk-provider.h>. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > Acked-by: Maxime Ripard <maxime.ripard@bootlin.com> > --- Applied to clk-next
diff --git a/drivers/pinctrl/sunxi/pinctrl-sunxi.c b/drivers/pinctrl/sunxi/pinctrl-sunxi.c index 020d6d84639ca002..25e80a5370ca02f6 100644 --- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c +++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c @@ -12,12 +12,12 @@ #include <linux/io.h> #include <linux/clk.h> -#include <linux/clk-provider.h> #include <linux/gpio/driver.h> #include <linux/irqdomain.h> #include <linux/irqchip/chained_irq.h> #include <linux/export.h> #include <linux/of.h> +#include <linux/of_clk.h> #include <linux/of_address.h> #include <linux/of_device.h> #include <linux/of_irq.h> @@ -1361,7 +1361,7 @@ int sunxi_pinctrl_init_with_variant(struct platform_device *pdev, goto gpiochip_error; } - ret = of_count_phandle_with_args(node, "clocks", "#clock-cells"); + ret = of_clk_get_parent_count(node); clk = devm_clk_get(&pdev->dev, ret == 1 ? NULL : "apb"); if (IS_ERR(clk)) { ret = PTR_ERR(clk);
A new open coder has crept in since 470b73a38470e8ba ("pinctrl: sunxi: Use of_clk_get_parent_count() instead of open coding"), replace it. of_clk_get_parent_count() was moved to <linux/of_clk.h>, so include that instead of <linux/clk-provider.h>. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Acked-by: Maxime Ripard <maxime.ripard@bootlin.com> --- This depends on "[PATCH v3 1/5] clk: Extract OF clock helpers in <linux/of_clk.h>". v3: - Add Acked-by, v2: - New. --- drivers/pinctrl/sunxi/pinctrl-sunxi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)