diff options
| author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2014-05-19 16:42:33 -0400 |
|---|---|---|
| committer | Thierry Reding <thierry.reding@gmail.com> | 2014-05-21 05:18:52 -0400 |
| commit | b16001d745fbc900cc96c8ca2cd2cd08e738c421 (patch) | |
| tree | 2899a609a9484fe4f8453ab15d285f75f3c1b51f | |
| parent | 3796ce1d4d4b330a75005c5eda105603ce9d4071 (diff) | |
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>
| -rw-r--r-- | arch/arm/mach-shmobile/board-armadillo800eva.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c index 2858f380beae..1bf61dad9a35 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | #include <linux/gpio_keys.h> | 31 | #include <linux/gpio_keys.h> |
| 32 | #include <linux/regulator/driver.h> | 32 | #include <linux/regulator/driver.h> |
| 33 | #include <linux/pinctrl/machine.h> | 33 | #include <linux/pinctrl/machine.h> |
| 34 | #include <linux/platform_data/pwm-renesas-tpu.h> | 34 | #include <linux/pwm.h> |
| 35 | #include <linux/pwm_backlight.h> | 35 | #include <linux/pwm_backlight.h> |
| 36 | #include <linux/regulator/fixed.h> | 36 | #include <linux/regulator/fixed.h> |
| 37 | #include <linux/regulator/gpio-regulator.h> | 37 | #include <linux/regulator/gpio-regulator.h> |
| @@ -399,24 +399,22 @@ static struct resource pwm_resources[] = { | |||
| 399 | }, | 399 | }, |
| 400 | }; | 400 | }; |
| 401 | 401 | ||
| 402 | static struct tpu_pwm_platform_data pwm_device_data = { | ||
| 403 | .channels[2] = { | ||
| 404 | .polarity = PWM_POLARITY_INVERSED, | ||
| 405 | } | ||
| 406 | }; | ||
| 407 | |||
| 408 | static struct platform_device pwm_device = { | 402 | static struct platform_device pwm_device = { |
| 409 | .name = "renesas-tpu-pwm", | 403 | .name = "renesas-tpu-pwm", |
| 410 | .id = -1, | 404 | .id = -1, |
| 411 | .dev = { | ||
| 412 | .platform_data = &pwm_device_data, | ||
| 413 | }, | ||
| 414 | .num_resources = ARRAY_SIZE(pwm_resources), | 405 | .num_resources = ARRAY_SIZE(pwm_resources), |
| 415 | .resource = pwm_resources, | 406 | .resource = pwm_resources, |
| 416 | }; | 407 | }; |
| 417 | 408 | ||
| 418 | static struct pwm_lookup pwm_lookup[] = { | 409 | static struct pwm_lookup pwm_lookup[] = { |
| 419 | PWM_LOOKUP("renesas-tpu-pwm", 2, "pwm-backlight.0", NULL), | 410 | { |
| 411 | .provider = "renesas-tpu-pwm", | ||
| 412 | .index = 2, | ||
| 413 | .dev_id = "pwm-backlight.0", | ||
| 414 | .con_id = NULL, | ||
| 415 | .period = 33333, | ||
| 416 | .polarity = PWM_POLARITY_INVERSED, | ||
| 417 | }, | ||
| 420 | }; | 418 | }; |
| 421 | 419 | ||
| 422 | /* LCDC and backlight */ | 420 | /* LCDC and backlight */ |
