[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20160623193857.14538-1-linz@li-pro.net>
Date: Thu, 23 Jun 2016 21:38:46 +0200
From: Stephan Linz <linz@...pro.net>
To: linux-leds@...r.kernel.org, linux-ide@...r.kernel.org
Cc: Stephan Linz <linz@...pro.net>, Joseph Jezak <josejx@...too.org>,
Jörg Sommer <joerg@...a.gnuu.de>,
Mark Rutland <mark.rutland@....com>,
Jacek Anaszewski <j.anaszewski@...sung.com>,
Richard Purdie <rpurdie@...ys.net>,
Rob Herring <robh+dt@...nel.org>,
Jonathan Corbet <corbet@....net>, devicetree@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-doc@...r.kernel.org
Subject: [PATCH v5] leds: documentation: 'ide-disk' to 'disk-activity'
Cc: Joseph Jezak <josejx@...too.org>
Cc: Jörg Sommer <joerg@...a.gnuu.de>
Cc: Mark Rutland <mark.rutland@....com>
Signed-off-by: Stephan Linz <linz@...pro.net>
Acked-by: Rob Herring <robh@...nel.org>
Signed-off-by: Jacek Anaszewski <j.anaszewski@...sung.com>
---
Changes in v5:
- Keep documentation for the old 'ide-disk' device tree
binding, but mark as deprecated and refer to the new
trigger 'disk-activity'.
Changes in v4:
- Keep the 'ide-disk' trigger and add a second one
for 'disk-activity'.
Changes in v3:
- Port to kernel 4.x
- Split into platform independent and dependent parts.
v2: https://patchwork.ozlabs.org/patch/117485/
v1: http://dev.gentoo.org/~josejx/ata.patch
---
Documentation/devicetree/bindings/leds/common.txt | 5 ++++-
Documentation/devicetree/bindings/leds/leds-gpio.txt | 4 ++--
Documentation/laptops/asus-laptop.txt | 2 +-
Documentation/leds/leds-class.txt | 2 +-
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/Documentation/devicetree/bindings/leds/common.txt b/Documentation/devicetree/bindings/leds/common.txt
index af10678..1c32e31 100644
--- a/Documentation/devicetree/bindings/leds/common.txt
+++ b/Documentation/devicetree/bindings/leds/common.txt
@@ -25,8 +25,11 @@ Optional properties for child nodes:
system
"default-on" - LED will turn on (but for leds-gpio see "default-state"
property in Documentation/devicetree/bindings/gpio/led.txt)
+ "disk-activity" - LED indicates disk activity, the old name "ide-disk" is
+ still valid for backward compatibility
"heartbeat" - LED "double" flashes at a load average based rate
- "ide-disk" - LED indicates disk activity
+ "ide-disk" - LED indicates IDE disk activity (deprecated), do not use for
+ new implementation, use the new "disk-activity" name instead
"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 cbbeb18..5b1b43a 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 79a1bc6..5f28587 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 44f5e6b..f1f7ec9 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.
--
2.9.0
Powered by blists - more mailing lists