Skip to content

Commit d9b7736

Browse files
Akshu Agrawalrafaeljw
authored andcommitted
clk: x86: Change name from ST to FCH
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 <[email protected]> Reviewed-by: Stephen Boyd <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent d58669b commit d9b7736

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

drivers/clk/x86/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22
obj-$(CONFIG_PMC_ATOM) += clk-pmc-atom.o
3-
obj-$(CONFIG_X86_AMD_PLATFORM_DEVICE) += clk-st.o
3+
obj-$(CONFIG_X86_AMD_PLATFORM_DEVICE) += clk-fch.o
44
clk-x86-lpss-objs := clk-lpt.o
55
obj-$(CONFIG_X86_INTEL_LPSS) += clk-x86-lpss.o
66
obj-$(CONFIG_CLK_LGM_CGU) += clk-cgu.o clk-cgu-pll.o clk-lgm.o

drivers/clk/x86/clk-st.c renamed to drivers/clk/x86/clk-fch.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
static const char * const clk_oscout1_parents[] = { "clk48MHz", "clk25MHz" };
3030
static struct clk_hw *hws[ST_MAX_CLKS];
3131

32-
static int st_clk_probe(struct platform_device *pdev)
32+
static int fch_clk_probe(struct platform_device *pdev)
3333
{
34-
struct fch_clk_data *st_data;
34+
struct fch_clk_data *fch_data;
3535

36-
st_data = dev_get_platdata(&pdev->dev);
37-
if (!st_data || !st_data->base)
36+
fch_data = dev_get_platdata(&pdev->dev);
37+
if (!fch_data || !fch_data->base)
3838
return -EINVAL;
3939

4040
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)
4444

4545
hws[ST_CLK_MUX] = clk_hw_register_mux(NULL, "oscout1_mux",
4646
clk_oscout1_parents, ARRAY_SIZE(clk_oscout1_parents),
47-
0, st_data->base + CLKDRVSTR2, OSCOUT1CLK25MHZ, 3, 0, NULL);
47+
0, fch_data->base + CLKDRVSTR2, OSCOUT1CLK25MHZ, 3, 0, NULL);
4848

4949
clk_set_parent(hws[ST_CLK_MUX]->clk, hws[ST_CLK_48M]->clk);
5050

5151
hws[ST_CLK_GATE] = clk_hw_register_gate(NULL, "oscout1", "oscout1_mux",
52-
0, st_data->base + MISCCLKCNTL1, OSCCLKENB,
52+
0, fch_data->base + MISCCLKCNTL1, OSCCLKENB,
5353
CLK_GATE_SET_TO_DISABLE, NULL);
5454

5555
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)
5858
return 0;
5959
}
6060

61-
static int st_clk_remove(struct platform_device *pdev)
61+
static int fch_clk_remove(struct platform_device *pdev)
6262
{
6363
int i;
6464

@@ -67,12 +67,12 @@ static int st_clk_remove(struct platform_device *pdev)
6767
return 0;
6868
}
6969

70-
static struct platform_driver st_clk_driver = {
70+
static struct platform_driver fch_clk_driver = {
7171
.driver = {
72-
.name = "clk-st",
72+
.name = "clk-fch",
7373
.suppress_bind_attrs = true,
7474
},
75-
.probe = st_clk_probe,
76-
.remove = st_clk_remove,
75+
.probe = fch_clk_probe,
76+
.remove = fch_clk_remove,
7777
};
78-
builtin_platform_driver(st_clk_driver);
78+
builtin_platform_driver(fch_clk_driver);

0 commit comments

Comments
 (0)