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: Sedji Gaouaou <sedji.gaouaou@atmel.com> Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
This commit is contained in:
Родитель
9c2baf785e
Коммит
8405996ff6
|
@ -1471,7 +1471,7 @@ static struct resource atmel_pwm0_resource[] __initdata = {
|
||||||
IRQ(24),
|
IRQ(24),
|
||||||
};
|
};
|
||||||
static struct clk atmel_pwm0_mck = {
|
static struct clk atmel_pwm0_mck = {
|
||||||
.name = "mck",
|
.name = "pwm_clk",
|
||||||
.parent = &pbb_clk,
|
.parent = &pbb_clk,
|
||||||
.mode = pbb_clk_mode,
|
.mode = pbb_clk_mode,
|
||||||
.get_rate = pbb_clk_get_rate,
|
.get_rate = pbb_clk_get_rate,
|
||||||
|
|
|
@ -332,7 +332,7 @@ static int __init pwm_probe(struct platform_device *pdev)
|
||||||
p->base = ioremap(r->start, r->end - r->start + 1);
|
p->base = ioremap(r->start, r->end - r->start + 1);
|
||||||
if (!p->base)
|
if (!p->base)
|
||||||
goto fail;
|
goto fail;
|
||||||
p->clk = clk_get(&pdev->dev, "mck");
|
p->clk = clk_get(&pdev->dev, "pwm_clk");
|
||||||
if (IS_ERR(p->clk)) {
|
if (IS_ERR(p->clk)) {
|
||||||
status = PTR_ERR(p->clk);
|
status = PTR_ERR(p->clk);
|
||||||
p->clk = NULL;
|
p->clk = NULL;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче