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

Commit 7a40e3d8 authored by Chen-Yu Tsai's avatar Chen-Yu Tsai
Browse files

clk: sunxi-ng: a23: Use local parent references for CLK_FIXED_FACTOR 



With the new clk parenting code and CLK_FIXED_FACTOR_{HW,FW_NAME}
macros, we can reference parents locally via pointers to struct clk_hw
or DT clock-names.

Convert existing CLK_FIXED_FACTOR definitions to either the _HW or
_FW_NAME variant based on whether the parent clock is internal or
external to the CCU.

Acked-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
Signed-off-by: default avatarChen-Yu Tsai <wens@csie.org>
parent 8b1dd564

drivers/clk/sunxi-ng/ccu-sun8i-a23.c

+22 −12
Original line number Diff line number Diff line
@@ -551,19 +551,29 @@ static struct ccu_common *sun8i_a23_ccu_clks[] = { 
	&ats_clk.common,

};



static const struct clk_hw *clk_parent_pll_audio[] = {

	&pll_audio_base_clk.common.hw

};



/* We hardcode the divider to 1 for now */

static CLK_FIXED_FACTOR(pll_audio_clk, "pll-audio",

			"pll-audio-base", 1, 1, CLK_SET_RATE_PARENT);

static CLK_FIXED_FACTOR(pll_audio_2x_clk, "pll-audio-2x",

			"pll-audio-base", 2, 1, CLK_SET_RATE_PARENT);

static CLK_FIXED_FACTOR(pll_audio_4x_clk, "pll-audio-4x",

			"pll-audio-base", 1, 1, CLK_SET_RATE_PARENT);

static CLK_FIXED_FACTOR(pll_audio_8x_clk, "pll-audio-8x",

			"pll-audio-base", 1, 2, CLK_SET_RATE_PARENT);

static CLK_FIXED_FACTOR(pll_periph_2x_clk, "pll-periph-2x",

			"pll-periph", 1, 2, 0);

static CLK_FIXED_FACTOR(pll_video_2x_clk, "pll-video-2x",

			"pll-video", 1, 2, 0);

static CLK_FIXED_FACTOR_HWS(pll_audio_clk, "pll-audio",

			    clk_parent_pll_audio,

			    1, 1, CLK_SET_RATE_PARENT);

static CLK_FIXED_FACTOR_HWS(pll_audio_2x_clk, "pll-audio-2x",

			    clk_parent_pll_audio,

			    2, 1, CLK_SET_RATE_PARENT);

static CLK_FIXED_FACTOR_HWS(pll_audio_4x_clk, "pll-audio-4x",

			    clk_parent_pll_audio,

			    1, 1, CLK_SET_RATE_PARENT);

static CLK_FIXED_FACTOR_HWS(pll_audio_8x_clk, "pll-audio-8x",

			    clk_parent_pll_audio,

			    1, 2, CLK_SET_RATE_PARENT);

static CLK_FIXED_FACTOR_HW(pll_periph_2x_clk, "pll-periph-2x",

			   &pll_periph_clk.common.hw,

			   1, 2, 0);

static CLK_FIXED_FACTOR_HW(pll_video_2x_clk, "pll-video-2x",

			   &pll_video_clk.common.hw,

			   1, 2, 0);



static struct clk_hw_onecell_data sun8i_a23_hw_clks = {

	.hws	= {