| Message ID | 1400532162-29483-5-git-send-email-alexandre.belloni@free-electrons.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
* Alexandre Belloni <alexandre.belloni@free-electrons.com> [140519 13:44]: > This will allow to get rid of the .pwm_period_ns member of struct led_pwm as the > period will be set by the PWM core. This should not conflict with anything I have: Acked-by: Tony Lindgren <tony@atomide.com> > Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> > --- > arch/arm/mach-omap2/board-omap3beagle.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c > index d6ed819ff15c..f27e1ec90b5e 100644 > --- a/arch/arm/mach-omap2/board-omap3beagle.c > +++ b/arch/arm/mach-omap2/board-omap3beagle.c > @@ -61,7 +61,14 @@ > > static struct pwm_lookup pwm_lookup[] = { > /* LEDB -> PMU_STAT */ > - PWM_LOOKUP("twl-pwmled", 1, "leds_pwm", "beagleboard::pmu_stat"), > + { > + .provider = "twl-pwmled", > + .index = 1, > + .dev_id = "leds_pwm", > + .con_id = "beagleboard::pmu_stat", > + .period = 7812500, > + .polarity = PWM_POLARITY_NORMAL, > + }, > }; > > static struct led_pwm pwm_leds[] = { > -- > 1.9.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index d6ed819ff15c..f27e1ec90b5e 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -61,7 +61,14 @@ static struct pwm_lookup pwm_lookup[] = { /* LEDB -> PMU_STAT */ - PWM_LOOKUP("twl-pwmled", 1, "leds_pwm", "beagleboard::pmu_stat"), + { + .provider = "twl-pwmled", + .index = 1, + .dev_id = "leds_pwm", + .con_id = "beagleboard::pmu_stat", + .period = 7812500, + .polarity = PWM_POLARITY_NORMAL, + }, }; static struct led_pwm pwm_leds[] = {
This will allow to get rid of the .pwm_period_ns member of struct led_pwm as the period will be set by the PWM core. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> --- arch/arm/mach-omap2/board-omap3beagle.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)