| Message ID | 20200713010001.18976-4-akshu.agrawal@amd.com (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
| Series | None | expand |
Quoting Akshu Agrawal (2020-07-12 17:59:52) > 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 <akshu.agrawal@amd.com> > --- I only see four out of five patches and there isn't a cover letter. I have no idea if I can apply this change or if you're expecting me to ack it. Please help make my life a little easier! > drivers/clk/x86/clk-fch.c | 55 ++++++++++++++++++++++++++++----------- > 1 file changed, 40 insertions(+), 15 deletions(-) > > diff --git a/drivers/clk/x86/clk-fch.c b/drivers/clk/x86/clk-fch.c > index b252f0cf0628..a8aac71a3b65 100644 > --- a/drivers/clk/x86/clk-fch.c > +++ b/drivers/clk/x86/clk-fch.c > @@ -61,9 +78,17 @@ static int fch_clk_probe(struct platform_device *pdev) > static int fch_clk_remove(struct platform_device *pdev) > { > int i; > + struct fch_clk_data *fch_data; > + > + fch_data = dev_get_platdata(&pdev->dev); > > - for (i = 0; i < ST_MAX_CLKS; i++) > - clk_hw_unregister(hws[i]); > + if (!fch_data->is_rv) { > + for (i = 0; i < ST_MAX_CLKS; i++) > + clk_hw_unregister(hws[i]); > + } else { > + for (i = 0; i < RV_MAX_CLKS; i++) > + clk_hw_unregister(hws[i]); Can ST_MAX_CLKS or RV_MAX_CLKS be a local variable and then the loop consolidated.
On 7/16/2020 6:33 AM, Stephen Boyd wrote: > Quoting Akshu Agrawal (2020-07-12 17:59:52) >> 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 <akshu.agrawal@amd.com> >> --- > I only see four out of five patches and there isn't a cover letter. I > have no idea if I can apply this change or if you're expecting me to ack > it. Please help make my life a little easier! Numbering went wrong due to another unrelated patch. Will send another with cover letter explaining the series. >> drivers/clk/x86/clk-fch.c | 55 ++++++++++++++++++++++++++++----------- >> 1 file changed, 40 insertions(+), 15 deletions(-) >> >> diff --git a/drivers/clk/x86/clk-fch.c b/drivers/clk/x86/clk-fch.c >> index b252f0cf0628..a8aac71a3b65 100644 >> --- a/drivers/clk/x86/clk-fch.c >> +++ b/drivers/clk/x86/clk-fch.c >> @@ -61,9 +78,17 @@ static int fch_clk_probe(struct platform_device *pdev) >> static int fch_clk_remove(struct platform_device *pdev) >> { >> int i; >> + struct fch_clk_data *fch_data; >> + >> + fch_data = dev_get_platdata(&pdev->dev); >> >> - for (i = 0; i < ST_MAX_CLKS; i++) >> - clk_hw_unregister(hws[i]); >> + if (!fch_data->is_rv) { >> + for (i = 0; i < ST_MAX_CLKS; i++) >> + clk_hw_unregister(hws[i]); >> + } else { >> + for (i = 0; i < RV_MAX_CLKS; i++) >> + clk_hw_unregister(hws[i]); > Can ST_MAX_CLKS or RV_MAX_CLKS be a local variable and then the loop > consolidated. Yes, making the change in next series. Thanks, Akshu
diff --git a/drivers/clk/x86/clk-fch.c b/drivers/clk/x86/clk-fch.c index b252f0cf0628..a8aac71a3b65 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,23 +41,36 @@ 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); + + clk_set_parent(hws[ST_CLK_MUX]->clk, hws[ST_CLK_48M]->clk); - 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_GATE] = clk_hw_register_gate(NULL, "oscout1", + "oscout1_mux", 0, fch_data->base + MISCCLKCNTL1, + OSCCLKENB, CLK_GATE_SET_TO_DISABLE, NULL); - clk_set_parent(hws[ST_CLK_MUX]->clk, hws[ST_CLK_48M]->clk); + 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); - 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[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[ST_CLK_GATE], "oscout1", - NULL); + devm_clk_hw_register_clkdev(&pdev->dev, hws[RV_CLK_GATE], + "oscout1", NULL); + } return 0; } @@ -61,9 +78,17 @@ static int fch_clk_probe(struct platform_device *pdev) static int fch_clk_remove(struct platform_device *pdev) { int i; + struct fch_clk_data *fch_data; + + fch_data = dev_get_platdata(&pdev->dev); - for (i = 0; i < ST_MAX_CLKS; i++) - clk_hw_unregister(hws[i]); + if (!fch_data->is_rv) { + for (i = 0; i < ST_MAX_CLKS; i++) + clk_hw_unregister(hws[i]); + } else { + for (i = 0; i < RV_MAX_CLKS; i++) + clk_hw_unregister(hws[i]); + } return 0; }
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 <akshu.agrawal@amd.com> --- drivers/clk/x86/clk-fch.c | 55 ++++++++++++++++++++++++++++----------- 1 file changed, 40 insertions(+), 15 deletions(-)