atmel_pwm: Rename the "mck" clock to "pwm_clk"
Sedji Gaouaou [Wed, 25 Jun 2008 08:32:50 +0000 (10:32 +0200)]
The name "mck" causes a conflict on AT91. Call it "pwm_clk" instead.

Signed-off-by: Sedji Gaouaou <sedji.gaouaou@atmel.com>
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>

arch/avr32/mach-at32ap/at32ap700x.c
drivers/misc/atmel_pwm.c

index a2e7b96..2f208eb 100644 (file)
@@ -1471,7 +1471,7 @@ static struct resource atmel_pwm0_resource[] __initdata = {
        IRQ(24),
 };
 static struct clk atmel_pwm0_mck = {
-       .name           = "mck",
+       .name           = "pwm_clk",
        .parent         = &pbb_clk,
        .mode           = pbb_clk_mode,
        .get_rate       = pbb_clk_get_rate,
index 0d5ce03..5b5a14d 100644 (file)
@@ -332,7 +332,7 @@ static int __init pwm_probe(struct platform_device *pdev)
        p->base = ioremap(r->start, r->end - r->start + 1);
        if (!p->base)
                goto fail;
-       p->clk = clk_get(&pdev->dev, "mck");
+       p->clk = clk_get(&pdev->dev, "pwm_clk");
        if (IS_ERR(p->clk)) {
                status = PTR_ERR(p->clk);
                p->clk = NULL;