aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/avr32/mach-at32ap/at32ap700x.c2
-rw-r--r--drivers/misc/atmel_pwm.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
index a2e7b96b5e8c..2f208eb4d3c9 100644
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@ -1471,7 +1471,7 @@ static struct resource atmel_pwm0_resource[] __initdata = {
1471 IRQ(24), 1471 IRQ(24),
1472}; 1472};
1473static struct clk atmel_pwm0_mck = { 1473static struct clk atmel_pwm0_mck = {
1474 .name = "mck", 1474 .name = "pwm_clk",
1475 .parent = &pbb_clk, 1475 .parent = &pbb_clk,
1476 .mode = pbb_clk_mode, 1476 .mode = pbb_clk_mode,
1477 .get_rate = pbb_clk_get_rate, 1477 .get_rate = pbb_clk_get_rate,
diff --git a/drivers/misc/atmel_pwm.c b/drivers/misc/atmel_pwm.c
index 0d5ce03cdff2..5b5a14dab3d3 100644
--- a/drivers/misc/atmel_pwm.c
+++ b/drivers/misc/atmel_pwm.c
@@ -332,7 +332,7 @@ static int __init pwm_probe(struct platform_device *pdev)
332 p->base = ioremap(r->start, r->end - r->start + 1); 332 p->base = ioremap(r->start, r->end - r->start + 1);
333 if (!p->base) 333 if (!p->base)
334 goto fail; 334 goto fail;
335 p->clk = clk_get(&pdev->dev, "mck"); 335 p->clk = clk_get(&pdev->dev, "pwm_clk");
336 if (IS_ERR(p->clk)) { 336 if (IS_ERR(p->clk)) {
337 status = PTR_ERR(p->clk); 337 status = PTR_ERR(p->clk);
338 p->clk = NULL; 338 p->clk = NULL;