git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ACPI: APD: Change name from ST to FCH
[sfrench/cifs-2.6.git]
/
drivers
/
acpi
/
acpi_apd.c
diff --git
a/drivers/acpi/acpi_apd.c
b/drivers/acpi/acpi_apd.c
index f24f6d3f1fa553c71e89b614ddc76cc3e8e2d5a1..36319deb24d9690564169fad2932ef9256fd8c41 100644
(file)
--- a/
drivers/acpi/acpi_apd.c
+++ b/
drivers/acpi/acpi_apd.c
@@
-8,7
+8,7
@@
*/
#include <linux/clk-provider.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>
#include <linux/pm_domain.h>
#include <linux/clkdev.h>
#include <linux/platform_device.h>
#include <linux/pm_domain.h>
#include <linux/clkdev.h>
@@
-79,11
+79,11
@@
static int misc_check_res(struct acpi_resource *ares, void *data)
return !acpi_dev_resource_memory(ares, &res);
}
return !acpi_dev_resource_memory(ares, &res);
}
-static int
st
_misc_setup(struct apd_private_data *pdata)
+static int
fch
_misc_setup(struct apd_private_data *pdata)
{
struct acpi_device *adev = pdata->adev;
struct platform_device *clkdev;
{
struct acpi_device *adev = pdata->adev;
struct platform_device *clkdev;
- struct
st
_clk_data *clk_data;
+ struct
fch
_clk_data *clk_data;
struct resource_entry *rentry;
struct list_head resource_list;
int ret;
struct resource_entry *rentry;
struct list_head resource_list;
int ret;
@@
-106,7
+106,7
@@
static int st_misc_setup(struct apd_private_data *pdata)
acpi_dev_free_resource_list(&resource_list);
acpi_dev_free_resource_list(&resource_list);
- clkdev = platform_device_register_data(&adev->dev, "clk-
st
",
+ clkdev = platform_device_register_data(&adev->dev, "clk-
fch
",
PLATFORM_DEVID_NONE, clk_data,
sizeof(*clk_data));
return PTR_ERR_OR_ZERO(clkdev);
PLATFORM_DEVID_NONE, clk_data,
sizeof(*clk_data));
return PTR_ERR_OR_ZERO(clkdev);
@@
-135,8
+135,8
@@
static const struct apd_device_desc cz_uart_desc = {
.properties = uart_properties,
};
.properties = uart_properties,
};
-static const struct apd_device_desc
st
_misc_desc = {
- .setup =
st
_misc_setup,
+static const struct apd_device_desc
fch
_misc_desc = {
+ .setup =
fch
_misc_setup,
};
#endif
};
#endif
@@
-239,7
+239,7
@@
static const struct acpi_device_id acpi_apd_device_ids[] = {
{ "AMD0020", APD_ADDR(cz_uart_desc) },
{ "AMDI0020", APD_ADDR(cz_uart_desc) },
{ "AMD0030", },
{ "AMD0020", APD_ADDR(cz_uart_desc) },
{ "AMDI0020", APD_ADDR(cz_uart_desc) },
{ "AMD0030", },
- { "AMD0040", APD_ADDR(
st
_misc_desc)},
+ { "AMD0040", APD_ADDR(
fch
_misc_desc)},
{ "HYGO0010", APD_ADDR(wt_i2c_desc) },
#endif
#ifdef CONFIG_ARM64
{ "HYGO0010", APD_ADDR(wt_i2c_desc) },
#endif
#ifdef CONFIG_ARM64