diff options
| author | Stephan Linz <linz@li-pro.net> | 2016-06-10 08:00:02 +0200 |
|---|---|---|
| committer | Jacek Anaszewski <j.anaszewski@samsung.com> | 2016-06-27 08:58:42 +0200 |
| commit | fed758f6b78a84be4c8e2d944e183bf47daf4cbf (patch) | |
| tree | ecf02b2511800306a0ed09d424197b62716f1e80 /arch/unicore32 | |
| parent | f45725370833d47cb5bf2ca025de63d49de8338c (diff) | |
| download | linux-stable-fed758f6b78a84be4c8e2d944e183bf47daf4cbf.tar.gz linux-stable-fed758f6b78a84be4c8e2d944e183bf47daf4cbf.tar.bz2 linux-stable-fed758f6b78a84be4c8e2d944e183bf47daf4cbf.zip | |
unicore32: use the new LED disk activity trigger
- platform: rename 'ide-disk' to 'disk-activity'
- defconfig: rename 'LEDS_TRIGGER_IDE_DISK' to 'LEDS_TRIGGER_DISK'
Signed-off-by: Stephan Linz <linz@li-pro.net>
Acked-by: GUAN Xuetao <gxt@mprc.pku.edu.cn>
Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
Diffstat (limited to 'arch/unicore32')
| -rw-r--r-- | arch/unicore32/configs/unicore32_defconfig | 2 | ||||
| -rw-r--r-- | arch/unicore32/kernel/gpio.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/unicore32/configs/unicore32_defconfig b/arch/unicore32/configs/unicore32_defconfig index 45f47f88d86a..aebd01fc28e5 100644 --- a/arch/unicore32/configs/unicore32_defconfig +++ b/arch/unicore32/configs/unicore32_defconfig @@ -161,7 +161,7 @@ CONFIG_LEDS_GPIO=y # LED Triggers CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_IDE_DISK=y +CONFIG_LEDS_TRIGGER_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y # Real Time Clock diff --git a/arch/unicore32/kernel/gpio.c b/arch/unicore32/kernel/gpio.c index 49347a0e9288..bf164bb4dba2 100644 --- a/arch/unicore32/kernel/gpio.c +++ b/arch/unicore32/kernel/gpio.c @@ -27,7 +27,7 @@ static const struct gpio_led puv3_gpio_leds[] = { { .name = "cpuhealth", .gpio = GPO_CPU_HEALTH, .active_low = 0, .default_trigger = "heartbeat", }, { .name = "hdd_led", .gpio = GPO_HDD_LED, .active_low = 1, - .default_trigger = "ide-disk", }, + .default_trigger = "disk-activity", }, }; static const struct gpio_led_platform_data puv3_gpio_led_data = { |