Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38581ddc authored by Stephen Boyd's avatar Stephen Boyd
Browse files

clk: Collapse gpio clk kerneldoc 



We have two kernel-docs for gpio clks, but there is only one gpio clk
structure. Collapse the two so we have proper kerneldoc for this basic
clk type.

Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent bfeffd15

include/linux/clk-provider.h

+8 −15
Original line number Diff line number Diff line
@@ -712,16 +712,19 @@ struct clk_hw *clk_hw_register_composite(struct device *dev, const char *name, 
		unsigned long flags);

void clk_hw_unregister_composite(struct clk_hw *hw);



/***

 * struct clk_gpio_gate - gpio gated clock

/**

 * struct clk_gpio - gpio gated clock

 *

 * @hw:		handle between common and hardware-specific interfaces

 * @gpiod:	gpio descriptor

 *

 * Clock with a gpio control for enabling and disabling the parent clock.

 * Implements .enable, .disable and .is_enabled

 * Clock with a gpio control for enabling and disabling the parent clock

 * or switching between two parents by asserting or deasserting the gpio.

 *

 * Implements .enable, .disable and .is_enabled or

 * .get_parent, .set_parent and .determine_rate depending on which clk_ops

 * is used.

 */



struct clk_gpio {

	struct clk_hw	hw;

	struct gpio_desc *gpiod;
@@ -738,16 +741,6 @@ struct clk_hw *clk_hw_register_gpio_gate(struct device *dev, const char *name, 
		unsigned long flags);

void clk_hw_unregister_gpio_gate(struct clk_hw *hw);



/**

 * struct clk_gpio_mux - gpio controlled clock multiplexer

 *

 * @hw:		see struct clk_gpio

 * @gpiod:	gpio descriptor to select the parent of this clock multiplexer

 *

 * Clock with a gpio control for selecting the parent clock.

 * Implements .get_parent, .set_parent and .determine_rate

 */



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, struct gpio_desc *gpiod,