UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

clk: sunxi-ng: h3: 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: Maxime Ripard <maxime.ripard@bootlin.com>
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
This commit is contained in:
Chen-Yu Tsai 2019-05-03 18:07:10 +08:00
parent cdaf8388ea
commit b28e3eb632
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/clk/sunxi-ng/ccu-sun8i-h3.c
View File

@ -725,17 +725,26 @@ static struct ccu_common *sun50i_h5_ccu_clks[] = {
&gpu_clk.common, &gpu_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 */ /* We hardcode the divider to 1 for now */
static CLK_FIXED_FACTOR(pll_audio_clk, "pll-audio", static CLK_FIXED_FACTOR_HWS(pll_audio_clk, "pll-audio",
"pll-audio-base", 1, 1, CLK_SET_RATE_PARENT); clk_parent_pll_audio,
static CLK_FIXED_FACTOR(pll_audio_2x_clk, "pll-audio-2x", 1, 1, CLK_SET_RATE_PARENT);
"pll-audio-base", 2, 1, CLK_SET_RATE_PARENT); static CLK_FIXED_FACTOR_HWS(pll_audio_2x_clk, "pll-audio-2x",
static CLK_FIXED_FACTOR(pll_audio_4x_clk, "pll-audio-4x", clk_parent_pll_audio,
"pll-audio-base", 1, 1, CLK_SET_RATE_PARENT); 2, 1, CLK_SET_RATE_PARENT);
static CLK_FIXED_FACTOR(pll_audio_8x_clk, "pll-audio-8x", static CLK_FIXED_FACTOR_HWS(pll_audio_4x_clk, "pll-audio-4x",
"pll-audio-base", 1, 2, CLK_SET_RATE_PARENT); clk_parent_pll_audio,
static CLK_FIXED_FACTOR(pll_periph0_2x_clk, "pll-periph0-2x", 1, 1, CLK_SET_RATE_PARENT);
"pll-periph0", 1, 2, 0); 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_periph0_2x_clk, "pll-periph0-2x",
&pll_periph0_clk.common.hw,
1, 2, 0);
static struct clk_hw_onecell_data sun8i_h3_hw_clks = { static struct clk_hw_onecell_data sun8i_h3_hw_clks = {
.hws = { .hws = {