Commit b120743a authored by Stephen Boyd's avatar Stephen Boyd
Browse files

clk: gpio: Add hw based registration APIs 



Add registration APIs in the clk gpio code to return struct
clk_hw pointers instead of struct clk pointers. This way we hide
the struct clk pointer from providers unless they need to use
consumer facing APIs.

Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 49cb392d

drivers/clk/clk-gpio.c

+41 −11
Original line number Diff line number Diff line
@@ -94,13 +94,13 @@ const struct clk_ops clk_gpio_mux_ops = { 
};

EXPORT_SYMBOL_GPL(clk_gpio_mux_ops);



static struct clk *clk_register_gpio(struct device *dev, const char *name,

static struct clk_hw *clk_register_gpio(struct device *dev, const char *name,

		const char * const *parent_names, u8 num_parents, unsigned gpio,

		bool active_low, unsigned long flags,

		const struct clk_ops *clk_gpio_ops)

{

	struct clk_gpio *clk_gpio;

	struct clk *clk;

	struct clk_hw *hw;

	struct clk_init_data init = {};

	unsigned long gpio_flags;

	int err;
@@ -141,24 +141,26 @@ static struct clk *clk_register_gpio(struct device *dev, const char *name, 
	clk_gpio->gpiod = gpio_to_desc(gpio);

	clk_gpio->hw.init = &init;



	hw = &clk_gpio->hw;

	if (dev)

		clk = devm_clk_register(dev, &clk_gpio->hw);

		err = devm_clk_hw_register(dev, hw);

	else

		clk = clk_register(NULL, &clk_gpio->hw);

		err = clk_hw_register(NULL, hw);



	if (!IS_ERR(clk))

		return clk;

	if (!err)

		return hw;



	if (!dev) {

		gpiod_put(clk_gpio->gpiod);

		kfree(clk_gpio);

	}



	return clk;

	return ERR_PTR(err);

}



/**

 * clk_register_gpio_gate - register a gpio clock gate with the clock framework

 * clk_hw_register_gpio_gate - register a gpio clock gate with the clock

 * framework

 * @dev: device that is registering this clock

 * @name: name of this clock

 * @parent_name: name of this clock's parent
@@ -166,7 +168,7 @@ static struct clk *clk_register_gpio(struct device *dev, const char *name, 
 * @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_hw *clk_hw_register_gpio_gate(struct device *dev, const char *name,

		const char *parent_name, unsigned gpio, bool active_low,

		unsigned long flags)

{
@@ -175,10 +177,24 @@ struct clk *clk_register_gpio_gate(struct device *dev, const char *name, 
			(parent_name ? 1 : 0), gpio, active_low, flags,

			&clk_gpio_gate_ops);

}

EXPORT_SYMBOL_GPL(clk_hw_register_gpio_gate);



struct clk *clk_register_gpio_gate(struct device *dev, const char *name,

		const char *parent_name, unsigned gpio, bool active_low,

		unsigned long flags)

{

	struct clk_hw *hw;



	hw = clk_hw_register_gpio_gate(dev, name, parent_name, gpio, active_low,

				       flags);

	if (IS_ERR(hw))

		return ERR_CAST(hw);

	return hw->clk;

}

EXPORT_SYMBOL_GPL(clk_register_gpio_gate);



/**

 * clk_register_gpio_mux - register a gpio clock mux with the clock framework

 * clk_hw_register_gpio_mux - register a gpio clock mux with the clock framework

 * @dev: device that is registering this clock

 * @name: name of this clock

 * @parent_names: names of this clock's parents
@@ -187,7 +203,7 @@ EXPORT_SYMBOL_GPL(clk_register_gpio_gate); 
 * @active_low: true if gpio should be set to 0 to enable clock

 * @flags: clock flags

 */

struct clk *clk_register_gpio_mux(struct device *dev, const char *name,

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)

{
@@ -199,6 +215,20 @@ struct clk *clk_register_gpio_mux(struct device *dev, const char *name, 
	return clk_register_gpio(dev, name, parent_names, num_parents,

			gpio, active_low, flags, &clk_gpio_mux_ops);

}

EXPORT_SYMBOL_GPL(clk_hw_register_gpio_mux);



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)

{

	struct clk_hw *hw;



	hw = clk_hw_register_gpio_mux(dev, name, parent_names, num_parents,

			gpio, active_low, flags);

	if (IS_ERR(hw))

		return ERR_CAST(hw);

	return hw->clk;

}

EXPORT_SYMBOL_GPL(clk_register_gpio_mux);



static int gpio_clk_driver_probe(struct platform_device *pdev)

include/linux/clk-provider.h

+8 −0
Original line number Diff line number Diff line
@@ -667,6 +667,10 @@ 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,

		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,

		unsigned long flags);

void clk_hw_unregister_gpio_gate(struct clk_hw *hw);



/**

 * struct clk_gpio_mux - gpio controlled clock multiplexer
@@ -682,6 +686,10 @@ 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);

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);

void clk_hw_unregister_gpio_mux(struct clk_hw *hw);



/**

 * clk_register - allocate a new clock, register it and return an opaque cookie

CRA Git | Maintained and supported by SUSTech CRA and CCSE