diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-08-13 10:45:48 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-08-13 10:45:48 -0400 |
commit | 19e4ab54e7f5fe46a3c931afa7e786f11d57b558 (patch) | |
tree | aeada0b9d0800b94cb795020a856c625ddc4f41c /arch/arm/mach-omap1/board-osk.c | |
parent | 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee (diff) | |
parent | fa8bbb13ab49e77c00fa09e5504ec25b7176fb4b (diff) |
Merge branch 'for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds into next/drivers
From Bryan Wu <bryan.wu@canonical.com>:
Based on Linus Walleij's ARM LED consolidation work, this patchset introduce a
new generic led trigger for CPU not only for ARM but also for others.
For enabling CPU idle event, CPU arch code should call ledtrig_cpu() stub to
trigger idle start or idle end event.
These patches convert old style LED driver in arch/arm to gpio_led or new led
driver interface. Against 3.5 release and build successfully for all the machines.
Test ledtrig-cpu driver on OMAP4 Panda board.
v9 --> v10
* fix compiling issue on versatile_defconfig reported by Russell King
* rebase to 3.5 kernel and move patches to new git tree
v8 --> v9:
* use mutex to replace rw_sema pointed out by Tim Gardner
* add a new struct led_trigger_cpu
* add lock_is_inited to record mutex lock initialization
v6 --> v7:
* add a patch to unify the led-trigger name
* fix some typo pointed
* use BUG_ON to detect CPU numbers during building stage
v5 --> v6:
* replace __get_cpu_var() to per_cpu()
* remove smp_processor_id() which is wrong with for_each_possible_cpu()
* test on real OMAP4 Panda board
* add comments about CPU hotplug in the CPU LED trigger driver
v4 --> v5:
* rebase all the patches on top of latest linux-next
* replace on_each_cpu() with for_each_possible_cpu()
* add some description of ledtrig_cpu() API
* remove old leds code from driver nwflash.c, which should use a new led trigger then
* this trigger driver can be built as module now
v3 --> v4:
* fix a typo pointed by Jochen Friedrich
* fix some building errors
* add Reviewed-by and Tested-by into patch log
v2 --> v3:
* almost rewrote the whole ledtrig-cpu driver, which is more simple
* every CPU will have a per-CPU trigger
* cpu trigger can be assigned to any leds
* fix a lockdep issue in led-trigger common code
* other fix according to review
v1 --> v2:
* remove select operations in Kconfig of every machines
* add back supporting of led in core module of mach-integrator
* solidate name scheme in ledtrig-cpu.c
* add comments of CPU_LED_* cpu led events
* fold patches of RealView and Versatile together
* add machine_is_ check during assabet led driver init
* add some Acked-by in patch logs
* remove code for simpad machine in machine-sa11000, since Jochen Friedrich
introduced gpiolib and gpio-led driver for simpad
* on Assabet and Netwinder machine, LED operations is reversed like:
setting bit means turn off leds
clearing bit means turn on leds
* add a new function to read CM_CTRL register for led driver
* 'for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
ARM: use new LEDS CPU trigger stub to replace old one
ARM: mach-sa1100: retire custom LED code
ARM: mach-omap1: retire custom LED code
ARM: mach-pnx4008: remove including old leds event API header file
ARM: plat-samsung: remove including old leds event API header file
ARM: mach-pxa: retire custom LED code
char: nwflash: remove old led event code
ARM: mach-footbridge: retire custom LED code
ARM: mach-ebsa110: retire custom LED code
ARM: mach-clps711x: retire custom LED code of P720T machine
ARM: mach-integrator: retire custom LED code
ARM: mach-integrator: move CM_CTRL to header file for accessing by other functions
ARM: mach-orion5x: convert custom LED code to gpio_led and LED CPU trigger
ARM: mach-shark: retire custom LED code
ARM: mach-ks8695: remove leds driver, since nobody use it
ARM: mach-realview and mach-versatile: retire custom LED code
ARM: at91: convert old leds drivers to gpio_led and led_trigger drivers
led-triggers: create a trigger for CPU activity
Conflicts:
arch/arm/mach-clps711x/p720t.c
arch/arm/mach-sa1100/leds-cerf.c
arch/arm/mach-sa1100/leds-lart.c
Let's hope this is the last time we pull this and it doesn't cause
more trouble. I have verified that version 10 causes no build
warnings or errors any more, and the patches still look good.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap1/board-osk.c')
-rw-r--r-- | arch/arm/mach-omap1/board-osk.c | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c index 8784705edb60..7ee1c1eac356 100644 --- a/arch/arm/mach-omap1/board-osk.c +++ b/arch/arm/mach-omap1/board-osk.c | |||
@@ -380,10 +380,37 @@ static struct platform_device osk5912_lcd_device = { | |||
380 | .id = -1, | 380 | .id = -1, |
381 | }; | 381 | }; |
382 | 382 | ||
383 | static struct gpio_led mistral_gpio_led_pins[] = { | ||
384 | { | ||
385 | .name = "mistral:red", | ||
386 | .default_trigger = "heartbeat", | ||
387 | .gpio = 3, | ||
388 | }, | ||
389 | { | ||
390 | .name = "mistral:green", | ||
391 | .default_trigger = "cpu0", | ||
392 | .gpio = OMAP_MPUIO(4), | ||
393 | }, | ||
394 | }; | ||
395 | |||
396 | static struct gpio_led_platform_data mistral_gpio_led_data = { | ||
397 | .leds = mistral_gpio_led_pins, | ||
398 | .num_leds = ARRAY_SIZE(mistral_gpio_led_pins), | ||
399 | }; | ||
400 | |||
401 | static struct platform_device mistral_gpio_leds = { | ||
402 | .name = "leds-gpio", | ||
403 | .id = -1, | ||
404 | .dev = { | ||
405 | .platform_data = &mistral_gpio_led_data, | ||
406 | }, | ||
407 | }; | ||
408 | |||
383 | static struct platform_device *mistral_devices[] __initdata = { | 409 | static struct platform_device *mistral_devices[] __initdata = { |
384 | &osk5912_kp_device, | 410 | &osk5912_kp_device, |
385 | &mistral_bl_device, | 411 | &mistral_bl_device, |
386 | &osk5912_lcd_device, | 412 | &osk5912_lcd_device, |
413 | &mistral_gpio_leds, | ||
387 | }; | 414 | }; |
388 | 415 | ||
389 | static int mistral_get_pendown_state(void) | 416 | static int mistral_get_pendown_state(void) |
@@ -508,6 +535,12 @@ static void __init osk_mistral_init(void) | |||
508 | if (gpio_request(2, "lcd_pwr") == 0) | 535 | if (gpio_request(2, "lcd_pwr") == 0) |
509 | gpio_direction_output(2, 1); | 536 | gpio_direction_output(2, 1); |
510 | 537 | ||
538 | /* | ||
539 | * GPIO based LEDs | ||
540 | */ | ||
541 | omap_cfg_reg(P18_1610_GPIO3); | ||
542 | omap_cfg_reg(MPUIO4); | ||
543 | |||
511 | i2c_register_board_info(1, mistral_i2c_board_info, | 544 | i2c_register_board_info(1, mistral_i2c_board_info, |
512 | ARRAY_SIZE(mistral_i2c_board_info)); | 545 | ARRAY_SIZE(mistral_i2c_board_info)); |
513 | 546 | ||