Commit e5808227 authored by Stephan Linz's avatar Stephan Linz Committed by Jacek Anaszewski

arm: use the new LED disk activity trigger

- dts: rename 'ide-disk' to 'disk-activity'
- platform: rename 'ide-disk' to 'disk-activity'
- defconfig: rename 'LEDS_TRIGGER_IDE_DISK' to 'LEDS_TRIGGER_DISK'
Signed-off-by: default avatarStephan Linz <linz@li-pro.net>
Acked-by: default avatarSekhar Nori <nsekhar@ti.com>
Acked-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarJacek Anaszewski <j.anaszewski@samsung.com>
parent 83e2c70e
...@@ -86,7 +86,7 @@ led@2 { ...@@ -86,7 +86,7 @@ led@2 {
led@3 { led@3 {
label = "beagle-x15:usr3"; label = "beagle-x15:usr3";
gpios = <&gpio7 15 GPIO_ACTIVE_HIGH>; gpios = <&gpio7 15 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "ide-disk"; linux,default-trigger = "disk-activity";
default-state = "off"; default-state = "off";
}; };
}; };
......
...@@ -26,7 +26,7 @@ gpio-leds { ...@@ -26,7 +26,7 @@ gpio-leds {
blue-sata { blue-sata {
label = "ns2:blue:sata"; label = "ns2:blue:sata";
gpios = <&gpio0 30 GPIO_ACTIVE_LOW>; gpios = <&gpio0 30 GPIO_ACTIVE_LOW>;
linux,default-trigger = "ide-disk"; linux,default-trigger = "disk-activity";
}; };
}; };
}; };
......
...@@ -129,7 +129,7 @@ &pmx_led_sys_blue &pmx_led_wifi_green ...@@ -129,7 +129,7 @@ &pmx_led_sys_blue &pmx_led_wifi_green
disk { disk {
label = "topkick:yellow:disk"; label = "topkick:yellow:disk";
gpios = <&gpio0 21 GPIO_ACTIVE_LOW>; gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
linux,default-trigger = "ide-disk"; linux,default-trigger = "disk-activity";
}; };
system2 { system2 {
label = "topkick:red:system"; label = "topkick:red:system";
......
...@@ -76,7 +76,7 @@ CONFIG_LEDS_CLASS=y ...@@ -76,7 +76,7 @@ CONFIG_LEDS_CLASS=y
CONFIG_LEDS_LOCOMO=y CONFIG_LEDS_LOCOMO=y
CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LEDS_TRIGGER_TIMER=y
CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_DISK=y
# CONFIG_DNOTIFY is not set # CONFIG_DNOTIFY is not set
CONFIG_VFAT_FS=y CONFIG_VFAT_FS=y
CONFIG_TMPFS=y CONFIG_TMPFS=y
......
...@@ -180,7 +180,7 @@ CONFIG_LEDS_FSG=y ...@@ -180,7 +180,7 @@ CONFIG_LEDS_FSG=y
CONFIG_LEDS_GPIO=y CONFIG_LEDS_GPIO=y
CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LEDS_TRIGGER_TIMER=y
CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_DISK=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y
CONFIG_RTC_CLASS=y CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_ISL1208=y CONFIG_RTC_DRV_ISL1208=y
......
...@@ -288,7 +288,7 @@ static struct gpio_led evm_leds[] = { ...@@ -288,7 +288,7 @@ static struct gpio_led evm_leds[] = {
{ .name = "DS2", .active_low = 1, { .name = "DS2", .active_low = 1,
.default_trigger = "mmc0", }, .default_trigger = "mmc0", },
{ .name = "DS1", .active_low = 1, { .name = "DS1", .active_low = 1,
.default_trigger = "ide-disk", }, .default_trigger = "disk-activity", },
}; };
static const struct gpio_led_platform_data evm_led_data = { static const struct gpio_led_platform_data evm_led_data = {
......
...@@ -172,7 +172,7 @@ static struct gpio_led tps_leds[] = { ...@@ -172,7 +172,7 @@ static struct gpio_led tps_leds[] = {
* Also, D9 requires non-battery power. * Also, D9 requires non-battery power.
*/ */
{ .gpio = OSK_TPS_GPIO_LED_D9, .name = "d9", { .gpio = OSK_TPS_GPIO_LED_D9, .name = "d9",
.default_trigger = "ide-disk", }, .default_trigger = "disk-activity", },
{ .gpio = OSK_TPS_GPIO_LED_D2, .name = "d2", }, { .gpio = OSK_TPS_GPIO_LED_D2, .name = "d2", },
{ .gpio = OSK_TPS_GPIO_LED_D3, .name = "d3", .active_low = 1, { .gpio = OSK_TPS_GPIO_LED_D3, .name = "d3", .active_low = 1,
.default_trigger = "heartbeat", }, .default_trigger = "heartbeat", },
......
...@@ -464,7 +464,7 @@ static struct gpio_led spitz_gpio_leds[] = { ...@@ -464,7 +464,7 @@ static struct gpio_led spitz_gpio_leds[] = {
}, },
{ {
.name = "spitz:green:hddactivity", .name = "spitz:green:hddactivity",
.default_trigger = "ide-disk", .default_trigger = "disk-activity",
.gpio = SPITZ_GPIO_LED_GREEN, .gpio = SPITZ_GPIO_LED_GREEN,
}, },
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment