History

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
  1. drivers/acpi/acpi_apd.c +7 −7
  2. drivers/clk/x86/clk-st.c +2 −2
  3. 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#include <linux/clk-provider.h>10#include <linux/clk-provider.h>
11#include <linux/platform_data/clk-st.h>11#include <linux/platform_data/clk-fch.h>
12#include <linux/platform_device.h>12#include <linux/platform_device.h>
13#include <linux/pm_domain.h>13#include <linux/pm_domain.h>
14#include <linux/clkdev.h>14#include <linux/clkdev.h>
@@ -79,11 +79,11 @@ static int misc_check_res(struct acpi_resource *ares, void *data) · 64 unmodified lines
79 return !acpi_dev_resource_memory(ares, &res);79 return !acpi_dev_resource_memory(ares, &res);
80}80}
81 81
82static int st_misc_setup(struct apd_private_data *pdata)82static int fch_misc_setup(struct apd_private_data *pdata)
83{83{
84 struct acpi_device *adev = pdata->adev;84 struct acpi_device *adev = pdata->adev;
85 struct platform_device *clkdev;85 struct platform_device *clkdev;
86 struct st_clk_data *clk_data;86 struct fch_clk_data *clk_data;
87 struct resource_entry *rentry;87 struct resource_entry *rentry;
88 struct list_head resource_list;88 struct list_head resource_list;
89 int ret;89 int ret;
@@ -106,7 +106,7 @@ static int st_misc_setup(struct apd_private_data *pdata) · 16 unmodified lines
106 106
107 acpi_dev_free_resource_list(&resource_list);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 PLATFORM_DEVID_NONE, clk_data,110 PLATFORM_DEVID_NONE, clk_data,
111 sizeof(*clk_data));111 sizeof(*clk_data));
112 return PTR_ERR_OR_ZERO(clkdev);112 return PTR_ERR_OR_ZERO(clkdev);
@@ -135,8 +135,8 @@ static const struct apd_device_desc cz_uart_desc = { · 22 unmodified lines
135 .properties = uart_properties,135 .properties = uart_properties,
136};136};
137 137
138static const struct apd_device_desc st_misc_desc = {138static const struct apd_device_desc fch_misc_desc = {
139 .setup = st_misc_setup,139 .setup = fch_misc_setup,
140};140};
141#endif141#endif
142 142
@@ -239,7 +239,7 @@ static const struct acpi_device_id acpi_apd_device_ids[] = { · 96 unmodified lines
239 { "AMD0020", APD_ADDR(cz_uart_desc) },239 { "AMD0020", APD_ADDR(cz_uart_desc) },
240 { "AMDI0020", APD_ADDR(cz_uart_desc) },240 { "AMDI0020", APD_ADDR(cz_uart_desc) },
241 { "AMD0030", },241 { "AMD0030", },
242 { "AMD0040", APD_ADDR(st_misc_desc)},242 { "AMD0040", APD_ADDR(fch_misc_desc)},
243 { "HYGO0010", APD_ADDR(wt_i2c_desc) },243 { "HYGO0010", APD_ADDR(wt_i2c_desc) },
244#endif244#endif
245#ifdef CONFIG_ARM64245#ifdef CONFIG_ARM64
drivers/clk/x86/clk-st.c+2−2
@@ -8,7 +8,7 @@ · 7 unmodified lines
8#include <linux/clk.h>8#include <linux/clk.h>
9#include <linux/clkdev.h>9#include <linux/clkdev.h>
10#include <linux/clk-provider.h>10#include <linux/clk-provider.h>
11#include <linux/platform_data/clk-st.h>11#include <linux/platform_data/clk-fch.h>
12#include <linux/platform_device.h>12#include <linux/platform_device.h>
13 13
14/* Clock Driving Strength 2 register */14/* Clock Driving Strength 2 register */
@@ -31,7 +31,7 @@ static struct clk_hw *hws[ST_MAX_CLKS]; · 16 unmodified lines
31 31
32static int st_clk_probe(struct platform_device *pdev)32static 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 st_data = dev_get_platdata(&pdev->dev);36 st_data = dev_get_platdata(&pdev->dev);
37 if (!st_data || !st_data->base)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/* SPDX-License-Identifier: MIT */1/* SPDX-License-Identifier: MIT */
2/*2/*
3 * clock framework for AMD Stoney based clock3 * clock framework for AMD misc clocks
4 *4 *
5 * Copyright 2018 Advanced Micro Devices, Inc.5 * Copyright 2018 Advanced Micro Devices, Inc.
6 */6 */
7 7
8#ifndef __CLK_ST_H8#ifndef __CLK_FCH_H
9#define __CLK_ST_H9#define __CLK_FCH_H
10 10
11#include <linux/compiler.h>11#include <linux/compiler.h>
12 12
13struct st_clk_data {13struct fch_clk_data {
14 void __iomem *base;14 void __iomem *base;
15};15};
16 16
17#endif /* __CLK_ST_H */17#endif /* __CLK_FCH_H */