projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
[linux-2.6-microblaze.git]
/
drivers
/
acpi
/
acpi_lpss.c
diff --git
a/drivers/acpi/acpi_lpss.c
b/drivers/acpi/acpi_lpss.c
index
894b7e6
..
30b1f51
100644
(file)
--- a/
drivers/acpi/acpi_lpss.c
+++ b/
drivers/acpi/acpi_lpss.c
@@
-385,7
+385,9
@@
static struct platform_device *lpss_clk_dev;
static inline void lpt_register_clock_device(void)
{
static inline void lpt_register_clock_device(void)
{
- lpss_clk_dev = platform_device_register_simple("clk-lpt", -1, NULL, 0);
+ lpss_clk_dev = platform_device_register_simple("clk-lpss-atom",
+ PLATFORM_DEVID_NONE,
+ NULL, 0);
}
static int register_device_clock(struct acpi_device *adev,
}
static int register_device_clock(struct acpi_device *adev,
@@
-434,8
+436,8
@@
static int register_device_clock(struct acpi_device *adev,
if (!clk_name)
return -ENOMEM;
clk = clk_register_fractional_divider(NULL, clk_name, parent,
if (!clk_name)
return -ENOMEM;
clk = clk_register_fractional_divider(NULL, clk_name, parent,
-
0, prv_base
,
- 1, 15, 16, 15, 0, NULL);
+
CLK_FRAC_DIVIDER_POWER_OF_TWO_PS
,
+
prv_base,
1, 15, 16, 15, 0, NULL);
parent = clk_name;
clk_name = kasprintf(GFP_KERNEL, "%s-update", devname);
parent = clk_name;
clk_name = kasprintf(GFP_KERNEL, "%s-update", devname);
@@
-1337,7
+1339,7
@@
void __init acpi_lpss_init(void)
const struct x86_cpu_id *id;
int ret;
const struct x86_cpu_id *id;
int ret;
- ret = lp
t
_clk_init();
+ ret = lp
ss_atom
_clk_init();
if (ret)
return;
if (ret)
return;