Skip to content

Commit d58669b

Browse files
Akshu Agrawalrafaeljw
authored andcommitted
ACPI: APD: Change name from ST to FCH
AMD SoC general pupose clk is present in new platforms with same MMIO mappings. We can reuse the same clk handler support for other platforms. Hence, changing name from ST(SoC) to FCH(IP) Signed-off-by: Akshu Agrawal <[email protected]> Acked-by: Stephen Boyd <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent 384b02d commit d58669b

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

drivers/acpi/acpi_apd.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99

1010
#include <linux/clk-provider.h>
11-
#include <linux/platform_data/clk-st.h>
11+
#include <linux/platform_data/clk-fch.h>
1212
#include <linux/platform_device.h>
1313
#include <linux/pm_domain.h>
1414
#include <linux/clkdev.h>
@@ -79,11 +79,11 @@ static int misc_check_res(struct acpi_resource *ares, void *data)
7979
return !acpi_dev_resource_memory(ares, &res);
8080
}
8181

82-
static int st_misc_setup(struct apd_private_data *pdata)
82+
static int fch_misc_setup(struct apd_private_data *pdata)
8383
{
8484
struct acpi_device *adev = pdata->adev;
8585
struct platform_device *clkdev;
86-
struct st_clk_data *clk_data;
86+
struct fch_clk_data *clk_data;
8787
struct resource_entry *rentry;
8888
struct list_head resource_list;
8989
int ret;
@@ -106,7 +106,7 @@ static int st_misc_setup(struct apd_private_data *pdata)
106106

107107
acpi_dev_free_resource_list(&resource_list);
108108

109-
clkdev = platform_device_register_data(&adev->dev, "clk-st",
109+
clkdev = platform_device_register_data(&adev->dev, "clk-fch",
110110
PLATFORM_DEVID_NONE, clk_data,
111111
sizeof(*clk_data));
112112
return PTR_ERR_OR_ZERO(clkdev);
@@ -135,8 +135,8 @@ static const struct apd_device_desc cz_uart_desc = {
135135
.properties = uart_properties,
136136
};
137137

138-
static const struct apd_device_desc st_misc_desc = {
139-
.setup = st_misc_setup,
138+
static const struct apd_device_desc fch_misc_desc = {
139+
.setup = fch_misc_setup,
140140
};
141141
#endif
142142

@@ -239,7 +239,7 @@ static const struct acpi_device_id acpi_apd_device_ids[] = {
239239
{ "AMD0020", APD_ADDR(cz_uart_desc) },
240240
{ "AMDI0020", APD_ADDR(cz_uart_desc) },
241241
{ "AMD0030", },
242-
{ "AMD0040", APD_ADDR(st_misc_desc)},
242+
{ "AMD0040", APD_ADDR(fch_misc_desc)},
243243
{ "HYGO0010", APD_ADDR(wt_i2c_desc) },
244244
#endif
245245
#ifdef CONFIG_ARM64

drivers/clk/x86/clk-st.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <linux/clk.h>
99
#include <linux/clkdev.h>
1010
#include <linux/clk-provider.h>
11-
#include <linux/platform_data/clk-st.h>
11+
#include <linux/platform_data/clk-fch.h>
1212
#include <linux/platform_device.h>
1313

1414
/* Clock Driving Strength 2 register */
@@ -31,7 +31,7 @@ static struct clk_hw *hws[ST_MAX_CLKS];
3131

3232
static int st_clk_probe(struct platform_device *pdev)
3333
{
34-
struct st_clk_data *st_data;
34+
struct fch_clk_data *st_data;
3535

3636
st_data = dev_get_platdata(&pdev->dev);
3737
if (!st_data || !st_data->base)
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
/* SPDX-License-Identifier: MIT */
22
/*
3-
* clock framework for AMD Stoney based clock
3+
* clock framework for AMD misc clocks
44
*
55
* Copyright 2018 Advanced Micro Devices, Inc.
66
*/
77

8-
#ifndef __CLK_ST_H
9-
#define __CLK_ST_H
8+
#ifndef __CLK_FCH_H
9+
#define __CLK_FCH_H
1010

1111
#include <linux/compiler.h>
1212

13-
struct st_clk_data {
13+
struct fch_clk_data {
1414
void __iomem *base;
1515
};
1616

17-
#endif /* __CLK_ST_H */
17+
#endif /* __CLK_FCH_H */

0 commit comments

Comments
 (0)