From: Chen-Yu Tsai <wens@kernel.org> To: Maxime Ripard <maxime.ripard@bootlin.com>, Stephen Boyd <sboyd@kernel.org>, Michael Turquette <mturquette@baylibre.com> Cc: Chen-Yu Tsai <wens@csie.org>, linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 12/25] clk: sunxi-ng: a31: Use local parent references for CLK_FIXED_FACTOR Date: Mon, 20 May 2019 16:04:08 +0800 [thread overview] Message-ID: <20190520080421.12575-13-wens@kernel.org> (raw) In-Reply-To: <20190520080421.12575-1-wens@kernel.org> From: Chen-Yu Tsai <wens@csie.org> 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. Signed-off-by: Chen-Yu Tsai <wens@csie.org> --- drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 39 ++++++++++++++++++---------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/drivers/clk/sunxi-ng/ccu-sun6i-a31.c b/drivers/clk/sunxi-ng/ccu-sun6i-a31.c index b494c4fe0b2c..048c0d75d0b0 100644 --- a/drivers/clk/sunxi-ng/ccu-sun6i-a31.c +++ b/drivers/clk/sunxi-ng/ccu-sun6i-a31.c @@ -963,21 +963,32 @@ static struct ccu_common *sun6i_a31_ccu_clks[] = { &out_c_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_video0_2x_clk, "pll-video0-2x", - "pll-video0", 1, 2, CLK_SET_RATE_PARENT); -static CLK_FIXED_FACTOR(pll_video1_2x_clk, "pll-video1-2x", - "pll-video1", 1, 2, CLK_SET_RATE_PARENT); +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_video0_2x_clk, "pll-video0-2x", + &pll_video0_clk.common.hw, + 1, 2, CLK_SET_RATE_PARENT); +static CLK_FIXED_FACTOR_HW(pll_video1_2x_clk, "pll-video1-2x", + &pll_video1_clk.common.hw, + 1, 2, CLK_SET_RATE_PARENT); static struct clk_hw_onecell_data sun6i_a31_hw_clks = { .hws = { -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Chen-Yu Tsai <wens@kernel.org> To: Maxime Ripard <maxime.ripard@bootlin.com>, Stephen Boyd <sboyd@kernel.org>, Michael Turquette <mturquette@baylibre.com> Cc: Chen-Yu Tsai <wens@csie.org>, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 12/25] clk: sunxi-ng: a31: Use local parent references for CLK_FIXED_FACTOR Date: Mon, 20 May 2019 16:04:08 +0800 [thread overview] Message-ID: <20190520080421.12575-13-wens@kernel.org> (raw) In-Reply-To: <20190520080421.12575-1-wens@kernel.org> From: Chen-Yu Tsai <wens@csie.org> 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. Signed-off-by: Chen-Yu Tsai <wens@csie.org> --- drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 39 ++++++++++++++++++---------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/drivers/clk/sunxi-ng/ccu-sun6i-a31.c b/drivers/clk/sunxi-ng/ccu-sun6i-a31.c index b494c4fe0b2c..048c0d75d0b0 100644 --- a/drivers/clk/sunxi-ng/ccu-sun6i-a31.c +++ b/drivers/clk/sunxi-ng/ccu-sun6i-a31.c @@ -963,21 +963,32 @@ static struct ccu_common *sun6i_a31_ccu_clks[] = { &out_c_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_video0_2x_clk, "pll-video0-2x", - "pll-video0", 1, 2, CLK_SET_RATE_PARENT); -static CLK_FIXED_FACTOR(pll_video1_2x_clk, "pll-video1-2x", - "pll-video1", 1, 2, CLK_SET_RATE_PARENT); +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_video0_2x_clk, "pll-video0-2x", + &pll_video0_clk.common.hw, + 1, 2, CLK_SET_RATE_PARENT); +static CLK_FIXED_FACTOR_HW(pll_video1_2x_clk, "pll-video1-2x", + &pll_video1_clk.common.hw, + 1, 2, CLK_SET_RATE_PARENT); static struct clk_hw_onecell_data sun6i_a31_hw_clks = { .hws = { -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-05-20 8:05 UTC|newest] Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-05-20 8:03 [PATCH 00/25] clk: sunxi-ng: clk parent rewrite part 1 Chen-Yu Tsai 2019-05-20 8:03 ` Chen-Yu Tsai 2019-05-20 8:03 ` [PATCH 01/25] clk: Fix debugfs clk_possible_parents for clks without parent string names Chen-Yu Tsai 2019-05-20 8:03 ` Chen-Yu Tsai 2019-06-07 18:14 ` Stephen Boyd 2019-06-07 18:14 ` Stephen Boyd 2019-05-20 8:03 ` [PATCH 02/25] clk: Add CLK_HW_INIT_* macros using .parent_hws Chen-Yu Tsai 2019-05-20 8:03 ` Chen-Yu Tsai 2019-06-07 18:17 ` Stephen Boyd 2019-06-07 18:17 ` Stephen Boyd 2019-05-20 8:03 ` [PATCH 03/25] clk: Add CLK_HW_INIT_FW_NAME macro using .fw_name in .parent_data Chen-Yu Tsai 2019-05-20 8:03 ` Chen-Yu Tsai 2019-05-20 8:04 ` [PATCH 04/25] clk: Add CLK_HW_INIT_PARENT_DATA macro using .parent_data Chen-Yu Tsai 2019-05-20 8:04 ` Chen-Yu Tsai 2019-05-20 8:04 ` [PATCH 05/25] clk: fixed-factor: Add CLK_FIXED_FACTOR_HW which takes clk_hw pointer as parent Chen-Yu Tsai 2019-05-20 8:04 ` Chen-Yu Tsai 2019-05-20 8:04 ` [PATCH 06/25] clk: fixed-factor: Add CLK_FIXED_FACTOR_HWS which takes list of struct clk_hw * Chen-Yu Tsai 2019-05-20 8:04 ` Chen-Yu Tsai 2019-05-20 8:04 ` [PATCH 07/25] clk: fixed-factor: Add CLK_FIXED_FACTOR_FW_NAME for DT clock-names parent Chen-Yu Tsai 2019-05-20 8:04 ` Chen-Yu Tsai 2019-05-20 8:04 ` [PATCH 08/25] clk: sunxi-ng: switch to of_clk_hw_register() for registering clks Chen-Yu Tsai 2019-05-20 8:04 ` Chen-Yu Tsai 2019-05-20 8:04 ` [PATCH 09/25] clk: sunxi-ng: sun8i-r: Use local parent references for CLK_HW_INIT_* Chen-Yu Tsai 2019-05-20 8:04 ` Chen-Yu Tsai 2019-05-20 8:04 ` [PATCH 10/25] clk: sunxi-ng: a10: Use local parent references for CLK_FIXED_FACTOR Chen-Yu Tsai 2019-05-20 8:04 ` Chen-Yu Tsai 2019-05-20 8:04 ` [PATCH 11/25] clk: sunxi-ng: sun5i: " Chen-Yu Tsai 2019-05-20 8:04 ` Chen-Yu Tsai 2019-05-20 8:04 ` Chen-Yu Tsai [this message] 2019-05-20 8:04 ` [PATCH 12/25] clk: sunxi-ng: a31: " Chen-Yu Tsai 2019-05-20 8:04 ` [PATCH 13/25] clk: sunxi-ng: a23: " Chen-Yu Tsai 2019-05-20 8:04 ` Chen-Yu Tsai 2019-05-20 8:04 ` [PATCH 14/25] clk: sunxi-ng: a33: " Chen-Yu Tsai 2019-05-20 8:04 ` Chen-Yu Tsai 2019-05-20 8:04 ` [PATCH 15/25] clk: sunxi-ng: h3: " Chen-Yu Tsai 2019-05-20 8:04 ` Chen-Yu Tsai 2019-05-20 8:04 ` [PATCH 16/25] clk: sunxi-ng: r40: " Chen-Yu Tsai 2019-05-20 8:04 ` Chen-Yu Tsai 2019-05-20 8:04 ` [PATCH 17/25] clk: sunxi-ng: v3s: " Chen-Yu Tsai 2019-05-20 8:04 ` Chen-Yu Tsai 2019-05-20 8:04 ` [PATCH 18/25] clk: sunxi-ng: sun8i-r: " Chen-Yu Tsai 2019-05-20 8:04 ` Chen-Yu Tsai 2019-05-20 8:04 ` [PATCH 19/25] clk: sunxi-ng: f1c100s: " Chen-Yu Tsai 2019-05-20 8:04 ` Chen-Yu Tsai 2019-05-20 8:04 ` [PATCH 20/25] clk: sunxi-ng: a64: " Chen-Yu Tsai 2019-05-20 8:04 ` Chen-Yu Tsai 2019-05-20 8:04 ` [PATCH 21/25] clk: sunxi-ng: h6: " Chen-Yu Tsai 2019-05-20 8:04 ` Chen-Yu Tsai 2019-05-20 8:04 ` [PATCH 22/25] clk: sunxi-ng: h6-r: " Chen-Yu Tsai 2019-05-20 8:04 ` Chen-Yu Tsai 2019-05-20 8:04 ` [PATCH 23/25] clk: sunxi-ng: gate: Add macros for referencing local clock parents Chen-Yu Tsai 2019-05-20 8:04 ` Chen-Yu Tsai 2019-05-20 8:04 ` [PATCH 24/25] clk: sunxi-ng: a80-usb: Use local parent references for SUNXI_CCU_GATE Chen-Yu Tsai 2019-05-20 8:04 ` Chen-Yu Tsai 2019-05-20 8:04 ` [PATCH 25/25] clk: sunxi-ng: sun8i-r: " Chen-Yu Tsai 2019-05-20 8:04 ` Chen-Yu Tsai 2019-05-20 9:03 ` [PATCH 00/25] clk: sunxi-ng: clk parent rewrite part 1 Maxime Ripard 2019-05-20 9:03 ` Maxime Ripard 2019-06-03 16:38 ` Chen-Yu Tsai 2019-06-03 16:38 ` Chen-Yu Tsai 2019-06-07 18:46 ` Stephen Boyd 2019-06-07 18:46 ` Stephen Boyd 2019-06-11 5:34 ` Chen-Yu Tsai 2019-06-11 5:34 ` Chen-Yu Tsai
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190520080421.12575-13-wens@kernel.org \ --to=wens@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-clk@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=maxime.ripard@bootlin.com \ --cc=mturquette@baylibre.com \ --cc=sboyd@kernel.org \ --cc=wens@csie.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.