| From 9e5e722f16fae2058628f2652cdea2947250c0ce Mon Sep 17 00:00:00 2001 |
| From: Alexandre Belloni <alexandre.belloni@free-electrons.com> |
| Date: Mon, 19 May 2014 22:42:33 +0200 |
| Subject: ARM: shmobile: armadillo: initialize all struct pwm_lookup members |
| |
| Initializing all the struct pwm_lookup members allows to get rid of the |
| struct tpu_pwm_platform_data as the polarity initialization will be |
| taken care of by the PWM core. |
| |
| Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> |
| Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| Acked-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Thierry Reding <thierry.reding@gmail.com> |
| (cherry picked from commit b16001d745fbc900cc96c8ca2cd2cd08e738c421) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-armadillo800eva.c | 20 +++++++++----------- |
| 1 file changed, 9 insertions(+), 11 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c |
| index 486063db2a2f..8410ce7a2ffb 100644 |
| --- a/arch/arm/mach-shmobile/board-armadillo800eva.c |
| +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c |
| @@ -31,7 +31,7 @@ |
| #include <linux/gpio_keys.h> |
| #include <linux/regulator/driver.h> |
| #include <linux/pinctrl/machine.h> |
| -#include <linux/platform_data/pwm-renesas-tpu.h> |
| +#include <linux/pwm.h> |
| #include <linux/pwm_backlight.h> |
| #include <linux/regulator/fixed.h> |
| #include <linux/regulator/gpio-regulator.h> |
| @@ -399,24 +399,22 @@ static struct resource pwm_resources[] = { |
| }, |
| }; |
| |
| -static struct tpu_pwm_platform_data pwm_device_data = { |
| - .channels[2] = { |
| - .polarity = PWM_POLARITY_INVERSED, |
| - } |
| -}; |
| - |
| static struct platform_device pwm_device = { |
| .name = "renesas-tpu-pwm", |
| .id = -1, |
| - .dev = { |
| - .platform_data = &pwm_device_data, |
| - }, |
| .num_resources = ARRAY_SIZE(pwm_resources), |
| .resource = pwm_resources, |
| }; |
| |
| static struct pwm_lookup pwm_lookup[] = { |
| - PWM_LOOKUP("renesas-tpu-pwm", 2, "pwm-backlight.0", NULL), |
| + { |
| + .provider = "renesas-tpu-pwm", |
| + .index = 2, |
| + .dev_id = "pwm-backlight.0", |
| + .con_id = NULL, |
| + .period = 33333, |
| + .polarity = PWM_POLARITY_INVERSED, |
| + }, |
| }; |
| |
| /* LCDC and backlight */ |
| -- |
| 2.1.2 |
| |