From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Nicolas Ferre <nicolas.ferre@atmel.com>,
Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>,
Haavard Skinnemoen <hskinnemoen@gmail.com>,
Hans-Christian Egtvedt <egtvedt@samfundet.no>,
Bryan Wu <cooloney@gmail.com>, Jingoo Han <jg1.han@samsung.com>,
linux-leds@vger.kernel.org, linux-pwm@vger.kernel.org,
linux-fbdev@vger.kernel.org,
Alexandre Belloni <alexandre.belloni@free-electrons.com>
Subject: [PATCHv2 04/15] ARM: at91: sam9263ek: use generic leds_pwm driver
Date: Thu, 29 May 2014 01:20:07 +0200 [thread overview]
Message-ID: <1401319218-16772-5-git-send-email-alexandre.belloni@free-electrons.com> (raw)
In-Reply-To: <1401319218-16772-1-git-send-email-alexandre.belloni@free-electrons.com>
Switch to the generic leds_pwm driver instead of leds-atmel-pwm.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
arch/arm/mach-at91/board-sam9263ek.c | 55 ++++++++++++++++++++++++++++++------
1 file changed, 47 insertions(+), 8 deletions(-)
diff --git a/arch/arm/mach-at91/board-sam9263ek.c b/arch/arm/mach-at91/board-sam9263ek.c
index cd2726ee5add..fc446097f410 100644
--- a/arch/arm/mach-at91/board-sam9263ek.c
+++ b/arch/arm/mach-at91/board-sam9263ek.c
@@ -32,6 +32,8 @@
#include <linux/gpio_keys.h>
#include <linux/input.h>
#include <linux/leds.h>
+#include <linux/pwm.h>
+#include <linux/leds_pwm.h>
#include <video/atmel_lcdc.h>
@@ -369,21 +371,47 @@ static struct gpio_led ek_leds[] = {
.name = "ds3",
.gpio = AT91_PIN_PB7,
.default_trigger = "heartbeat",
+ },
+#if !IS_ENABLED(CONFIG_LEDS_PWM)
+ {
+ .name = "ds1",
+ .gpio = AT91_PIN_PB8,
+ .active_low = 1,
+ .default_trigger = "none",
}
+#endif
};
/*
* PWM Leds
*/
-static struct gpio_led ek_pwm_led[] = {
- /* For now only DS1 is PWM-driven (by pwm1) */
+static struct pwm_lookup pwm_lookup[] = {
+ PWM_LOOKUP("at91sam9rl-pwm", 1, "leds_pwm", "ds1",
+ 5000, PWM_POLARITY_INVERSED),
+};
+
+#if IS_ENABLED(CONFIG_LEDS_PWM)
+static struct led_pwm pwm_leds[] = {
{
- .name = "ds1",
- .gpio = 1, /* is PWM channel number */
- .active_low = 1,
- .default_trigger = "none",
- }
+ .name = "ds1",
+ .max_brightness = 255,
+ },
+};
+
+static struct led_pwm_platform_data pwm_data = {
+ .num_leds = ARRAY_SIZE(pwm_leds),
+ .leds = pwm_leds,
+};
+
+static struct platform_device leds_pwm = {
+ .name = "leds_pwm",
+ .id = -1,
+ .dev = {
+ .platform_data = &pwm_data,
+ },
};
+#endif
+
/*
* CAN
@@ -403,6 +431,12 @@ static struct at91_can_data ek_can_data = {
.transceiver_switch = sam9263ek_transceiver_switch,
};
+static struct platform_device *devices[] __initdata = {
+#if IS_ENABLED(CONFIG_LEDS_PWM)
+ &leds_pwm,
+#endif
+};
+
static void __init ek_board_init(void)
{
/* Serial */
@@ -437,9 +471,14 @@ static void __init ek_board_init(void)
at91_add_device_ac97(&ek_ac97_data);
/* LEDs */
at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds));
- at91_pwm_leds(ek_pwm_led, ARRAY_SIZE(ek_pwm_led));
+ pwm_add_table(pwm_lookup, ARRAY_SIZE(pwm_lookup));
+#if IS_ENABLED(CONFIG_LEDS_PWM)
+ at91_add_device_pwm(1 << AT91_PWM1);
+#endif
/* CAN */
at91_add_device_can(&ek_can_data);
+ /* Other platform devices */
+ platform_add_devices(devices, ARRAY_SIZE(devices));
}
MACHINE_START(AT91SAM9263EK, "Atmel AT91SAM9263-EK")
--
1.9.1
next prev parent reply other threads:[~2014-05-28 23:20 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-28 23:20 [PATCHv2 00/15] move at91 and avr32 to the PWM framework, remove obsolete drivers Alexandre Belloni
2014-05-28 23:20 ` [PATCHv2 01/15] ARM: at91: at91sam9g45: switch to generic PWM framework Alexandre Belloni
2014-05-28 23:20 ` [PATCHv2 02/15] ARM: at91: sam9m10g45ek: use generic leds_pwm driver Alexandre Belloni
2014-05-28 23:20 ` [PATCHv2 03/15] ARM: at91: at91sam9263: switch to generic PWM framework Alexandre Belloni
2014-05-28 23:20 ` Alexandre Belloni [this message]
2014-05-28 23:20 ` [PATCHv2 05/15] ARM: at91: at91sam9rl: " Alexandre Belloni
2014-05-28 23:20 ` [PATCHv2 06/15] ARM: at91: remove useless at91_pwm_leds() Alexandre Belloni
2014-05-28 23:20 ` [PATCHv2 07/15] PWM: atmel: allow building for AVR32 Alexandre Belloni
2014-05-28 23:20 ` [PATCHv2 08/15] avr32/at32ap: switch to the generic PWM framework Alexandre Belloni
2014-05-28 23:20 ` [PATCHv2 09/15] avr32: MRMT: use generic leds_pwm driver Alexandre Belloni
2014-05-28 23:20 ` [PATCHv2 10/15] avr32: merisc: " Alexandre Belloni
2014-05-28 23:20 ` [PATCHv2 11/15] avr32: favr-32: use generic pwm_bl driver Alexandre Belloni
2014-05-28 23:20 ` [PATCHv2 12/15] avr32: update defconfig to use the generic PWM framework Alexandre Belloni
2014-05-28 23:20 ` [PATCHv2 13/15] backlight: atmel-pwm-bl: remove obsolete driver Alexandre Belloni
2014-05-28 23:20 ` [PATCHv2 14/15] leds: atmel-pwm: " Alexandre Belloni
2014-05-28 23:20 ` [PATCHv2 15/15] misc: atmel_pwm: " Alexandre Belloni
2014-05-28 23:35 ` Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1401319218-16772-5-git-send-email-alexandre.belloni@free-electrons.com \
--to=alexandre.belloni@free-electrons.com \
--cc=cooloney@gmail.com \
--cc=egtvedt@samfundet.no \
--cc=gregkh@linuxfoundation.org \
--cc=hskinnemoen@gmail.com \
--cc=jg1.han@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=linux-pwm@vger.kernel.org \
--cc=nicolas.ferre@atmel.com \
--cc=plagnioj@jcrosoft.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®