clk: fix clk-gpio.c with optional clock= DT property (7ed88aa2) · Commits · 戴 / test

When the clock DT property is not given, of_clk_get_parent_count() returns -ENOENT, which then tries to allocate -2 x 4 bytes of memory, which of course fails, causing the whole driver to fail to create the clock. This causes the SolidRun platforms to fail probing the SDHCI1 interface which is connected to the WiFi. Fix this by detecting errno codes, skipping the allocation, and fixing of_clk_gpio_gate_delayed_register_get() to handle a NULL parent_names array. Fixes: ("clk: add gpio controlled clock multiplexer") Signed-off-by:

Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by:

Michael Turquette <mturquette@baylibre.com>

drivers/clk/clk-gpio.c

+13 −9

Original line number	Diff line number	Diff line
		@@ -264,8 +264,8 @@ static struct clk of_clk_gpio_gate_delayed_register_get(const char name,
		const char * const *parent_names, u8 num_parents,
		unsigned gpio, bool active_low)
		{
		return clk_register_gpio_gate(NULL, name, parent_names[0],
		gpio, active_low, 0);
		return clk_register_gpio_gate(NULL, name, parent_names ?
		parent_names[0] : NULL, gpio, active_low, 0);
		}

		static struct clk of_clk_gpio_mux_delayed_register_get(const char name,
		@@ -295,6 +295,7 @@ static void __init of_gpio_clk_setup(struct device_node *node,
		if (!data)
		return;

		if (num_parents) {
		parent_names = kcalloc(num_parents, sizeof(char *), GFP_KERNEL);
		if (!parent_names) {
		kfree(data);
		@@ -303,6 +304,9 @@ static void __init of_gpio_clk_setup(struct device_node *node,

		for (i = 0; i < num_parents; i++)
		parent_names[i] = of_clk_get_parent_name(node, i);
		} else {
		parent_names = NULL;
		}

		data->num_parents = num_parents;
		data->parent_names = parent_names;

Admin message