Commit 1ded879e authored by Chunyan Zhang's avatar Chunyan Zhang Committed by Stephen Boyd
Browse files

clk: move clock common macros out from vendor directories 



These macros are used by more than one SoC vendor platforms, avoid to
have many copies of these code, this patch moves them to the common
header file which every clock drivers can access to.

Signed-off-by: default avatarChunyan Zhang <chunyan.zhang@spreadtrum.com>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 4fbd8d19

drivers/clk/sunxi-ng/ccu_common.h

+0 −29
Original line number Diff line number Diff line
@@ -31,35 +31,6 @@ 


struct device_node;



#define CLK_HW_INIT(_name, _parent, _ops, _flags)			\

	&(struct clk_init_data) {					\

		.flags		= _flags,				\

		.name		= _name,				\

		.parent_names	= (const char *[]) { _parent },		\

		.num_parents	= 1,					\

		.ops 		= _ops,					\

	}



#define CLK_HW_INIT_PARENTS(_name, _parents, _ops, _flags)		\

	&(struct clk_init_data) {					\

		.flags		= _flags,				\

		.name		= _name,				\

		.parent_names	= _parents,				\

		.num_parents	= ARRAY_SIZE(_parents),			\

		.ops 		= _ops,					\

	}



#define CLK_FIXED_FACTOR(_struct, _name, _parent,			\

			_div, _mult, _flags)				\

	struct clk_fixed_factor _struct = {				\

		.div		= _div,					\

		.mult		= _mult,				\

		.hw.init	= CLK_HW_INIT(_name,			\

					      _parent,			\

					      &clk_fixed_factor_ops,	\

					      _flags),			\

	}



struct ccu_common {

	void __iomem	*base;

	u16		reg;

drivers/clk/zte/clk.h

+0 −18
Original line number Diff line number Diff line
@@ -14,24 +14,6 @@ 


#define PNAME(x) static const char *x[]



#define CLK_HW_INIT(_name, _parent, _ops, _flags)			\

	&(struct clk_init_data) {					\

		.flags		= _flags,				\

		.name		= _name,				\

		.parent_names	= (const char *[]) { _parent },		\

		.num_parents	= 1,					\

		.ops		= _ops,					\

	}



#define CLK_HW_INIT_PARENTS(_name, _parents, _ops, _flags)		\

	&(struct clk_init_data) {					\

		.flags		= _flags,				\

		.name		= _name,				\

		.parent_names	= _parents,				\

		.num_parents	= ARRAY_SIZE(_parents),			\

		.ops		= _ops,					\

	}



struct zx_pll_config {

	unsigned long rate;

	u32 cfg0;

include/linux/clk-provider.h

+38 −0
Original line number Diff line number Diff line
@@ -806,6 +806,44 @@ extern struct of_device_id __clk_of_table; 
	}								\

	OF_DECLARE_1(clk, name, compat, name##_of_clk_init_driver)



#define CLK_HW_INIT(_name, _parent, _ops, _flags)		\

	(&(struct clk_init_data) {				\

		.flags		= _flags,			\

		.name		= _name,			\

		.parent_names	= (const char *[]) { _parent },	\

		.num_parents	= 1,				\

		.ops		= _ops,				\

	})



#define CLK_HW_INIT_PARENTS(_name, _parents, _ops, _flags)	\

	(&(struct clk_init_data) {				\

		.flags		= _flags,			\

		.name		= _name,			\

		.parent_names	= _parents,			\

		.num_parents	= ARRAY_SIZE(_parents),		\

		.ops		= _ops,				\

	})



#define CLK_HW_INIT_NO_PARENT(_name, _ops, _flags)	\

	(&(struct clk_init_data) {			\

		.flags          = _flags,		\

		.name           = _name,		\

		.parent_names   = NULL,			\

		.num_parents    = 0,			\

		.ops            = _ops,			\

	})



#define CLK_FIXED_FACTOR(_struct, _name, _parent,			\

			_div, _mult, _flags)				\

	struct clk_fixed_factor _struct = {				\

		.div		= _div,					\

		.mult		= _mult,				\

		.hw.init	= CLK_HW_INIT(_name,			\

					      _parent,			\

					      &clk_fixed_factor_ops,	\

					      _flags),			\

	}



#ifdef CONFIG_OF

int of_clk_add_provider(struct device_node *np,

			struct clk *(*clk_src_get)(struct of_phandle_args *args,

CRA Git | Maintained and supported by SUSTech CRA and CCSE