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)

Akshu Agrawal committed 6 years ago

Commit d58669b1 parent 384b02d3 files · +14 −14Browse files

Unified · Split

3 files

drivers/acpi/acpi_apd.c +7 −7
drivers/clk/x86/clk-st.c +2 −2
include/linux/platform_data/clk-fch.h +5 −5

drivers/acpi/acpi_apd.c+7−7

@@ -8,7 +8,7 @@ · 7 unmodified lines
8	8	*/
9	9
10	10	#include <linux/clk-provider.h>
11		−#include <linux/platform_data/clk-st.h>
	11	+#include <linux/platform_data/clk-fch.h>
12	12	#include <linux/platform_device.h>
13	13	#include <linux/pm_domain.h>
14	14	#include <linux/clkdev.h>
@@ -79,11 +79,11 @@ static int misc_check_res(struct acpi_resource ares, void data) · 64 unmodified lines
79	79	return !acpi_dev_resource_memory(ares, &res);
80	80	}
81	81
82		−static int st_misc_setup(struct apd_private_data *pdata)
	82	+static int fch_misc_setup(struct apd_private_data *pdata)
83	83	{
84	84	struct acpi_device *adev = pdata->adev;
85	85	struct platform_device *clkdev;
86		− struct st_clk_data *clk_data;
	86	+ struct fch_clk_data *clk_data;
87	87	struct resource_entry *rentry;
88	88	struct list_head resource_list;
89	89	int ret;
@@ -106,7 +106,7 @@ static int st_misc_setup(struct apd_private_data *pdata) · 16 unmodified lines
106	106
107	107	acpi_dev_free_resource_list(&resource_list);
108	108
109		− clkdev = platform_device_register_data(&adev->dev, "clk-st",
	109	+ clkdev = platform_device_register_data(&adev->dev, "clk-fch",
110	110	PLATFORM_DEVID_NONE, clk_data,
111	111	sizeof(*clk_data));
112	112	return PTR_ERR_OR_ZERO(clkdev);
@@ -135,8 +135,8 @@ static const struct apd_device_desc cz_uart_desc = { · 22 unmodified lines
135	135	.properties = uart_properties,
136	136	};
137	137
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,
140	140	};
141	141	#endif
142	142
@@ -239,7 +239,7 @@ static const struct acpi_device_id acpi_apd_device_ids[] = { · 96 unmodified lines
239	239	{ "AMD0020", APD_ADDR(cz_uart_desc) },
240	240	{ "AMDI0020", APD_ADDR(cz_uart_desc) },
241	241	{ "AMD0030", },
242		− { "AMD0040", APD_ADDR(st_misc_desc)},
	242	+ { "AMD0040", APD_ADDR(fch_misc_desc)},
243	243	{ "HYGO0010", APD_ADDR(wt_i2c_desc) },
244	244	#endif
245	245	#ifdef CONFIG_ARM64

drivers/clk/x86/clk-st.c+2−2

@@ -8,7 +8,7 @@ · 7 unmodified lines
8	8	#include <linux/clk.h>
9	9	#include <linux/clkdev.h>
10	10	#include <linux/clk-provider.h>
11		−#include <linux/platform_data/clk-st.h>
	11	+#include <linux/platform_data/clk-fch.h>
12	12	#include <linux/platform_device.h>
13	13
14	14	/* Clock Driving Strength 2 register */
@@ -31,7 +31,7 @@ static struct clk_hw *hws[ST_MAX_CLKS]; · 16 unmodified lines
31	31
32	32	static int st_clk_probe(struct platform_device *pdev)
33	33	{
34		− struct st_clk_data *st_data;
	34	+ struct fch_clk_data *st_data;
35	35
36	36	st_data = dev_get_platdata(&pdev->dev);
37	37	if (!st_data \|\| !st_data->base)

include/linux/platform_data/clk-fch.hrenamed from include/linux/platform_data/clk-st.h+5−5

@@ -1,17 +1,17 @@
1	1	/* SPDX-License-Identifier: MIT */
2	2	/*
3		− * clock framework for AMD Stoney based clock
	3	+ * clock framework for AMD misc clocks
4	4	*
5	5	* Copyright 2018 Advanced Micro Devices, Inc.
6	6	*/
7	7
8		−#ifndef __CLK_ST_H
9		−#define __CLK_ST_H
	8	+#ifndef __CLK_FCH_H
	9	+#define __CLK_FCH_H
10	10
11	11	#include <linux/compiler.h>
12	12
13		−struct st_clk_data {
	13	+struct fch_clk_data {
14	14	void __iomem *base;
15	15	};
16	16
17		−#endif /* __CLK_ST_H */
	17	+#endif /* __CLK_FCH_H */