diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-davinci/da830.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/da850.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/pm_domain.c | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c index 510648e0394b..678a54a64dae 100644 --- a/arch/arm/mach-davinci/da830.c +++ b/arch/arm/mach-davinci/da830.c | |||
@@ -408,7 +408,7 @@ static struct clk_lookup da830_clks[] = { | |||
408 | CLK(NULL, "pwm2", &pwm2_clk), | 408 | CLK(NULL, "pwm2", &pwm2_clk), |
409 | CLK("eqep.0", NULL, &eqep0_clk), | 409 | CLK("eqep.0", NULL, &eqep0_clk), |
410 | CLK("eqep.1", NULL, &eqep1_clk), | 410 | CLK("eqep.1", NULL, &eqep1_clk), |
411 | CLK("da8xx_lcdc.0", NULL, &lcdc_clk), | 411 | CLK("da8xx_lcdc.0", "fck", &lcdc_clk), |
412 | CLK("davinci-mcasp.0", NULL, &mcasp0_clk), | 412 | CLK("davinci-mcasp.0", NULL, &mcasp0_clk), |
413 | CLK("davinci-mcasp.1", NULL, &mcasp1_clk), | 413 | CLK("davinci-mcasp.1", NULL, &mcasp1_clk), |
414 | CLK("davinci-mcasp.2", NULL, &mcasp2_clk), | 414 | CLK("davinci-mcasp.2", NULL, &mcasp2_clk), |
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index b90c172d5541..fda70484815a 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c | |||
@@ -396,7 +396,7 @@ static struct clk_lookup da850_clks[] = { | |||
396 | CLK(NULL, "rmii", &rmii_clk), | 396 | CLK(NULL, "rmii", &rmii_clk), |
397 | CLK("davinci_emac.1", NULL, &emac_clk), | 397 | CLK("davinci_emac.1", NULL, &emac_clk), |
398 | CLK("davinci-mcasp.0", NULL, &mcasp_clk), | 398 | CLK("davinci-mcasp.0", NULL, &mcasp_clk), |
399 | CLK("da8xx_lcdc.0", NULL, &lcdc_clk), | 399 | CLK("da8xx_lcdc.0", "fck", &lcdc_clk), |
400 | CLK("davinci_mmc.0", NULL, &mmcsd0_clk), | 400 | CLK("davinci_mmc.0", NULL, &mmcsd0_clk), |
401 | CLK("davinci_mmc.1", NULL, &mmcsd1_clk), | 401 | CLK("davinci_mmc.1", NULL, &mmcsd1_clk), |
402 | CLK(NULL, "aemif", &aemif_clk), | 402 | CLK(NULL, "aemif", &aemif_clk), |
diff --git a/arch/arm/mach-davinci/pm_domain.c b/arch/arm/mach-davinci/pm_domain.c index 00946e23c1ee..c90250e3bef8 100644 --- a/arch/arm/mach-davinci/pm_domain.c +++ b/arch/arm/mach-davinci/pm_domain.c | |||
@@ -53,6 +53,7 @@ static struct dev_pm_domain davinci_pm_domain = { | |||
53 | 53 | ||
54 | static struct pm_clk_notifier_block platform_bus_notifier = { | 54 | static struct pm_clk_notifier_block platform_bus_notifier = { |
55 | .pm_domain = &davinci_pm_domain, | 55 | .pm_domain = &davinci_pm_domain, |
56 | .con_ids = { "fck", NULL, }, | ||
56 | }; | 57 | }; |
57 | 58 | ||
58 | static int __init davinci_pm_runtime_init(void) | 59 | static int __init davinci_pm_runtime_init(void) |