leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avr32: merisc: use generic leds_pwm driver

Browse Source 
Switch to the generic leds_pwm driver instead of leds-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>
This commit is contained in:
Alexandre Belloni 2014-05-29 01:20:13 +02:00 committed by Nicolas Ferre
parent 035c3d2a45
commit b2f10803d5
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
arch/avr32/boards/merisc/setup.c
View File

@ -22,6 +22,8 @@
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/fb.h> #include <linux/fb.h>
#include <linux/atmel-mci.h> #include <linux/atmel-mci.h>
#include <linux/pwm.h>
#include <linux/leds_pwm.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/setup.h> #include <asm/setup.h>
@ -167,24 +169,29 @@ static struct i2c_board_info __initdata i2c_info[] = {
}, },
}; };
#ifdef CONFIG_LEDS_ATMEL_PWM #if IS_ENABLED(CONFIG_LEDS_PWM)
static struct gpio_led stk_pwm_led[] = { static struct pwm_lookup pwm_lookup[] = {
PWM_LOOKUP("at91sam9rl-pwm", 0, "leds_pwm", "backlight",
5000, PWM_POLARITY_NORMAL),
};
static struct led_pwm pwm_leds[] = {
{ {
.name = "backlight", .name = "backlight",
.gpio = 0, /* PWM channel 0 (LCD backlight) */ .max_brightness = 255,
}, },
}; };
static struct gpio_led_platform_data stk_pwm_led_data = { static struct led_pwm_platform_data pwm_data = {
.num_leds = ARRAY_SIZE(stk_pwm_led), .num_leds = ARRAY_SIZE(pwm_leds),
.leds = stk_pwm_led, .leds = pwm_leds,
}; };
static struct platform_device stk_pwm_led_dev = { static struct platform_device leds_pwm = {
.name = "leds-atmel-pwm", .name = "leds_pwm",
.id = -1, .id = -1,
.dev = { .dev = {
.platform_data = &stk_pwm_led_data, .platform_data = &pwm_data,
}, },
}; };
#endif #endif
@ -278,9 +285,10 @@ static int __init merisc_init(void)
at32_add_device_mci(0, &mci0_data); at32_add_device_mci(0, &mci0_data);
#ifdef CONFIG_LEDS_ATMEL_PWM #if IS_ENABLED(CONFIG_LEDS_PWM)
pwm_add_table(pwm_lookup, ARRAY_SIZE(pwm_lookup));
at32_add_device_pwm((1 << 0) | (1 << 2)); at32_add_device_pwm((1 << 0) | (1 << 2));
platform_device_register(&stk_pwm_led_dev); platform_device_register(&leds_pwm);
#else #else
at32_add_device_pwm((1 << 2)); at32_add_device_pwm((1 << 2));
#endif #endif