Merge tag 'vfio-v3.17-rc1' of git://github.com/awilliam/linux-vfio

[firefly-linux-kernel-4.4.55.git] / arch / avr32 / mach-at32ap / at32ap700x.c

diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
index a1f4d1e91b522e03f486b41759a1b25a2d44e36f..db85b5ec3351bb5b937c06f0a32153aa2be31592 100644 (file)
--- 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 = {
        IRQ(24),
 };
 static struct clk atmel_pwm0_mck = {
-       .name           = "pwm_clk",
+       .name           = "at91sam9rl-pwm",
        .parent         = &pbb_clk,
        .mode           = pbb_clk_mode,
        .get_rate       = pbb_clk_get_rate,
@@ -1568,7 +1568,7 @@ struct platform_device *__init at32_add_device_pwm(u32 mask)
        if (!mask)
                return NULL;
 
-       pdev = platform_device_alloc("atmel_pwm", 0);
+       pdev = platform_device_alloc("at91sam9rl-pwm", 0);
        if (!pdev)
                return NULL;
 
@@ -1576,9 +1576,6 @@ struct platform_device *__init at32_add_device_pwm(u32 mask)
                                ARRAY_SIZE(atmel_pwm0_resource)))
                goto out_free_pdev;
 
-       if (platform_device_add_data(pdev, &mask, sizeof(mask)))
-               goto out_free_pdev;
-
        pin_mask = 0;
        if (mask & (1 << 0))
                pin_mask |= (1 << 28);