Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8405996f authored by Sedji Gaouaou's avatar Sedji Gaouaou Committed by Haavard Skinnemoen
Browse files

atmel_pwm: Rename the "mck" clock to "pwm_clk" 



The name "mck" causes a conflict on AT91. Call it "pwm_clk" instead.

Signed-off-by: default avatarSedji Gaouaou <sedji.gaouaou@atmel.com>
Signed-off-by: default avatarHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
parent 9c2baf78

arch/avr32/mach-at32ap/at32ap700x.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

drivers/misc/atmel_pwm.c

+1 −1
Original line number Diff line number Diff line
@@ -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;