diff options
| author | Stephan Linz <linz@li-pro.net> | 2016-06-24 19:16:53 +0200 |
|---|---|---|
| committer | Jacek Anaszewski <j.anaszewski@samsung.com> | 2016-06-27 08:58:35 +0200 |
| commit | 86ab168614f7ddce0800456ab6da2cf40286a5b2 (patch) | |
| tree | 11331805ea859d6b1a8ee5a6cc347fd0cefce5be | |
| parent | eb25cb9956cc9384b7fa0d75dec908c9fac8c444 (diff) | |
| download | linux-stable-86ab168614f7ddce0800456ab6da2cf40286a5b2.tar.gz linux-stable-86ab168614f7ddce0800456ab6da2cf40286a5b2.tar.bz2 linux-stable-86ab168614f7ddce0800456ab6da2cf40286a5b2.zip | |
leds: documentation: 'ide-disk' to 'disk-activity'
Signed-off-by: Stephan Linz <linz@li-pro.net>
Cc: Joseph Jezak <josejx@gentoo.org>
Cc: Jörg Sommer <joerg@alea.gnuu.de>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
| -rw-r--r-- | Documentation/devicetree/bindings/leds/common.txt | 4 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/leds/leds-gpio.txt | 4 | ||||
| -rw-r--r-- | Documentation/laptops/asus-laptop.txt | 2 | ||||
| -rw-r--r-- | Documentation/leds/leds-class.txt | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/Documentation/devicetree/bindings/leds/common.txt b/Documentation/devicetree/bindings/leds/common.txt index af10678ea2f6..93ef6e6e43b5 100644 --- a/Documentation/devicetree/bindings/leds/common.txt +++ b/Documentation/devicetree/bindings/leds/common.txt @@ -26,7 +26,9 @@ Optional properties for child nodes: "default-on" - LED will turn on (but for leds-gpio see "default-state" property in Documentation/devicetree/bindings/gpio/led.txt) "heartbeat" - LED "double" flashes at a load average based rate - "ide-disk" - LED indicates disk activity + "disk-activity" - LED indicates disk activity + "ide-disk" - LED indicates IDE disk activity (deprecated), + in new implementations use "disk-activity" "timer" - LED flashes at a fixed, configurable rate - led-max-microamp : Maximum LED supply current in microamperes. This property diff --git a/Documentation/devicetree/bindings/leds/leds-gpio.txt b/Documentation/devicetree/bindings/leds/leds-gpio.txt index cbbeb1850910..5b1b43a64265 100644 --- a/Documentation/devicetree/bindings/leds/leds-gpio.txt +++ b/Documentation/devicetree/bindings/leds/leds-gpio.txt @@ -33,9 +33,9 @@ Examples: leds { compatible = "gpio-leds"; hdd { - label = "IDE Activity"; + label = "Disk Activity"; gpios = <&mcu_pio 0 GPIO_ACTIVE_LOW>; - linux,default-trigger = "ide-disk"; + linux,default-trigger = "disk-activity"; }; fault { diff --git a/Documentation/laptops/asus-laptop.txt b/Documentation/laptops/asus-laptop.txt index 79a1bc675a8d..5f2858712aa0 100644 --- a/Documentation/laptops/asus-laptop.txt +++ b/Documentation/laptops/asus-laptop.txt @@ -72,7 +72,7 @@ LEDs echo 1 > /sys/class/leds/asus::mail/brightness will switch the mail LED on. You can also know if they are on/off by reading their content and use - kernel triggers like ide-disk or heartbeat. + kernel triggers like disk-activity or heartbeat. Backlight --------- diff --git a/Documentation/leds/leds-class.txt b/Documentation/leds/leds-class.txt index 44f5e6bccd97..f1f7ec9f5cc5 100644 --- a/Documentation/leds/leds-class.txt +++ b/Documentation/leds/leds-class.txt @@ -11,7 +11,7 @@ brightness support so will just be turned on for non-zero brightness settings. The class also introduces the optional concept of an LED trigger. A trigger is a kernel based source of led events. Triggers can either be simple or complex. A simple trigger isn't configurable and is designed to slot into -existing subsystems with minimal additional code. Examples are the ide-disk, +existing subsystems with minimal additional code. Examples are the disk-activity, nand-disk and sharpsl-charge triggers. With led triggers disabled, the code optimises away. |