linux-clk.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 2/4] clk: x86: Change name from ST to FCH
       [not found] <20200720050500.23357-1-akshu.agrawal@amd.com>
@ 2020-07-20  5:04 ` Akshu Agrawal
  2020-07-21  8:06   ` Stephen Boyd
  2020-07-20  5:04 ` [v2 4/4] clk: x86: Support RV architecture Akshu Agrawal
  1 sibling, 1 reply; 6+ messages in thread
From: Akshu Agrawal @ 2020-07-20  5:04 UTC (permalink / raw)
  To: akshu.agrawal
  Cc: sboyd, Michael Turquette, Rahul Tanwar,
	open list:COMMON CLK FRAMEWORK, open list

AMD SoC general pupose clk is present in new platforms with
minor differences. We can reuse the same clk driver for other
platforms. Hence, changing name from ST(SoC) to FCH(IP)

Signed-off-by: Akshu Agrawal <akshu.agrawal@amd.com>
---
 drivers/clk/x86/Makefile                |  2 +-
 drivers/clk/x86/{clk-st.c => clk-fch.c} | 26 ++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)
 rename drivers/clk/x86/{clk-st.c => clk-fch.c} (73%)

diff --git a/drivers/clk/x86/Makefile b/drivers/clk/x86/Makefile
index 7c774ea7ddeb..18564efdc651 100644
--- a/drivers/clk/x86/Makefile
+++ b/drivers/clk/x86/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_PMC_ATOM)		+= clk-pmc-atom.o
-obj-$(CONFIG_X86_AMD_PLATFORM_DEVICE)	+= clk-st.o
+obj-$(CONFIG_X86_AMD_PLATFORM_DEVICE)	+= clk-fch.o
 clk-x86-lpss-objs		:= clk-lpt.o
 obj-$(CONFIG_X86_INTEL_LPSS)	+= clk-x86-lpss.o
 obj-$(CONFIG_CLK_LGM_CGU)	+= clk-cgu.o clk-cgu-pll.o clk-lgm.o
diff --git a/drivers/clk/x86/clk-st.c b/drivers/clk/x86/clk-fch.c
similarity index 73%
rename from drivers/clk/x86/clk-st.c
rename to drivers/clk/x86/clk-fch.c
index 25d4b97aff9b..b252f0cf0628 100644
--- a/drivers/clk/x86/clk-st.c
+++ b/drivers/clk/x86/clk-fch.c
@@ -8,7 +8,7 @@
 #include <linux/clk.h>
 #include <linux/clkdev.h>
 #include <linux/clk-provider.h>
-#include <linux/platform_data/clk-st.h>
+#include <linux/platform_data/clk-fch.h>
 #include <linux/platform_device.h>
 
 /* Clock Driving Strength 2 register */
@@ -29,12 +29,12 @@
 static const char * const clk_oscout1_parents[] = { "clk48MHz", "clk25MHz" };
 static struct clk_hw *hws[ST_MAX_CLKS];
 
-static int st_clk_probe(struct platform_device *pdev)
+static int fch_clk_probe(struct platform_device *pdev)
 {
-	struct st_clk_data *st_data;
+	struct fch_clk_data *fch_data;
 
-	st_data = dev_get_platdata(&pdev->dev);
-	if (!st_data || !st_data->base)
+	fch_data = dev_get_platdata(&pdev->dev);
+	if (!fch_data || !fch_data->base)
 		return -EINVAL;
 
 	hws[ST_CLK_48M] = clk_hw_register_fixed_rate(NULL, "clk48MHz", NULL, 0,
@@ -44,12 +44,12 @@ static int st_clk_probe(struct platform_device *pdev)
 
 	hws[ST_CLK_MUX] = clk_hw_register_mux(NULL, "oscout1_mux",
 		clk_oscout1_parents, ARRAY_SIZE(clk_oscout1_parents),
-		0, st_data->base + CLKDRVSTR2, OSCOUT1CLK25MHZ, 3, 0, NULL);
+		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_GATE] = clk_hw_register_gate(NULL, "oscout1", "oscout1_mux",
-		0, st_data->base + MISCCLKCNTL1, OSCCLKENB,
+		0, fch_data->base + MISCCLKCNTL1, OSCCLKENB,
 		CLK_GATE_SET_TO_DISABLE, NULL);
 
 	devm_clk_hw_register_clkdev(&pdev->dev, hws[ST_CLK_GATE], "oscout1",
@@ -58,7 +58,7 @@ static int st_clk_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static int st_clk_remove(struct platform_device *pdev)
+static int fch_clk_remove(struct platform_device *pdev)
 {
 	int i;
 
@@ -67,12 +67,12 @@ static int st_clk_remove(struct platform_device *pdev)
 	return 0;
 }
 
-static struct platform_driver st_clk_driver = {
+static struct platform_driver fch_clk_driver = {
 	.driver = {
-		.name = "clk-st",
+		.name = "clk-fch",
 		.suppress_bind_attrs = true,
 	},
-	.probe = st_clk_probe,
-	.remove = st_clk_remove,
+	.probe = fch_clk_probe,
+	.remove = fch_clk_remove,
 };
-builtin_platform_driver(st_clk_driver);
+builtin_platform_driver(fch_clk_driver);
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [v2 4/4] clk: x86: Support RV architecture
       [not found] <20200720050500.23357-1-akshu.agrawal@amd.com>
  2020-07-20  5:04 ` [PATCH 2/4] clk: x86: Change name from ST to FCH Akshu Agrawal
@ 2020-07-20  5:04 ` Akshu Agrawal
  2020-07-21  8:05   ` Stephen Boyd
  1 sibling, 1 reply; 6+ messages in thread
From: Akshu Agrawal @ 2020-07-20  5:04 UTC (permalink / raw)
  To: akshu.agrawal
  Cc: sboyd, Michael Turquette, open list:COMMON CLK FRAMEWORK, open list

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>
---
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


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [v2 4/4] clk: x86: Support RV architecture
  2020-07-20  5:04 ` [v2 4/4] clk: x86: Support RV architecture Akshu Agrawal
@ 2020-07-21  8:05   ` Stephen Boyd
  2020-07-28  6:36     ` Agrawal, Akshu
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Boyd @ 2020-07-21  8:05 UTC (permalink / raw)
  To: akshu.agrawal; +Cc: Michael Turquette, linux-clk, linux-kernel

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;
>  }
>

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH 2/4] clk: x86: Change name from ST to FCH
  2020-07-20  5:04 ` [PATCH 2/4] clk: x86: Change name from ST to FCH Akshu Agrawal
@ 2020-07-21  8:06   ` Stephen Boyd
  2020-07-28  6:35     ` Agrawal, Akshu
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Boyd @ 2020-07-21  8:06 UTC (permalink / raw)
  To: akshu.agrawal; +Cc: Michael Turquette, Rahul Tanwar, linux-clk, linux-kernel

Quoting Akshu Agrawal (2020-07-19 22:04:57)
> diff --git a/drivers/clk/x86/clk-st.c b/drivers/clk/x86/clk-fch.c
> similarity index 73%
> rename from drivers/clk/x86/clk-st.c
> rename to drivers/clk/x86/clk-fch.c
> index 25d4b97aff9b..b252f0cf0628 100644
> --- a/drivers/clk/x86/clk-st.c
> +++ b/drivers/clk/x86/clk-fch.c
> @@ -8,7 +8,7 @@
>  #include <linux/clk.h>
>  #include <linux/clkdev.h>
>  #include <linux/clk-provider.h>
> -#include <linux/platform_data/clk-st.h>
> +#include <linux/platform_data/clk-fch.h>

As stated before, this should go with the patch that moves the file.

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH 2/4] clk: x86: Change name from ST to FCH
  2020-07-21  8:06   ` Stephen Boyd
@ 2020-07-28  6:35     ` Agrawal, Akshu
  0 siblings, 0 replies; 6+ messages in thread
From: Agrawal, Akshu @ 2020-07-28  6:35 UTC (permalink / raw)
  To: Stephen Boyd, akshu.agrawal
  Cc: Michael Turquette, Rahul Tanwar, linux-clk, linux-kernel,
	Rafael J. Wysocki


On 7/21/2020 1:36 PM, Stephen Boyd wrote:
> Quoting Akshu Agrawal (2020-07-19 22:04:57)
>> diff --git a/drivers/clk/x86/clk-st.c b/drivers/clk/x86/clk-fch.c
>> similarity index 73%
>> rename from drivers/clk/x86/clk-st.c
>> rename to drivers/clk/x86/clk-fch.c
>> index 25d4b97aff9b..b252f0cf0628 100644
>> --- a/drivers/clk/x86/clk-st.c
>> +++ b/drivers/clk/x86/clk-fch.c
>> @@ -8,7 +8,7 @@
>>   #include <linux/clk.h>
>>   #include <linux/clkdev.h>
>>   #include <linux/clk-provider.h>
>> -#include <linux/platform_data/clk-st.h>
>> +#include <linux/platform_data/clk-fch.h>
> As stated before, this should go with the patch that moves the file.

+Rafael

Sorry for late reply, somehow I missed these mails. Will move it to 
acpi: apd change

Thanks,

Akshu


^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [v2 4/4] clk: x86: Support RV architecture
  2020-07-21  8:05   ` Stephen Boyd
@ 2020-07-28  6:36     ` Agrawal, Akshu
  0 siblings, 0 replies; 6+ messages in thread
From: Agrawal, Akshu @ 2020-07-28  6:36 UTC (permalink / raw)
  To: Stephen Boyd, akshu.agrawal; +Cc: Michael Turquette, linux-clk, linux-kernel


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;
>>   }
>>

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-07-28  6:37 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <20200720050500.23357-1-akshu.agrawal@amd.com>
2020-07-20  5:04 ` [PATCH 2/4] clk: x86: Change name from ST to FCH Akshu Agrawal
2020-07-21  8:06   ` Stephen Boyd
2020-07-28  6:35     ` Agrawal, Akshu
2020-07-20  5:04 ` [v2 4/4] clk: x86: Support RV architecture Akshu Agrawal
2020-07-21  8:05   ` Stephen Boyd
2020-07-28  6:36     ` Agrawal, Akshu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).