2020-07-20 05:10:40

by Agrawal, Akshu

Subject: [v2 4/4] clk: x86: Support RV architecture

There is minor difference between previous family of SoC and
the current one. Which is the there is only 48Mh fixed clk.
There is no mux and no option to select another freq as there in previous.

Signed-off-by: Akshu Agrawal <[email protected]>
---
v2: Consolidated the loops in remove.

drivers/clk/x86/clk-fch.c | 53 ++++++++++++++++++++++++++++-----------
1 file changed, 38 insertions(+), 15 deletions(-)

diff --git a/drivers/clk/x86/clk-fch.c b/drivers/clk/x86/clk-fch.c
index b252f0cf0628..d68bca7b213f 100644
--- a/drivers/clk/x86/clk-fch.c
+++ b/drivers/clk/x86/clk-fch.c
@@ -26,6 +26,10 @@
#define ST_CLK_GATE 3
#define ST_MAX_CLKS 4

+#define RV_CLK_48M 0
+#define RV_CLK_GATE 1
+#define RV_MAX_CLKS 2
+
static const char * const clk_oscout1_parents[] = { "clk48MHz", "clk25MHz" };
static struct clk_hw *hws[ST_MAX_CLKS];

@@ -37,33 +41,52 @@ static int fch_clk_probe(struct platform_device *pdev)
if (!fch_data || !fch_data->base)
return -EINVAL;

- hws[ST_CLK_48M] = clk_hw_register_fixed_rate(NULL, "clk48MHz", NULL, 0,
- 48000000);
- hws[ST_CLK_25M] = clk_hw_register_fixed_rate(NULL, "clk25MHz", NULL, 0,
- 25000000);
+ if (!fch_data->is_rv) {
+ hws[ST_CLK_48M] = clk_hw_register_fixed_rate(NULL, "clk48MHz",
+ NULL, 0, 48000000);
+ hws[ST_CLK_25M] = clk_hw_register_fixed_rate(NULL, "clk25MHz",
+ NULL, 0, 25000000);
+
+ hws[ST_CLK_MUX] = clk_hw_register_mux(NULL, "oscout1_mux",
+ clk_oscout1_parents, ARRAY_SIZE(clk_oscout1_parents),
+ 0, fch_data->base + CLKDRVSTR2, OSCOUT1CLK25MHZ, 3, 0,
+ NULL);

- hws[ST_CLK_MUX] = clk_hw_register_mux(NULL, "oscout1_mux",
- clk_oscout1_parents, ARRAY_SIZE(clk_oscout1_parents),
- 0, fch_data->base + CLKDRVSTR2, OSCOUT1CLK25MHZ, 3, 0, NULL);
+ clk_set_parent(hws[ST_CLK_MUX]->clk, hws[ST_CLK_48M]->clk);

- clk_set_parent(hws[ST_CLK_MUX]->clk, hws[ST_CLK_48M]->clk);
+ hws[ST_CLK_GATE] = clk_hw_register_gate(NULL, "oscout1",
+ "oscout1_mux", 0, fch_data->base + MISCCLKCNTL1,
+ OSCCLKENB, CLK_GATE_SET_TO_DISABLE, NULL);

- hws[ST_CLK_GATE] = clk_hw_register_gate(NULL, "oscout1", "oscout1_mux",
- 0, fch_data->base + MISCCLKCNTL1, OSCCLKENB,
- CLK_GATE_SET_TO_DISABLE, NULL);
+ devm_clk_hw_register_clkdev(&pdev->dev, hws[ST_CLK_GATE],
+ "oscout1", NULL);
+ } else {
+ hws[RV_CLK_48M] = clk_hw_register_fixed_rate(NULL, "clk48MHz",
+ NULL, 0, 48000000);

- devm_clk_hw_register_clkdev(&pdev->dev, hws[ST_CLK_GATE], "oscout1",
- NULL);
+ hws[RV_CLK_GATE] = clk_hw_register_gate(NULL, "oscout1",
+ "clk48MHz", 0, fch_data->base + MISCCLKCNTL1,
+ OSCCLKENB, CLK_GATE_SET_TO_DISABLE, NULL);
+
+ devm_clk_hw_register_clkdev(&pdev->dev, hws[RV_CLK_GATE],
+ "oscout1", NULL);
+ }

return 0;
}

static int fch_clk_remove(struct platform_device *pdev)
{
- int i;
+ int i, clks;
+ struct fch_clk_data *fch_data;

- for (i = 0; i < ST_MAX_CLKS; i++)
+ fch_data = dev_get_platdata(&pdev->dev);
+
+ clks = (!fch_data->is_rv) ? ST_MAX_CLKS : RV_MAX_CLKS;
+
+ for (i = 0; i < clks; i++)
clk_hw_unregister(hws[i]);
+
return 0;
}

--
2.20.1

2020-07-21 08:08:39

by Stephen Boyd

Subject: Re: [v2 4/4] clk: x86: Support RV architecture

Quoting Akshu Agrawal (2020-07-19 22:04:59)
> diff --git a/drivers/clk/x86/clk-fch.c b/drivers/clk/x86/clk-fch.c
> index b252f0cf0628..d68bca7b213f 100644
> --- a/drivers/clk/x86/clk-fch.c
> +++ b/drivers/clk/x86/clk-fch.c
[...]
>
> static int fch_clk_remove(struct platform_device *pdev)
> {
> - int i;
> + int i, clks;
> + struct fch_clk_data *fch_data;
>
> - for (i = 0; i < ST_MAX_CLKS; i++)
> + fch_data = dev_get_platdata(&pdev->dev);
> +
> + clks = (!fch_data->is_rv) ? ST_MAX_CLKS : RV_MAX_CLKS;

Useless parenthesis and negation, just write:

num = fch_data->is_rv ? RV_MAX_CLKS : ST_MAX_CLKS;

> +
> + for (i = 0; i < clks; i++)
> clk_hw_unregister(hws[i]);
> +
> return 0;
> }
>

2020-07-28 06:38:32

by Agrawal, Akshu

Subject: Re: [v2 4/4] clk: x86: Support RV architecture

On 7/21/2020 1:35 PM, Stephen Boyd wrote:
> Quoting Akshu Agrawal (2020-07-19 22:04:59)
>> diff --git a/drivers/clk/x86/clk-fch.c b/drivers/clk/x86/clk-fch.c
>> index b252f0cf0628..d68bca7b213f 100644
>> --- a/drivers/clk/x86/clk-fch.c
>> +++ b/drivers/clk/x86/clk-fch.c
> [...]
>>
>> static int fch_clk_remove(struct platform_device *pdev)
>> {
>> - int i;
>> + int i, clks;
>> + struct fch_clk_data *fch_data;
>>
>> - for (i = 0; i < ST_MAX_CLKS; i++)
>> + fch_data = dev_get_platdata(&pdev->dev);
>> +
>> + clks = (!fch_data->is_rv) ? ST_MAX_CLKS : RV_MAX_CLKS;
> Useless parenthesis and negation, just write:
>
> num = fch_data->is_rv ? RV_MAX_CLKS : ST_MAX_CLKS;

Sure, including in the next patch set.

Thanks,

Akshu

>
>> +
>> + for (i = 0; i < clks; i++)
>> clk_hw_unregister(hws[i]);
>> +
>> return 0;
>> }
>>