diff options
| author |   Stephen Boyd <sboyd@codeaurora.org> | 2017-11-14 10:07:45 -0800 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2017-11-14 10:07:45 -0800 |
| commit | e8d07fd258a4ab8be7e85de44ffa2e362b49a743 (patch) | |
| tree | 46e32c10d1bbbb7aa247ead5bcf0f9d6f663e894 /include/linux/clk-provider.h | |
| parent | Merge branch 'clk-mediatek' into clk-next (diff) | |
| parent | clk: clk-gpio: Request GPIO descriptor as LOW (diff) | |
| download | linux-dev-e8d07fd258a4ab8be7e85de44ffa2e362b49a743.tar.xz linux-dev-e8d07fd258a4ab8be7e85de44ffa2e362b49a743.zip | |
Merge branch 'clk-gpio' into clk-next
* clk-gpio:
clk: clk-gpio: Request GPIO descriptor as LOW
clk: clk-gpio: Make GPIO clock provider use descriptors only
Diffstat (limited to 'include/linux/clk-provider.h')
| -rw-r--r-- | include/linux/clk-provider.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index ba79d6186133..7c925e6211f1 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -682,10 +682,10 @@ struct clk_gpio { extern const struct clk_ops clk_gpio_gate_ops; struct clk *clk_register_gpio_gate(struct device *dev, const char *name, - const char *parent_name, unsigned gpio, bool active_low, + const char *parent_name, struct gpio_desc *gpiod, unsigned long flags); struct clk_hw *clk_hw_register_gpio_gate(struct device *dev, const char *name, - const char *parent_name, unsigned gpio, bool active_low, + const char *parent_name, struct gpio_desc *gpiod, unsigned long flags); void clk_hw_unregister_gpio_gate(struct clk_hw *hw); @@ -701,11 +701,11 @@ void clk_hw_unregister_gpio_gate(struct clk_hw *hw); extern const struct clk_ops clk_gpio_mux_ops; struct clk *clk_register_gpio_mux(struct device *dev, const char *name, - const char * const *parent_names, u8 num_parents, unsigned gpio, - bool active_low, unsigned long flags); + const char * const *parent_names, u8 num_parents, struct gpio_desc *gpiod, + unsigned long flags); struct clk_hw *clk_hw_register_gpio_mux(struct device *dev, const char *name, - const char * const *parent_names, u8 num_parents, unsigned gpio, - bool active_low, unsigned long flags); + const char * const *parent_names, u8 num_parents, struct gpio_desc *gpiod, + unsigned long flags); void clk_hw_unregister_gpio_mux(struct clk_hw *hw); /** |