aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500
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-ux500
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-ux500')
-rw-r--r--arch/arm/mach-ux500/board-mop500.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index d453522edb0d..b04684e16e24 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -28,7 +28,7 @@
28#include <linux/mfd/tps6105x.h> 28#include <linux/mfd/tps6105x.h>
29#include <linux/mfd/abx500/ab8500-gpio.h> 29#include <linux/mfd/abx500/ab8500-gpio.h>
30#include <linux/mfd/abx500/ab8500-codec.h> 30#include <linux/mfd/abx500/ab8500-codec.h>
31#include <linux/leds-lp5521.h> 31#include <linux/platform_data/leds-lp55xx.h>
32#include <linux/input.h> 32#include <linux/input.h>
33#include <linux/smsc911x.h> 33#include <linux/smsc911x.h>
34#include <linux/gpio_keys.h> 34#include <linux/gpio_keys.h>
@@ -320,7 +320,7 @@ static struct tc3589x_platform_data mop500_tc35892_data = {
320 .irq_base = MOP500_EGPIO_IRQ_BASE, 320 .irq_base = MOP500_EGPIO_IRQ_BASE,
321}; 321};
322 322
323static struct lp5521_led_config lp5521_pri_led[] = { 323static struct lp55xx_led_config lp5521_pri_led[] = {
324 [0] = { 324 [0] = {
325 .chan_nr = 0, 325 .chan_nr = 0,
326 .led_current = 0x2f, 326 .led_current = 0x2f,
@@ -338,14 +338,14 @@ static struct lp5521_led_config lp5521_pri_led[] = {
338 }, 338 },
339}; 339};
340 340
341static struct lp5521_platform_data __initdata lp5521_pri_data = { 341static struct lp55xx_platform_data __initdata lp5521_pri_data = {
342 .label = "lp5521_pri", 342 .label = "lp5521_pri",
343 .led_config = &lp5521_pri_led[0], 343 .led_config = &lp5521_pri_led[0],
344 .num_channels = 3, 344 .num_channels = 3,
345 .clock_mode = LP5521_CLOCK_EXT, 345 .clock_mode = LP55XX_CLOCK_EXT,
346}; 346};
347 347
348static struct lp5521_led_config lp5521_sec_led[] = { 348static struct lp55xx_led_config lp5521_sec_led[] = {
349 [0] = { 349 [0] = {
350 .chan_nr = 0, 350 .chan_nr = 0,
351 .led_current = 0x2f, 351 .led_current = 0x2f,
@@ -363,11 +363,11 @@ static struct lp5521_led_config lp5521_sec_led[] = {
363 }, 363 },
364}; 364};
365 365
366static struct lp5521_platform_data __initdata lp5521_sec_data = { 366static struct lp55xx_platform_data __initdata lp5521_sec_data = {
367 .label = "lp5521_sec", 367 .label = "lp5521_sec",
368 .led_config = &lp5521_sec_led[0], 368 .led_config = &lp5521_sec_led[0],
369 .num_channels = 3, 369 .num_channels = 3,
370 .clock_mode = LP5521_CLOCK_EXT, 370 .clock_mode = LP55XX_CLOCK_EXT,
371}; 371};
372 372
373static struct i2c_board_info __initdata mop500_i2c0_devices[] = { 373static struct i2c_board_info __initdata mop500_i2c0_devices[] = {