aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAlexander Shiyan <shc_work@mail.ru>2013-12-07 01:22:18 -0500
committerBryan Wu <cooloney@gmail.com>2014-01-27 20:28:49 -0500
commit01a7a063e8cf4bc09af2c02d28c12f3d72bf9649 (patch)
tree203bc7e800afe602eca8ff4edbbab02643f3c4fd /arch
parent33ca15325ff371be7f20be7534f5aa5b6a00b558 (diff)
leds: leds-mc13783: Remove duplicate field in platform data
LED platform data are overwhelmed by excessive field "max_cur" which just replicates few bits of "led_control" field. This patch removes this field and adds a definition for the current settings in the header. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Bryan Wu <cooloney@gmail.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-imx/mach-mx31moboard.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-imx/mach-mx31moboard.c b/arch/arm/mach-imx/mach-mx31moboard.c
index 6f424eced181..b3738e616f19 100644
--- a/arch/arm/mach-imx/mach-mx31moboard.c
+++ b/arch/arm/mach-imx/mach-mx31moboard.c
@@ -236,32 +236,26 @@ static struct mc13xxx_led_platform_data moboard_led[] = {
236 { 236 {
237 .id = MC13783_LED_R1, 237 .id = MC13783_LED_R1,
238 .name = "coreboard-led-4:red", 238 .name = "coreboard-led-4:red",
239 .max_current = 2,
240 }, 239 },
241 { 240 {
242 .id = MC13783_LED_G1, 241 .id = MC13783_LED_G1,
243 .name = "coreboard-led-4:green", 242 .name = "coreboard-led-4:green",
244 .max_current = 2,
245 }, 243 },
246 { 244 {
247 .id = MC13783_LED_B1, 245 .id = MC13783_LED_B1,
248 .name = "coreboard-led-4:blue", 246 .name = "coreboard-led-4:blue",
249 .max_current = 2,
250 }, 247 },
251 { 248 {
252 .id = MC13783_LED_R2, 249 .id = MC13783_LED_R2,
253 .name = "coreboard-led-5:red", 250 .name = "coreboard-led-5:red",
254 .max_current = 3,
255 }, 251 },
256 { 252 {
257 .id = MC13783_LED_G2, 253 .id = MC13783_LED_G2,
258 .name = "coreboard-led-5:green", 254 .name = "coreboard-led-5:green",
259 .max_current = 3,
260 }, 255 },
261 { 256 {
262 .id = MC13783_LED_B2, 257 .id = MC13783_LED_B2,
263 .name = "coreboard-led-5:blue", 258 .name = "coreboard-led-5:blue",
264 .max_current = 3,
265 }, 259 },
266}; 260};
267 261
@@ -271,8 +265,14 @@ static struct mc13xxx_leds_platform_data moboard_leds = {
271 .led_control[0] = MC13783_LED_C0_ENABLE | MC13783_LED_C0_ABMODE(0), 265 .led_control[0] = MC13783_LED_C0_ENABLE | MC13783_LED_C0_ABMODE(0),
272 .led_control[1] = MC13783_LED_C1_SLEWLIM, 266 .led_control[1] = MC13783_LED_C1_SLEWLIM,
273 .led_control[2] = MC13783_LED_C2_SLEWLIM, 267 .led_control[2] = MC13783_LED_C2_SLEWLIM,
274 .led_control[3] = MC13783_LED_C3_PERIOD(0), 268 .led_control[3] = MC13783_LED_C3_PERIOD(0) |
275 .led_control[4] = MC13783_LED_C3_PERIOD(0), 269 MC13783_LED_C3_CURRENT_R1(2) |
270 MC13783_LED_C3_CURRENT_G1(2) |
271 MC13783_LED_C3_CURRENT_B1(2),
272 .led_control[4] = MC13783_LED_C4_PERIOD(0) |
273 MC13783_LED_C4_CURRENT_R2(3) |
274 MC13783_LED_C4_CURRENT_G2(3) |
275 MC13783_LED_C4_CURRENT_B2(3),
276}; 276};
277 277
278static struct mc13xxx_buttons_platform_data moboard_buttons = { 278static struct mc13xxx_buttons_platform_data moboard_buttons = {