aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorMilo(Woogyom) Kim <milo.kim@ti.com>2013-02-05 05:26:59 -0500
committerBryan Wu <cooloney@gmail.com>2013-02-06 18:59:30 -0500
commitdf4094d24e6328824a2dfe8e6f641bff9a484d68 (patch)
tree8063b08e4f88905f72de640ce70dd8148cf75a44 /arch/arm/mach-omap2
parent79bcc10b8cf3db99958743ecb174e7637e1dd932 (diff)
leds-lp5521/5523: use new lp55xx common header
The LP55xx common driver provides a new header, leds-lp55xx.h. This driver enables removing duplicate code for both drivers and making coherent driver structure. LP5521 and LP5523/55231 platform data were merged into one common file. Therefore, the LP5521/5523 platform code need to be fixed. This patch has been already acked. For ux500: https://lkml.org/lkml/2012/10/11/417 Acked-by: Linus Walleij <linus.walleij@linaro.org> For omap: https://lkml.org/lkml/2012/10/11/334 Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Milo(Woogyom) Kim <milo.kim@ti.com> Signed-off-by: Bryan Wu <cooloney@gmail.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/board-rx51-peripherals.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index cf07e289b4ea..1a2c4db13e32 100644
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -40,7 +40,7 @@
40#include <sound/tpa6130a2-plat.h> 40#include <sound/tpa6130a2-plat.h>
41#include <media/radio-si4713.h> 41#include <media/radio-si4713.h>
42#include <media/si4713.h> 42#include <media/si4713.h>
43#include <linux/leds-lp5523.h> 43#include <linux/platform_data/leds-lp55xx.h>
44 44
45#include <../drivers/staging/iio/light/tsl2563.h> 45#include <../drivers/staging/iio/light/tsl2563.h>
46#include <linux/lis3lv02d.h> 46#include <linux/lis3lv02d.h>
@@ -160,7 +160,7 @@ static struct tsl2563_platform_data rx51_tsl2563_platform_data = {
160#endif 160#endif
161 161
162#if defined(CONFIG_LEDS_LP5523) || defined(CONFIG_LEDS_LP5523_MODULE) 162#if defined(CONFIG_LEDS_LP5523) || defined(CONFIG_LEDS_LP5523_MODULE)
163static struct lp5523_led_config rx51_lp5523_led_config[] = { 163static struct lp55xx_led_config rx51_lp5523_led_config[] = {
164 { 164 {
165 .chan_nr = 0, 165 .chan_nr = 0,
166 .led_current = 50, 166 .led_current = 50,
@@ -207,10 +207,10 @@ static void rx51_lp5523_enable(bool state)
207 gpio_set_value(RX51_LP5523_CHIP_EN_GPIO, !!state); 207 gpio_set_value(RX51_LP5523_CHIP_EN_GPIO, !!state);
208} 208}
209 209
210static struct lp5523_platform_data rx51_lp5523_platform_data = { 210static struct lp55xx_platform_data rx51_lp5523_platform_data = {
211 .led_config = rx51_lp5523_led_config, 211 .led_config = rx51_lp5523_led_config,
212 .num_channels = ARRAY_SIZE(rx51_lp5523_led_config), 212 .num_channels = ARRAY_SIZE(rx51_lp5523_led_config),
213 .clock_mode = LP5523_CLOCK_AUTO, 213 .clock_mode = LP55XX_CLOCK_AUTO,
214 .setup_resources = rx51_lp5523_setup, 214 .setup_resources = rx51_lp5523_setup,
215 .release_resources = rx51_lp5523_release, 215 .release_resources = rx51_lp5523_release,
216 .enable = rx51_lp5523_enable, 216 .enable = rx51_lp5523_enable,