[PATCH v6] leds: documentation: 'ide-disk' to 'disk-activity'

[PATCH v6] leds: documentation: 'ide-disk' to 'disk-activity'

[Stephan Linz]

Cc: Joseph Jezak <josejx@gentoo.org>
Cc: Jörg Sommer <joerg@alea.gnuu.de>
Cc: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Stephan Linz <linz@li-pro.net>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
---
Changes in v6:
  - Reorganize v5.

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    | 4 +++-
 Documentation/devicetree/bindings/leds/leds-gpio.txt | 4 ++--
 Documentation/laptops/asus-laptop.txt                | 2 +-
 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 af10678..93ef6e6 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 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

Re: [PATCH v6] leds: documentation: 'ide-disk' to 'disk-activity'

[Jacek Anaszewski]

Hi Stephan,

On 06/24/2016 07:16 PM, Stephan Linz wrote:
> Cc: Joseph Jezak <josejx-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org>
> Cc: Jörg Sommer <joerg-au2b9oQwubsjnolme5KbmQ@public.gmane.org>
> Cc: Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>
> Signed-off-by: Stephan Linz <linz-LlUBiLVY8XKsTnJN9+BGXg@public.gmane.org>
> Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> Signed-off-by: Jacek Anaszewski <j.anaszewski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
> ---
> Changes in v6:
>    - Reorganize v5.
>
> 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    | 4 +++-
>   Documentation/devicetree/bindings/leds/leds-gpio.txt | 4 ++--
>   Documentation/laptops/asus-laptop.txt                | 2 +-
>   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 af10678..93ef6e6 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 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.
>
>

Applied, thanks.

-- 
Best regards,
Jacek Anaszewski
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html