clk: divider: add CLK_DIVIDER_HIWORD_MASK flag (d57dfe75) · Commits · 戴 / test

drivers/clk/clk-divider.c

+13 −2

Original line number	Original line	Diff line number	Diff line
	@@ -227,8 +227,12 @@ static int clk_divider_set_rate(struct clk_hw *hw, unsigned long rate,
	if (divider->lock)		if (divider->lock)
	spin_lock_irqsave(divider->lock, flags);		spin_lock_irqsave(divider->lock, flags);

			if (divider->flags & CLK_DIVIDER_HIWORD_MASK) {
			val = div_mask(divider) << (divider->shift + 16);
			} else {
	val = readl(divider->reg);		val = readl(divider->reg);
	val &= ~(div_mask(divider) << divider->shift);		val &= ~(div_mask(divider) << divider->shift);
			}
	val \|= value << divider->shift;		val \|= value << divider->shift;
	writel(val, divider->reg);		writel(val, divider->reg);

	@@ -255,6 +259,13 @@ static struct clk _register_divider(struct device dev, const char *name,
	struct clk *clk;		struct clk *clk;
	struct clk_init_data init;		struct clk_init_data init;

			if (clk_divider_flags & CLK_DIVIDER_HIWORD_MASK) {
			if (width + shift > 16) {
			pr_warn("divider value exceeds LOWORD field\n");
			return ERR_PTR(-EINVAL);
			}
			}

	/* allocate the divider */		/* allocate the divider */
	div = kzalloc(sizeof(struct clk_divider), GFP_KERNEL);		div = kzalloc(sizeof(struct clk_divider), GFP_KERNEL);
	if (!div) {		if (!div) {

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -257,6 +257,10 @@ struct clk_div_table {
	* Some hardware implementations gracefully handle this case and allow a		* Some hardware implementations gracefully handle this case and allow a
	* zero divisor by not modifying their input clock		* zero divisor by not modifying their input clock
	* (divide by one / bypass).		* (divide by one / bypass).
			* CLK_DIVIDER_HIWORD_MASK - The divider settings are only in lower 16-bit
			* of this register, and mask of divider bits are in higher 16-bit of this
			* register. While setting the divider bits, higher 16-bit should also be
			* updated to indicate changing divider bits.
	*/		*/
	struct clk_divider {		struct clk_divider {
	struct clk_hw hw;		struct clk_hw hw;
	@@ -271,6 +275,7 @@ struct clk_divider {
	#define CLK_DIVIDER_ONE_BASED BIT(0)		#define CLK_DIVIDER_ONE_BASED BIT(0)
	#define CLK_DIVIDER_POWER_OF_TWO BIT(1)		#define CLK_DIVIDER_POWER_OF_TWO BIT(1)
	#define CLK_DIVIDER_ALLOW_ZERO BIT(2)		#define CLK_DIVIDER_ALLOW_ZERO BIT(2)
			#define CLK_DIVIDER_HIWORD_MASK BIT(3)

	extern const struct clk_ops clk_divider_ops;		extern const struct clk_ops clk_divider_ops;
	struct clk clk_register_divider(struct device dev, const char *name,		struct clk clk_register_divider(struct device dev, const char *name,