Commit a34ea4b4 authored Mar 03, 2018 by Andre Przywara Committed by Linus Walleij Mar 23, 2018

pinctrl: sunxi: always look for apb block

The Allwinner pinctrl device tree binding suggests that a clock named
"apb" would drive the pin controller IP. However (for legacy reasons) we
rely on this clock actually being the first clock defined.
Since named clocks can be in any order, let's explicitly check for a
clock called "apb" if there is more than one clock referenced.

Kudo to Maxime for suggesting this much more elegant approach.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

parent b6d09f78

drivers/pinctrl/sunxi/pinctrl-sunxi.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1363,7 +1363,8 @@ int sunxi_pinctrl_init_with_variant(struct platform_device *pdev,
		goto gpiochip_error;
		}

		clk = devm_clk_get(&pdev->dev, NULL);
		ret = of_count_phandle_with_args(node, "clocks", "#clock-cells");
		clk = devm_clk_get(&pdev->dev, ret == 1 ? NULL : "apb");
		if (IS_ERR(clk)) {
		ret = PTR_ERR(clk);
		goto gpiochip_error;