diff options
author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2014-05-28 19:20:11 -0400 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-07-09 09:13:31 -0400 |
commit | 2c43ec94480020bf5297e62a1f4e412c1d625fb1 (patch) | |
tree | af022fc2a4f875fe788aceb82eda78ae1121ed39 /arch/avr32/mach-at32ap | |
parent | bb4bbbaae2b7164b1a79cfc75839561527be1043 (diff) |
avr32/at32ap: switch to the generic PWM framework
Switch to the pwm/pwm-atmel driver instead of misc/atmel_pwm
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/avr32/mach-at32ap')
-rw-r--r-- | arch/avr32/mach-at32ap/at32ap700x.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c index a1f4d1e91b52..db85b5ec3351 100644 --- a/arch/avr32/mach-at32ap/at32ap700x.c +++ b/arch/avr32/mach-at32ap/at32ap700x.c | |||
@@ -1553,7 +1553,7 @@ static struct resource atmel_pwm0_resource[] __initdata = { | |||
1553 | IRQ(24), | 1553 | IRQ(24), |
1554 | }; | 1554 | }; |
1555 | static struct clk atmel_pwm0_mck = { | 1555 | static struct clk atmel_pwm0_mck = { |
1556 | .name = "pwm_clk", | 1556 | .name = "at91sam9rl-pwm", |
1557 | .parent = &pbb_clk, | 1557 | .parent = &pbb_clk, |
1558 | .mode = pbb_clk_mode, | 1558 | .mode = pbb_clk_mode, |
1559 | .get_rate = pbb_clk_get_rate, | 1559 | .get_rate = pbb_clk_get_rate, |
@@ -1568,7 +1568,7 @@ struct platform_device *__init at32_add_device_pwm(u32 mask) | |||
1568 | if (!mask) | 1568 | if (!mask) |
1569 | return NULL; | 1569 | return NULL; |
1570 | 1570 | ||
1571 | pdev = platform_device_alloc("atmel_pwm", 0); | 1571 | pdev = platform_device_alloc("at91sam9rl-pwm", 0); |
1572 | if (!pdev) | 1572 | if (!pdev) |
1573 | return NULL; | 1573 | return NULL; |
1574 | 1574 | ||
@@ -1576,9 +1576,6 @@ struct platform_device *__init at32_add_device_pwm(u32 mask) | |||
1576 | ARRAY_SIZE(atmel_pwm0_resource))) | 1576 | ARRAY_SIZE(atmel_pwm0_resource))) |
1577 | goto out_free_pdev; | 1577 | goto out_free_pdev; |
1578 | 1578 | ||
1579 | if (platform_device_add_data(pdev, &mask, sizeof(mask))) | ||
1580 | goto out_free_pdev; | ||
1581 | |||
1582 | pin_mask = 0; | 1579 | pin_mask = 0; |
1583 | if (mask & (1 << 0)) | 1580 | if (mask & (1 << 0)) |
1584 | pin_mask |= (1 << 28); | 1581 | pin_mask |= (1 << 28); |