| Message ID | 20200713010001.18976-2-akshu.agrawal@amd.com (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
| Series | None | expand |
Quoting Akshu Agrawal (2020-07-12 17:59:50) > 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> Is this file moved somewhere? > #include <linux/platform_device.h> > > /* Clock Driving Strength 2 register */
On 7/16/2020 6:12 AM, Stephen Boyd wrote: > Quoting Akshu Agrawal (2020-07-12 17:59:50) >> 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> > Is this file moved somewhere? Renaming it from ST to FCH in previous patch of the series. Thanks, Akshu
Quoting Agrawal, Akshu (2020-07-19 21:59:02) > > On 7/16/2020 6:12 AM, Stephen Boyd wrote: > > Quoting Akshu Agrawal (2020-07-12 17:59:50) > >> 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> > > Is this file moved somewhere? > > Renaming it from ST to FCH in previous patch of the series. > So it won't compile if the first patch is applied and then this patch isn't? Please compile test each patch in succession.
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);
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%)