Unverified Commit ace73b7e authored by Yixun Lan's avatar Yixun Lan
Browse files

clk: spacemit: ccu_mix: add inverted enable gate clock 

K3 SoC has the clock IP which support to write value 0 for enabling the
clock, while write 1 for disabling it, thus the enable BIT is inverted.
So, introduce a flag to support the inverted gate clock.

Link: https://lore.kernel.org/r/20260108-k3-clk-v5-2-42a11b74ad58@gentoo.org


Signed-off-by: default avatarYixun Lan <dlan@gentoo.org>
parent efe897b5

drivers/clk/spacemit/ccu_mix.c

+8 −4
Original line number Diff line number Diff line
@@ -16,17 +16,19 @@ 
static void ccu_gate_disable(struct clk_hw *hw)

{

	struct ccu_mix *mix = hw_to_ccu_mix(hw);

	struct ccu_gate_config *gate = &mix->gate;

	u32 val = gate->inverted ? gate->mask : 0;



	ccu_update(&mix->common, ctrl, mix->gate.mask, 0);

	ccu_update(&mix->common, ctrl, gate->mask, val);

}



static int ccu_gate_enable(struct clk_hw *hw)

{

	struct ccu_mix *mix = hw_to_ccu_mix(hw);

	struct ccu_gate_config *gate = &mix->gate;

	u32 val = gate->inverted ? 0 : gate->mask;



	ccu_update(&mix->common, ctrl, gate->mask, gate->mask);



	ccu_update(&mix->common, ctrl, gate->mask, val);

	return 0;

}
@@ -34,8 +36,10 @@ static int ccu_gate_is_enabled(struct clk_hw *hw) 
{

	struct ccu_mix *mix = hw_to_ccu_mix(hw);

	struct ccu_gate_config *gate = &mix->gate;

	u32 tmp = ccu_read(&mix->common, ctrl) & gate->mask;

	u32 val = gate->inverted ? 0 : gate->mask;



	return (ccu_read(&mix->common, ctrl) & gate->mask) == gate->mask;

	return !!(tmp == val);

}



static unsigned long ccu_factor_recalc_rate(struct clk_hw *hw,

drivers/clk/spacemit/ccu_mix.h

+12 −0
Original line number Diff line number Diff line
@@ -16,9 +16,11 @@ 
 *

 * @mask:	Mask to enable the gate. Some clocks may have more than one bit

 *		set in this field.

 * @inverted:	Enable bit is inverted, 1 - disable clock, 0 - enable clock

 */

struct ccu_gate_config {

	u32 mask;

	bool inverted;

};



struct ccu_factor_config {
@@ -48,6 +50,7 @@ struct ccu_mix { 
#define CCU_FACTOR_INIT(_div, _mul)	{ .div = _div, .mul = _mul }

#define CCU_MUX_INIT(_shift, _width)	{ .shift = _shift, .width = _width }

#define CCU_DIV_INIT(_shift, _width)	{ .shift = _shift, .width = _width }

#define CCU_GATE_FLAGS_INIT(_mask, _inverted)	{ .mask = _mask, .inverted = _inverted }



#define CCU_PARENT_HW(_parent)		{ .hw = &_parent.common.hw }

#define CCU_PARENT_NAME(_name)		{ .fw_name = #_name }
@@ -101,6 +104,15 @@ static struct ccu_mix _name = { \ 
	}									\

}



#define CCU_GATE_FLAGS_DEFINE(_name, _parent, _reg_ctrl, _mask_gate, _inverted, _flags)		\

static struct ccu_mix _name = {							\

	.gate	= CCU_GATE_FLAGS_INIT(_mask_gate, _inverted),			\

	.common	= {								\

		.reg_ctrl	= _reg_ctrl,					\

		CCU_MIX_INITHW(_name, _parent, spacemit_ccu_gate_ops, _flags),	\

	}									\

}



#define CCU_FACTOR_GATE_FLAGS_DEFINE(_name, _parent, _reg_ctrl, _mask_gate, _div,	\

			       _mul, _flags)					\

static struct ccu_mix _name = {							\