UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

clk: clk-gpio-gate: Fix active low 

The active low flag in the DT cell is currently ignored.

This occurs because of_get_named_gpio_flags() does not apply the flags
to the underlying struct gpio_desc so the test in clk_register_gpio_gate()
was bogus.

Note that this patch changes the internal kernel API for
clk_register_gpio_gate() but there are currently no other users.

Signed-off-by: Martin Fuzzey <mfuzzey@parkeon.com>
Acked-by: Jyri Sarha <jsarha@ti.com>
Signed-off-by: Michael Turquette <mturquette@linaro.org>
This commit is contained in:
Martin Fuzzey 2015-03-18 14:53:17 +01:00 committed by Michael Turquette
parent 9a74ccdbbb
commit 820ad9752c
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/clk/clk-gpio-gate.c
View File

@ -65,10 +65,12 @@ EXPORT_SYMBOL_GPL(clk_gpio_gate_ops);
* @dev: device that is registering this clock * @dev: device that is registering this clock
* @name: name of this clock * @name: name of this clock
* @parent_name: name of this clock's parent * @parent_name: name of this clock's parent
* @gpiod: gpio descriptor to gate this clock * @gpio: gpio number to gate this clock
* @active_low: true if gpio should be set to 0 to enable clock
* @flags: clock flags
*/ */
struct clk *clk_register_gpio_gate(struct device *dev, const char *name, struct clk *clk_register_gpio_gate(struct device *dev, const char *name,
const char *parent_name, struct gpio_desc *gpiod, const char *parent_name, unsigned gpio, bool active_low,
unsigned long flags) unsigned long flags)
{ {
struct clk_gpio *clk_gpio = NULL; struct clk_gpio *clk_gpio = NULL;
@ -77,20 +79,19 @@ struct clk *clk_register_gpio_gate(struct device *dev, const char *name,
unsigned long gpio_flags; unsigned long gpio_flags;
int err; int err;
if (gpiod_is_active_low(gpiod)) if (active_low)
gpio_flags = GPIOF_OUT_INIT_HIGH; gpio_flags = GPIOF_ACTIVE_LOW | GPIOF_OUT_INIT_HIGH;
else else
gpio_flags = GPIOF_OUT_INIT_LOW; gpio_flags = GPIOF_OUT_INIT_LOW;
if (dev) if (dev)
err = devm_gpio_request_one(dev, desc_to_gpio(gpiod), err = devm_gpio_request_one(dev, gpio, gpio_flags, name);
gpio_flags, name);
else else
err = gpio_request_one(desc_to_gpio(gpiod), gpio_flags, name); err = gpio_request_one(gpio, gpio_flags, name);
if (err) { if (err) {
pr_err("%s: %s: Error requesting clock control gpio %u\n", pr_err("%s: %s: Error requesting clock control gpio %u\n",
__func__, name, desc_to_gpio(gpiod)); __func__, name, gpio);
return ERR_PTR(err); return ERR_PTR(err);
} }
@ -111,7 +112,7 @@ struct clk *clk_register_gpio_gate(struct device *dev, const char *name,
init.parent_names = (parent_name ? &parent_name : NULL); init.parent_names = (parent_name ? &parent_name : NULL);
init.num_parents = (parent_name ? 1 : 0); init.num_parents = (parent_name ? 1 : 0);
clk_gpio->gpiod = gpiod; clk_gpio->gpiod = gpio_to_desc(gpio);
clk_gpio->hw.init = &init; clk_gpio->hw.init = &init;
clk = clk_register(dev, &clk_gpio->hw); clk = clk_register(dev, &clk_gpio->hw);
@ -123,7 +124,8 @@ struct clk *clk_register_gpio_gate(struct device *dev, const char *name,
kfree(clk_gpio); kfree(clk_gpio);
clk_register_gpio_gate_err: clk_register_gpio_gate_err:
gpiod_put(gpiod); if (!dev)
gpio_free(gpio);
return clk; return clk;
} }
@ -149,8 +151,8 @@ static struct clk *of_clk_gpio_gate_delayed_register_get(
struct clk *clk; struct clk *clk;
const char *clk_name = data->node->name; const char *clk_name = data->node->name;
const char *parent_name; const char *parent_name;
struct gpio_desc *gpiod;
int gpio; int gpio;
enum of_gpio_flags of_flags;
mutex_lock(&data->lock); mutex_lock(&data->lock);
@ -159,7 +161,8 @@ static struct clk *of_clk_gpio_gate_delayed_register_get(
return data->clk; return data->clk;
} }
gpio = of_get_named_gpio_flags(data->node, "enable-gpios", 0, NULL); gpio = of_get_named_gpio_flags(data->node, "enable-gpios", 0,
&of_flags);
if (gpio < 0) { if (gpio < 0) {
mutex_unlock(&data->lock); mutex_unlock(&data->lock);
if (gpio != -EPROBE_DEFER) if (gpio != -EPROBE_DEFER)
@ -167,11 +170,11 @@ static struct clk *of_clk_gpio_gate_delayed_register_get(
__func__, clk_name); __func__, clk_name);
return ERR_PTR(gpio); return ERR_PTR(gpio);
} }
gpiod = gpio_to_desc(gpio);
parent_name = of_clk_get_parent_name(data->node, 0); parent_name = of_clk_get_parent_name(data->node, 0);
clk = clk_register_gpio_gate(NULL, clk_name, parent_name, gpiod, 0); clk = clk_register_gpio_gate(NULL, clk_name, parent_name, gpio,
of_flags & OF_GPIO_ACTIVE_LOW, 0);
if (IS_ERR(clk)) { if (IS_ERR(clk)) {
mutex_unlock(&data->lock); mutex_unlock(&data->lock);
return clk; return clk;

2
include/linux/clk-provider.h
View File

@ -541,7 +541,7 @@ struct clk_gpio {
extern const struct clk_ops clk_gpio_gate_ops; extern const struct clk_ops clk_gpio_gate_ops;
struct clk *clk_register_gpio_gate(struct device *dev, const char *name, struct clk *clk_register_gpio_gate(struct device *dev, const char *name,
const char *parent_name, struct gpio_desc *gpio, const char *parent_name, unsigned gpio, bool active_low,
unsigned long flags); unsigned long flags);
void of_gpio_clk_gate_setup(struct device_node *node); void of_gpio_clk_gate_setup(struct device_node *node);