linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v3 1/7] leds: convert IDE trigger to common disk trigger
@ 2016-06-08 22:29 Stephan Linz
  2016-06-08 22:29 ` [PATCH v3 2/7] leds: documentation: 'ide-disk' to 'disk-activity' Stephan Linz
                   ` (7 more replies)
  0 siblings, 8 replies; 21+ messages in thread
From: Stephan Linz @ 2016-06-08 22:29 UTC (permalink / raw)
  To: linux-leds, linux-ide
  Cc: Stephan Linz, Joseph Jezak, Nico Macrionitis, Jörg Sommer,
	Richard Purdie, Jacek Anaszewski, Tejun Heo, David S. Miller,
	linux-kernel

This patch converts the IDE specific LED trigger to a generic disk
activity LED trigger. The libata core is now a trigger source just
like before the IDE disk driver. It's merely a replacement of the
string ide by disk.

The patch is taken from http://dev.gentoo.org/~josejx/ata.patch and is
widely used by any ibook/powerbook owners with great satisfaction.
Likewise, it is very often used successfully on different ARM platforms.

The original patch was split into different parts to clarify platform
independent and dependent changes.

Cc: Joseph Jezak <josejx@gentoo.org>
Cc: Nico Macrionitis <acrux@cruxppc.org>
Cc: Jörg Sommer <joerg@alea.gnuu.de>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: Jacek Anaszewski <j.anaszewski@samsung.com>
Signed-off-by: Stephan Linz <linz@li-pro.net>
---
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
---
 drivers/ata/libata-core.c                            |  4 ++++
 drivers/ide/ide-disk.c                               |  2 +-
 drivers/leds/leds-hp6xx.c                            |  2 +-
 drivers/leds/trigger/Kconfig                         |  8 ++++----
 drivers/leds/trigger/Makefile                        |  2 +-
 .../trigger/{ledtrig-ide-disk.c => ledtrig-disk.c}   | 20 ++++++++++----------
 include/linux/leds.h                                 |  6 +++---
 7 files changed, 24 insertions(+), 20 deletions(-)
 rename drivers/leds/trigger/{ledtrig-ide-disk.c => ledtrig-disk.c} (50%)

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 6be7770..2eca572 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -69,6 +69,7 @@
 #include <asm/unaligned.h>
 #include <linux/cdrom.h>
 #include <linux/ratelimit.h>
+#include <linux/leds.h>
 #include <linux/pm_runtime.h>
 #include <linux/platform_device.h>
 
@@ -5072,6 +5073,9 @@ void ata_qc_complete(struct ata_queued_cmd *qc)
 {
 	struct ata_port *ap = qc->ap;
 
+	/* Trigger the LED (if available) */
+	ledtrig_disk_activity();
+
 	/* XXX: New EH and old EH use different mechanisms to
 	 * synchronize EH with regular execution path.
 	 *
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 05dbcce..5ceb176 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -186,7 +186,7 @@ static ide_startstop_t ide_do_rw_disk(ide_drive_t *drive, struct request *rq,
 	BUG_ON(drive->dev_flags & IDE_DFLAG_BLOCKED);
 	BUG_ON(rq->cmd_type != REQ_TYPE_FS);
 
-	ledtrig_ide_activity();
+	ledtrig_disk_activity();
 
 	pr_debug("%s: %sing: block=%llu, sectors=%u\n",
 		 drive->name, rq_data_dir(rq) == READ ? "read" : "writ",
diff --git a/drivers/leds/leds-hp6xx.c b/drivers/leds/leds-hp6xx.c
index a6b8db0..137969f 100644
--- a/drivers/leds/leds-hp6xx.c
+++ b/drivers/leds/leds-hp6xx.c
@@ -50,7 +50,7 @@ static struct led_classdev hp6xx_red_led = {
 
 static struct led_classdev hp6xx_green_led = {
 	.name			= "hp6xx:green",
-	.default_trigger	= "ide-disk",
+	.default_trigger	= "disk-activity",
 	.brightness_set		= hp6xxled_green_set,
 	.flags			= LED_CORE_SUSPENDRESUME,
 };
diff --git a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig
index 9893d91..3f9ddb9 100644
--- a/drivers/leds/trigger/Kconfig
+++ b/drivers/leds/trigger/Kconfig
@@ -33,12 +33,12 @@ config LEDS_TRIGGER_ONESHOT
 
 	  If unsure, say Y.
 
-config LEDS_TRIGGER_IDE_DISK
-	bool "LED IDE Disk Trigger"
-	depends on IDE_GD_ATA
+config LEDS_TRIGGER_DISK
+	bool "LED Disk Trigger"
+	depends on IDE_GD_ATA || ATA
 	depends on LEDS_TRIGGERS
 	help
-	  This allows LEDs to be controlled by IDE disk activity.
+	  This allows LEDs to be controlled by disk activity.
 	  If unsure, say Y.
 
 config LEDS_TRIGGER_MTD
diff --git a/drivers/leds/trigger/Makefile b/drivers/leds/trigger/Makefile
index 8cc64a4..a72c43c 100644
--- a/drivers/leds/trigger/Makefile
+++ b/drivers/leds/trigger/Makefile
@@ -1,6 +1,6 @@
 obj-$(CONFIG_LEDS_TRIGGER_TIMER)	+= ledtrig-timer.o
 obj-$(CONFIG_LEDS_TRIGGER_ONESHOT)	+= ledtrig-oneshot.o
-obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK)	+= ledtrig-ide-disk.o
+obj-$(CONFIG_LEDS_TRIGGER_DISK)		+= ledtrig-disk.o
 obj-$(CONFIG_LEDS_TRIGGER_MTD)		+= ledtrig-mtd.o
 obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)	+= ledtrig-heartbeat.o
 obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+= ledtrig-backlight.o
diff --git a/drivers/leds/trigger/ledtrig-ide-disk.c b/drivers/leds/trigger/ledtrig-disk.c
similarity index 50%
rename from drivers/leds/trigger/ledtrig-ide-disk.c
rename to drivers/leds/trigger/ledtrig-disk.c
index 15123d3..7a1fe44 100644
--- a/drivers/leds/trigger/ledtrig-ide-disk.c
+++ b/drivers/leds/trigger/ledtrig-disk.c
@@ -1,5 +1,5 @@
 /*
- * LED IDE-Disk Activity Trigger
+ * LED Disk Activity Trigger
  *
  * Copyright 2006 Openedhand Ltd.
  *
@@ -17,20 +17,20 @@
 
 #define BLINK_DELAY 30
 
-DEFINE_LED_TRIGGER(ledtrig_ide);
+DEFINE_LED_TRIGGER(ledtrig_disk);
 
-void ledtrig_ide_activity(void)
+void ledtrig_disk_activity(void)
 {
-	unsigned long ide_blink_delay = BLINK_DELAY;
+	unsigned long disk_blink_delay = BLINK_DELAY;
 
-	led_trigger_blink_oneshot(ledtrig_ide,
-				  &ide_blink_delay, &ide_blink_delay, 0);
+	led_trigger_blink_oneshot(ledtrig_disk,
+				  &disk_blink_delay, &disk_blink_delay, 0);
 }
-EXPORT_SYMBOL(ledtrig_ide_activity);
+EXPORT_SYMBOL(ledtrig_disk_activity);
 
-static int __init ledtrig_ide_init(void)
+static int __init ledtrig_disk_init(void)
 {
-	led_trigger_register_simple("ide-disk", &ledtrig_ide);
+	led_trigger_register_simple("disk-activity", &ledtrig_disk);
 	return 0;
 }
-device_initcall(ledtrig_ide_init);
+device_initcall(ledtrig_disk_init);
diff --git a/include/linux/leds.h b/include/linux/leds.h
index d2b1306..28a3ef5 100644
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -324,10 +324,10 @@ static inline void *led_get_trigger_data(struct led_classdev *led_cdev)
 #endif /* CONFIG_LEDS_TRIGGERS */
 
 /* Trigger specific functions */
-#ifdef CONFIG_LEDS_TRIGGER_IDE_DISK
-extern void ledtrig_ide_activity(void);
+#ifdef CONFIG_LEDS_TRIGGER_DISK
+extern void ledtrig_disk_activity(void);
 #else
-static inline void ledtrig_ide_activity(void) {}
+static inline void ledtrig_disk_activity(void) {}
 #endif
 
 #ifdef CONFIG_LEDS_TRIGGER_MTD
-- 
2.8.4

^ permalink raw reply	[flat|nested] 21+ messages in thread

* [PATCH v3 2/7] leds: documentation: 'ide-disk' to 'disk-activity'
  2016-06-08 22:29 [PATCH v3 1/7] leds: convert IDE trigger to common disk trigger Stephan Linz
@ 2016-06-08 22:29 ` Stephan Linz
  2016-06-21 15:05   ` Mark Rutland
  2016-06-08 22:29 ` [PATCH v3 3/7] powerpc: use the new LED disk activity trigger Stephan Linz
                   ` (6 subsequent siblings)
  7 siblings, 1 reply; 21+ messages in thread
From: Stephan Linz @ 2016-06-08 22:29 UTC (permalink / raw)
  To: linux-leds, linux-ide
  Cc: Stephan Linz, Joseph Jezak, Nico Macrionitis, Jörg Sommer,
	Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
	Jonathan Corbet, devicetree, linux-kernel, linux-doc

Cc: Joseph Jezak <josejx@gentoo.org>
Cc: Nico Macrionitis <acrux@cruxppc.org>
Cc: Jörg Sommer <joerg@alea.gnuu.de>
Signed-off-by: Stephan Linz <linz@li-pro.net>
---
 Documentation/devicetree/bindings/leds/common.txt    | 2 +-
 Documentation/devicetree/bindings/leds/leds-gpio.txt | 2 +-
 Documentation/laptops/asus-laptop.txt                | 2 +-
 Documentation/leds/leds-class.txt                    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/devicetree/bindings/leds/common.txt b/Documentation/devicetree/bindings/leds/common.txt
index af10678..1e97169 100644
--- a/Documentation/devicetree/bindings/leds/common.txt
+++ b/Documentation/devicetree/bindings/leds/common.txt
@@ -26,7 +26,7 @@ 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
      "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..e166053 100644
--- a/Documentation/devicetree/bindings/leds/leds-gpio.txt
+++ b/Documentation/devicetree/bindings/leds/leds-gpio.txt
@@ -35,7 +35,7 @@ leds {
 	hdd {
 		label = "IDE 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 d406d98..44c1bcf 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.8.4

^ permalink raw reply	[flat|nested] 21+ messages in thread

* [PATCH v3 3/7] powerpc: use the new LED disk activity trigger
  2016-06-08 22:29 [PATCH v3 1/7] leds: convert IDE trigger to common disk trigger Stephan Linz
  2016-06-08 22:29 ` [PATCH v3 2/7] leds: documentation: 'ide-disk' to 'disk-activity' Stephan Linz
@ 2016-06-08 22:29 ` Stephan Linz
  2016-06-08 22:29 ` [PATCH v3 4/7] arm: " Stephan Linz
                   ` (5 subsequent siblings)
  7 siblings, 0 replies; 21+ messages in thread
From: Stephan Linz @ 2016-06-08 22:29 UTC (permalink / raw)
  To: linux-leds, linux-ide
  Cc: Stephan Linz, Joseph Jezak, Nico Macrionitis, Jörg Sommer,
	Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
	Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman,
	devicetree, linuxppc-dev, linux-kernel

- dts: rename 'ide-disk' to 'disk-activity'
- defconfig: rename 'ADB_PMU_LED_IDE' to 'ADB_PMU_LED_DISK'

Cc: Joseph Jezak <josejx@gentoo.org>
Cc: Nico Macrionitis <acrux@cruxppc.org>
Cc: Jörg Sommer <joerg@alea.gnuu.de>
Signed-off-by: Stephan Linz <linz@li-pro.net>
---
 arch/powerpc/boot/dts/mpc8315erdb.dts |  2 +-
 arch/powerpc/boot/dts/mpc8377_rdb.dts |  2 +-
 arch/powerpc/boot/dts/mpc8378_rdb.dts |  2 +-
 arch/powerpc/boot/dts/mpc8379_rdb.dts |  2 +-
 arch/powerpc/configs/pmac32_defconfig |  2 +-
 arch/powerpc/configs/ppc6xx_defconfig |  2 +-
 drivers/macintosh/Kconfig             | 13 ++++++-------
 drivers/macintosh/via-pmu-led.c       |  4 ++--
 8 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/arch/powerpc/boot/dts/mpc8315erdb.dts b/arch/powerpc/boot/dts/mpc8315erdb.dts
index 4354684..ca5139e 100644
--- a/arch/powerpc/boot/dts/mpc8315erdb.dts
+++ b/arch/powerpc/boot/dts/mpc8315erdb.dts
@@ -472,7 +472,7 @@
 
 		hdd {
 			gpios = <&mcu_pio 1 0>;
-			linux,default-trigger = "ide-disk";
+			linux,default-trigger = "disk-activity";
 		};
 	};
 };
diff --git a/arch/powerpc/boot/dts/mpc8377_rdb.dts b/arch/powerpc/boot/dts/mpc8377_rdb.dts
index 2b4b653..e326139 100644
--- a/arch/powerpc/boot/dts/mpc8377_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc8377_rdb.dts
@@ -496,7 +496,7 @@
 
 		hdd {
 			gpios = <&mcu_pio 1 0>;
-			linux,default-trigger = "ide-disk";
+			linux,default-trigger = "disk-activity";
 		};
 	};
 };
diff --git a/arch/powerpc/boot/dts/mpc8378_rdb.dts b/arch/powerpc/boot/dts/mpc8378_rdb.dts
index 74b6a53..71842fc 100644
--- a/arch/powerpc/boot/dts/mpc8378_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc8378_rdb.dts
@@ -480,7 +480,7 @@
 
 		hdd {
 			gpios = <&mcu_pio 1 0>;
-			linux,default-trigger = "ide-disk";
+			linux,default-trigger = "disk-activity";
 		};
 	};
 };
diff --git a/arch/powerpc/boot/dts/mpc8379_rdb.dts b/arch/powerpc/boot/dts/mpc8379_rdb.dts
index 3b5cbac..e442a29 100644
--- a/arch/powerpc/boot/dts/mpc8379_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc8379_rdb.dts
@@ -446,7 +446,7 @@
 
 		hdd {
 			gpios = <&mcu_pio 1 0>;
-			linux,default-trigger = "ide-disk";
+			linux,default-trigger = "disk-activity";
 		};
 	};
 };
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig
index ea8705f..3f6c9a6 100644
--- a/arch/powerpc/configs/pmac32_defconfig
+++ b/arch/powerpc/configs/pmac32_defconfig
@@ -158,7 +158,7 @@ CONFIG_ADB=y
 CONFIG_ADB_CUDA=y
 CONFIG_ADB_PMU=y
 CONFIG_ADB_PMU_LED=y
-CONFIG_ADB_PMU_LED_IDE=y
+CONFIG_ADB_PMU_LED_DISK=y
 CONFIG_PMAC_APM_EMU=m
 CONFIG_PMAC_MEDIABAY=y
 CONFIG_PMAC_BACKLIGHT=y
diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig
index 99ccbeba..1dde0be 100644
--- a/arch/powerpc/configs/ppc6xx_defconfig
+++ b/arch/powerpc/configs/ppc6xx_defconfig
@@ -442,7 +442,7 @@ CONFIG_ADB=y
 CONFIG_ADB_CUDA=y
 CONFIG_ADB_PMU=y
 CONFIG_ADB_PMU_LED=y
-CONFIG_ADB_PMU_LED_IDE=y
+CONFIG_ADB_PMU_LED_DISK=y
 CONFIG_PMAC_APM_EMU=y
 CONFIG_PMAC_MEDIABAY=y
 CONFIG_PMAC_BACKLIGHT=y
diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index 3e8b29e..d28690f 100644
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -96,19 +96,18 @@ config ADB_PMU_LED
 	  Support the front LED on Power/iBooks as a generic LED that can
 	  be triggered by any of the supported triggers. To get the
 	  behaviour of the old CONFIG_BLK_DEV_IDE_PMAC_BLINK, select this
-	  and the ide-disk LED trigger and configure appropriately through
-	  sysfs.
+	  and the disk LED trigger and configure appropriately through sysfs.
 
-config ADB_PMU_LED_IDE
-	bool "Use front LED as IDE LED by default"
+config ADB_PMU_LED_DISK
+	bool "Use front LED as DISK LED by default"
 	depends on ADB_PMU_LED
 	depends on LEDS_CLASS
 	depends on IDE_GD_ATA
 	select LEDS_TRIGGERS
-	select LEDS_TRIGGER_IDE_DISK
+	select LEDS_TRIGGER_DISK
 	help
-	  This option makes the front LED default to the IDE trigger
-	  so that it blinks on IDE activity.
+	  This option makes the front LED default to the disk trigger
+	  so that it blinks on disk activity.
 
 config PMAC_SMU
 	bool "Support for SMU  based PowerMacs"
diff --git a/drivers/macintosh/via-pmu-led.c b/drivers/macintosh/via-pmu-led.c
index 19c3718..ae067ab 100644
--- a/drivers/macintosh/via-pmu-led.c
+++ b/drivers/macintosh/via-pmu-led.c
@@ -73,8 +73,8 @@ static void pmu_led_set(struct led_classdev *led_cdev,
 
 static struct led_classdev pmu_led = {
 	.name = "pmu-led::front",
-#ifdef CONFIG_ADB_PMU_LED_IDE
-	.default_trigger = "ide-disk",
+#ifdef CONFIG_ADB_PMU_LED_DISK
+	.default_trigger = "disk-activity",
 #endif
 	.brightness_set = pmu_led_set,
 };
-- 
2.8.4

^ permalink raw reply	[flat|nested] 21+ messages in thread

* [PATCH v3 4/7] arm: use the new LED disk activity trigger
  2016-06-08 22:29 [PATCH v3 1/7] leds: convert IDE trigger to common disk trigger Stephan Linz
  2016-06-08 22:29 ` [PATCH v3 2/7] leds: documentation: 'ide-disk' to 'disk-activity' Stephan Linz
  2016-06-08 22:29 ` [PATCH v3 3/7] powerpc: use the new LED disk activity trigger Stephan Linz
@ 2016-06-08 22:29 ` Stephan Linz
  2016-06-09  7:18   ` Gregory CLEMENT
  2016-06-08 22:29 ` [PATCH v3 5/7] mips: " Stephan Linz
                   ` (4 subsequent siblings)
  7 siblings, 1 reply; 21+ messages in thread
From: Stephan Linz @ 2016-06-08 22:29 UTC (permalink / raw)
  To: linux-leds, linux-ide
  Cc: Stephan Linz, Benoît Cousson, Tony Lindgren, Rob Herring,
	Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Russell King,
	Jason Cooper, Andrew Lunn, Gregory Clement,
	Sebastian Hesselbarth, Sekhar Nori, Kevin Hilman, Daniel Mack,
	Haojian Zhuang, Robert Jarzmik, linux-omap, devicetree,
	linux-kernel

- 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: Stephan Linz <linz@li-pro.net>
---
 arch/arm/boot/dts/am57xx-beagle-x15.dts  | 2 +-
 arch/arm/boot/dts/kirkwood-ns2lite.dts   | 2 +-
 arch/arm/boot/dts/kirkwood-topkick.dts   | 2 +-
 arch/arm/configs/collie_defconfig        | 2 +-
 arch/arm/configs/ixp4xx_defconfig        | 2 +-
 arch/arm/mach-davinci/board-dm644x-evm.c | 2 +-
 arch/arm/mach-omap1/board-osk.c          | 2 +-
 arch/arm/mach-pxa/spitz.c                | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts
index 81d6c30..c4d04c5 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15.dts
+++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts
@@ -86,7 +86,7 @@
 		led@3 {
 			label = "beagle-x15:usr3";
 			gpios = <&gpio7 15 GPIO_ACTIVE_HIGH>;
-			linux,default-trigger = "ide-disk";
+			linux,default-trigger = "disk-activity";
 			default-state = "off";
 		};
 	};
diff --git a/arch/arm/boot/dts/kirkwood-ns2lite.dts b/arch/arm/boot/dts/kirkwood-ns2lite.dts
index 1f2ca60..2c661ad 100644
--- a/arch/arm/boot/dts/kirkwood-ns2lite.dts
+++ b/arch/arm/boot/dts/kirkwood-ns2lite.dts
@@ -26,7 +26,7 @@
 		blue-sata {
 			label = "ns2:blue:sata";
 			gpios = <&gpio0 30 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "ide-disk";
+			linux,default-trigger = "disk-activity";
 		};
 	};
 };
diff --git a/arch/arm/boot/dts/kirkwood-topkick.dts b/arch/arm/boot/dts/kirkwood-topkick.dts
index f5c8c0d..1e9a721 100644
--- a/arch/arm/boot/dts/kirkwood-topkick.dts
+++ b/arch/arm/boot/dts/kirkwood-topkick.dts
@@ -129,7 +129,7 @@
 		disk {
 			label = "topkick:yellow:disk";
 			gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
-			linux,default-trigger = "ide-disk";
+			linux,default-trigger = "disk-activity";
 		};
 		system2 {
 			label = "topkick:red:system";
diff --git a/arch/arm/configs/collie_defconfig b/arch/arm/configs/collie_defconfig
index 6c56ad0..52dbad5 100644
--- a/arch/arm/configs/collie_defconfig
+++ b/arch/arm/configs/collie_defconfig
@@ -76,7 +76,7 @@ CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_LOCOMO=y
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_IDE_DISK=y
+CONFIG_LEDS_TRIGGER_DISK=y
 # CONFIG_DNOTIFY is not set
 CONFIG_VFAT_FS=y
 CONFIG_TMPFS=y
diff --git a/arch/arm/configs/ixp4xx_defconfig b/arch/arm/configs/ixp4xx_defconfig
index 24636cf..cf4918a 100644
--- a/arch/arm/configs/ixp4xx_defconfig
+++ b/arch/arm/configs/ixp4xx_defconfig
@@ -180,7 +180,7 @@ CONFIG_LEDS_FSG=y
 CONFIG_LEDS_GPIO=y
 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
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_ISL1208=y
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index 68cc099..ab47b8e 100644
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -288,7 +288,7 @@ static struct gpio_led evm_leds[] = {
 	{ .name = "DS2", .active_low = 1,
 		.default_trigger = "mmc0", },
 	{ .name = "DS1", .active_low = 1,
-		.default_trigger = "ide-disk", },
+		.default_trigger = "disk-activity", },
 };
 
 static const struct gpio_led_platform_data evm_led_data = {
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index 209aecb..4dfb995 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -172,7 +172,7 @@ static struct gpio_led tps_leds[] = {
 	 * Also, D9 requires non-battery power.
 	 */
 	{ .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_D3, .name = "d3", .active_low = 1,
 			.default_trigger = "heartbeat", },
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
index bd7cd8b..1080580 100644
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@ -464,7 +464,7 @@ static struct gpio_led spitz_gpio_leds[] = {
 	},
 	{
 		.name			= "spitz:green:hddactivity",
-		.default_trigger	= "ide-disk",
+		.default_trigger	= "disk-activity",
 		.gpio			= SPITZ_GPIO_LED_GREEN,
 	},
 };
-- 
2.8.4

^ permalink raw reply	[flat|nested] 21+ messages in thread

* [PATCH v3 5/7] mips: use the new LED disk activity trigger
  2016-06-08 22:29 [PATCH v3 1/7] leds: convert IDE trigger to common disk trigger Stephan Linz
                   ` (2 preceding siblings ...)
  2016-06-08 22:29 ` [PATCH v3 4/7] arm: " Stephan Linz
@ 2016-06-08 22:29 ` Stephan Linz
  2016-06-08 22:29 ` [PATCH v3 6/7] parisc: " Stephan Linz
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 21+ messages in thread
From: Stephan Linz @ 2016-06-08 22:29 UTC (permalink / raw)
  To: linux-leds, linux-ide
  Cc: Stephan Linz, Ralf Baechle, linux-mips, linux-kernel

- 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>
---
 arch/mips/configs/malta_qemu_32r6_defconfig | 2 +-
 arch/mips/configs/maltaaprp_defconfig       | 2 +-
 arch/mips/configs/maltasmvp_eva_defconfig   | 2 +-
 arch/mips/configs/maltaup_defconfig         | 2 +-
 arch/mips/configs/rbtx49xx_defconfig        | 2 +-
 arch/mips/txx9/generic/setup.c              | 2 +-
 arch/mips/txx9/rbtx4939/setup.c             | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/mips/configs/malta_qemu_32r6_defconfig b/arch/mips/configs/malta_qemu_32r6_defconfig
index 7f50dd6..65f140e 100644
--- a/arch/mips/configs/malta_qemu_32r6_defconfig
+++ b/arch/mips/configs/malta_qemu_32r6_defconfig
@@ -146,7 +146,7 @@ CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 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
 CONFIG_LEDS_TRIGGER_BACKLIGHT=y
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
diff --git a/arch/mips/configs/maltaaprp_defconfig b/arch/mips/configs/maltaaprp_defconfig
index a9d433a..799c433 100644
--- a/arch/mips/configs/maltaaprp_defconfig
+++ b/arch/mips/configs/maltaaprp_defconfig
@@ -147,7 +147,7 @@ CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 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
 CONFIG_LEDS_TRIGGER_BACKLIGHT=y
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
diff --git a/arch/mips/configs/maltasmvp_eva_defconfig b/arch/mips/configs/maltasmvp_eva_defconfig
index 2774ef0..3184600 100644
--- a/arch/mips/configs/maltasmvp_eva_defconfig
+++ b/arch/mips/configs/maltasmvp_eva_defconfig
@@ -152,7 +152,7 @@ CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 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
 CONFIG_LEDS_TRIGGER_BACKLIGHT=y
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
diff --git a/arch/mips/configs/maltaup_defconfig b/arch/mips/configs/maltaup_defconfig
index 9bbd221..a79107d 100644
--- a/arch/mips/configs/maltaup_defconfig
+++ b/arch/mips/configs/maltaup_defconfig
@@ -146,7 +146,7 @@ CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 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
 CONFIG_LEDS_TRIGGER_BACKLIGHT=y
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
diff --git a/arch/mips/configs/rbtx49xx_defconfig b/arch/mips/configs/rbtx49xx_defconfig
index f8bf9b4..43d55e5 100644
--- a/arch/mips/configs/rbtx49xx_defconfig
+++ b/arch/mips/configs/rbtx49xx_defconfig
@@ -90,7 +90,7 @@ CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_IDE_DISK=y
+CONFIG_LEDS_TRIGGER_DISK=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_INTF_DEV_UIE_EMUL=y
diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c
index 108f8a8..ada92db 100644
--- a/arch/mips/txx9/generic/setup.c
+++ b/arch/mips/txx9/generic/setup.c
@@ -727,7 +727,7 @@ void __init txx9_iocled_init(unsigned long baseaddr,
 	int i;
 	static char *default_triggers[] __initdata = {
 		"heartbeat",
-		"ide-disk",
+		"disk-activity",
 		"nand-disk",
 		NULL,
 	};
diff --git a/arch/mips/txx9/rbtx4939/setup.c b/arch/mips/txx9/rbtx4939/setup.c
index 3703040..8b93730 100644
--- a/arch/mips/txx9/rbtx4939/setup.c
+++ b/arch/mips/txx9/rbtx4939/setup.c
@@ -215,7 +215,7 @@ static int __init rbtx4939_led_probe(struct platform_device *pdev)
 	int i;
 	static char *default_triggers[] __initdata = {
 		"heartbeat",
-		"ide-disk",
+		"disk-activity",
 		"nand-disk",
 	};
 
-- 
2.8.4

^ permalink raw reply	[flat|nested] 21+ messages in thread

* [PATCH v3 6/7] parisc: use the new LED disk activity trigger
  2016-06-08 22:29 [PATCH v3 1/7] leds: convert IDE trigger to common disk trigger Stephan Linz
                   ` (3 preceding siblings ...)
  2016-06-08 22:29 ` [PATCH v3 5/7] mips: " Stephan Linz
@ 2016-06-08 22:29 ` Stephan Linz
  2016-06-08 22:29 ` [PATCH v3 7/7] unicore32: " Stephan Linz
                   ` (2 subsequent siblings)
  7 siblings, 0 replies; 21+ messages in thread
From: Stephan Linz @ 2016-06-08 22:29 UTC (permalink / raw)
  To: linux-leds, linux-ide
  Cc: Stephan Linz, James E.J. Bottomley, Helge Deller, linux-parisc,
	linux-kernel

- platform: rename 'ide-disk' to 'disk-activity'

Signed-off-by: Stephan Linz <linz@li-pro.net>
---
 arch/parisc/configs/generic-32bit_defconfig | 2 +-
 arch/parisc/configs/generic-64bit_defconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/parisc/configs/generic-32bit_defconfig b/arch/parisc/configs/generic-32bit_defconfig
index 5b04d70..8688ba7 100644
--- a/arch/parisc/configs/generic-32bit_defconfig
+++ b/arch/parisc/configs/generic-32bit_defconfig
@@ -214,7 +214,7 @@ CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 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
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 CONFIG_DMADEVICES=y
diff --git a/arch/parisc/configs/generic-64bit_defconfig b/arch/parisc/configs/generic-64bit_defconfig
index e945c08..7e07926 100644
--- a/arch/parisc/configs/generic-64bit_defconfig
+++ b/arch/parisc/configs/generic-64bit_defconfig
@@ -231,7 +231,7 @@ CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LEDS_TRIGGER_ONESHOT=y
-CONFIG_LEDS_TRIGGER_IDE_DISK=y
+CONFIG_LEDS_TRIGGER_DISK=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-- 
2.8.4

^ permalink raw reply	[flat|nested] 21+ messages in thread

* [PATCH v3 7/7] unicore32: use the new LED disk activity trigger
  2016-06-08 22:29 [PATCH v3 1/7] leds: convert IDE trigger to common disk trigger Stephan Linz
                   ` (4 preceding siblings ...)
  2016-06-08 22:29 ` [PATCH v3 6/7] parisc: " Stephan Linz
@ 2016-06-08 22:29 ` Stephan Linz
  2016-06-09  7:29 ` [PATCH v3 1/7] leds: convert IDE trigger to common disk trigger Jacek Anaszewski
  2016-06-20  8:36 ` Jacek Anaszewski
  7 siblings, 0 replies; 21+ messages in thread
From: Stephan Linz @ 2016-06-08 22:29 UTC (permalink / raw)
  To: linux-leds, linux-ide; +Cc: Stephan Linz, Guan Xuetao, linux-kernel

- 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>
---
 arch/unicore32/configs/unicore32_defconfig | 2 +-
 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 45f47f8..aebd01f 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 49347a0..bf164bb 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 = {
-- 
2.8.4

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PATCH v3 4/7] arm: use the new LED disk activity trigger
  2016-06-08 22:29 ` [PATCH v3 4/7] arm: " Stephan Linz
@ 2016-06-09  7:18   ` Gregory CLEMENT
  0 siblings, 0 replies; 21+ messages in thread
From: Gregory CLEMENT @ 2016-06-09  7:18 UTC (permalink / raw)
  To: Stephan Linz
  Cc: linux-leds, linux-ide, Benoît Cousson, Tony Lindgren,
	Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
	Russell King, Jason Cooper, Andrew Lunn, Sebastian Hesselbarth,
	Sekhar Nori, Kevin Hilman, Daniel Mack, Haojian Zhuang,
	Robert Jarzmik, linux-omap, devicetree, linux-kernel

Hi Stephan,
 
 On jeu., juin 09 2016, Stephan Linz <linz@li-pro.net> wrote:

> - 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: Stephan Linz <linz@li-pro.net>
> ---

I don't comment about the change itslef but if the change is OK for the
dt and led maintainer then you will have to split this patch in 3 chunks
(on for each subystem):

>  arch/arm/boot/dts/am57xx-beagle-x15.dts  | 2 +-
for omap

>  arch/arm/boot/dts/kirkwood-ns2lite.dts   | 2 +-
>  arch/arm/boot/dts/kirkwood-topkick.dts   | 2 +-
for mvebu

>  arch/arm/configs/collie_defconfig        | 2 +-
>  arch/arm/configs/ixp4xx_defconfig        | 2 +-
for pxa

>  arch/arm/mach-davinci/board-dm644x-evm.c | 2 +-
>  arch/arm/mach-omap1/board-osk.c          | 2 +-
for omap

>  arch/arm/mach-pxa/spitz.c                | 2 +-
for pxa

Thanks,

Gregory

>  8 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts
> index 81d6c30..c4d04c5 100644
> --- a/arch/arm/boot/dts/am57xx-beagle-x15.dts
> +++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts
> @@ -86,7 +86,7 @@
>  		led@3 {
>  			label = "beagle-x15:usr3";
>  			gpios = <&gpio7 15 GPIO_ACTIVE_HIGH>;
> -			linux,default-trigger = "ide-disk";
> +			linux,default-trigger = "disk-activity";
>  			default-state = "off";
>  		};
>  	};
> diff --git a/arch/arm/boot/dts/kirkwood-ns2lite.dts b/arch/arm/boot/dts/kirkwood-ns2lite.dts
> index 1f2ca60..2c661ad 100644
> --- a/arch/arm/boot/dts/kirkwood-ns2lite.dts
> +++ b/arch/arm/boot/dts/kirkwood-ns2lite.dts
> @@ -26,7 +26,7 @@
>  		blue-sata {
>  			label = "ns2:blue:sata";
>  			gpios = <&gpio0 30 GPIO_ACTIVE_LOW>;
> -			linux,default-trigger = "ide-disk";
> +			linux,default-trigger = "disk-activity";
>  		};
>  	};
>  };
> diff --git a/arch/arm/boot/dts/kirkwood-topkick.dts b/arch/arm/boot/dts/kirkwood-topkick.dts
> index f5c8c0d..1e9a721 100644
> --- a/arch/arm/boot/dts/kirkwood-topkick.dts
> +++ b/arch/arm/boot/dts/kirkwood-topkick.dts
> @@ -129,7 +129,7 @@
>  		disk {
>  			label = "topkick:yellow:disk";
>  			gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
> -			linux,default-trigger = "ide-disk";
> +			linux,default-trigger = "disk-activity";
>  		};
>  		system2 {
>  			label = "topkick:red:system";
> diff --git a/arch/arm/configs/collie_defconfig b/arch/arm/configs/collie_defconfig
> index 6c56ad0..52dbad5 100644
> --- a/arch/arm/configs/collie_defconfig
> +++ b/arch/arm/configs/collie_defconfig
> @@ -76,7 +76,7 @@ CONFIG_LEDS_CLASS=y
>  CONFIG_LEDS_LOCOMO=y
>  CONFIG_LEDS_TRIGGERS=y
>  CONFIG_LEDS_TRIGGER_TIMER=y
> -CONFIG_LEDS_TRIGGER_IDE_DISK=y
> +CONFIG_LEDS_TRIGGER_DISK=y
>  # CONFIG_DNOTIFY is not set
>  CONFIG_VFAT_FS=y
>  CONFIG_TMPFS=y
> diff --git a/arch/arm/configs/ixp4xx_defconfig b/arch/arm/configs/ixp4xx_defconfig
> index 24636cf..cf4918a 100644
> --- a/arch/arm/configs/ixp4xx_defconfig
> +++ b/arch/arm/configs/ixp4xx_defconfig
> @@ -180,7 +180,7 @@ CONFIG_LEDS_FSG=y
>  CONFIG_LEDS_GPIO=y
>  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
>  CONFIG_RTC_CLASS=y
>  CONFIG_RTC_DRV_ISL1208=y
> diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
> index 68cc099..ab47b8e 100644
> --- a/arch/arm/mach-davinci/board-dm644x-evm.c
> +++ b/arch/arm/mach-davinci/board-dm644x-evm.c
> @@ -288,7 +288,7 @@ static struct gpio_led evm_leds[] = {
>  	{ .name = "DS2", .active_low = 1,
>  		.default_trigger = "mmc0", },
>  	{ .name = "DS1", .active_low = 1,
> -		.default_trigger = "ide-disk", },
> +		.default_trigger = "disk-activity", },
>  };
>  
>  static const struct gpio_led_platform_data evm_led_data = {
> diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
> index 209aecb..4dfb995 100644
> --- a/arch/arm/mach-omap1/board-osk.c
> +++ b/arch/arm/mach-omap1/board-osk.c
> @@ -172,7 +172,7 @@ static struct gpio_led tps_leds[] = {
>  	 * Also, D9 requires non-battery power.
>  	 */
>  	{ .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_D3, .name = "d3", .active_low = 1,
>  			.default_trigger = "heartbeat", },
> diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
> index bd7cd8b..1080580 100644
> --- a/arch/arm/mach-pxa/spitz.c
> +++ b/arch/arm/mach-pxa/spitz.c
> @@ -464,7 +464,7 @@ static struct gpio_led spitz_gpio_leds[] = {
>  	},
>  	{
>  		.name			= "spitz:green:hddactivity",
> -		.default_trigger	= "ide-disk",
> +		.default_trigger	= "disk-activity",
>  		.gpio			= SPITZ_GPIO_LED_GREEN,
>  	},
>  };
> -- 
> 2.8.4
>

-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PATCH v3 1/7] leds: convert IDE trigger to common disk trigger
  2016-06-08 22:29 [PATCH v3 1/7] leds: convert IDE trigger to common disk trigger Stephan Linz
                   ` (5 preceding siblings ...)
  2016-06-08 22:29 ` [PATCH v3 7/7] unicore32: " Stephan Linz
@ 2016-06-09  7:29 ` Jacek Anaszewski
  2016-06-09 22:27   ` Stephan Linz
  2016-06-20  8:36 ` Jacek Anaszewski
  7 siblings, 1 reply; 21+ messages in thread
From: Jacek Anaszewski @ 2016-06-09  7:29 UTC (permalink / raw)
  To: Stephan Linz
  Cc: linux-leds, linux-ide, Joseph Jezak, Nico Macrionitis,
	Jörg Sommer, Richard Purdie, Tejun Heo, David S. Miller,
	linux-kernel

Hi Stephan,

Thanks for the patch.

Generally it looks ok, with one exception: we have to keep
ide-disk trigger, so as not to break existing users.
Please just register two triggers in ledtrig_disk_init,
similarly as it was done for mtd trigger:

drivers/leds/trigger/ledtrig-mtd.c

Thanks,
Jacek Anaszewski


On 06/09/2016 12:29 AM, Stephan Linz wrote:
> This patch converts the IDE specific LED trigger to a generic disk
> activity LED trigger. The libata core is now a trigger source just
> like before the IDE disk driver. It's merely a replacement of the
> string ide by disk.
>
> The patch is taken from http://dev.gentoo.org/~josejx/ata.patch and is
> widely used by any ibook/powerbook owners with great satisfaction.
> Likewise, it is very often used successfully on different ARM platforms.
>
> The original patch was split into different parts to clarify platform
> independent and dependent changes.
>
> Cc: Joseph Jezak <josejx@gentoo.org>
> Cc: Nico Macrionitis <acrux@cruxppc.org>
> Cc: Jörg Sommer <joerg@alea.gnuu.de>
> Cc: Richard Purdie <rpurdie@rpsys.net>
> Cc: Jacek Anaszewski <j.anaszewski@samsung.com>
> Signed-off-by: Stephan Linz <linz@li-pro.net>
> ---
> 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
> ---
>   drivers/ata/libata-core.c                            |  4 ++++
>   drivers/ide/ide-disk.c                               |  2 +-
>   drivers/leds/leds-hp6xx.c                            |  2 +-
>   drivers/leds/trigger/Kconfig                         |  8 ++++----
>   drivers/leds/trigger/Makefile                        |  2 +-
>   .../trigger/{ledtrig-ide-disk.c => ledtrig-disk.c}   | 20 ++++++++++----------
>   include/linux/leds.h                                 |  6 +++---
>   7 files changed, 24 insertions(+), 20 deletions(-)
>   rename drivers/leds/trigger/{ledtrig-ide-disk.c => ledtrig-disk.c} (50%)
>
> diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
> index 6be7770..2eca572 100644
> --- a/drivers/ata/libata-core.c
> +++ b/drivers/ata/libata-core.c
> @@ -69,6 +69,7 @@
>   #include <asm/unaligned.h>
>   #include <linux/cdrom.h>
>   #include <linux/ratelimit.h>
> +#include <linux/leds.h>
>   #include <linux/pm_runtime.h>
>   #include <linux/platform_device.h>
>
> @@ -5072,6 +5073,9 @@ void ata_qc_complete(struct ata_queued_cmd *qc)
>   {
>   	struct ata_port *ap = qc->ap;
>
> +	/* Trigger the LED (if available) */
> +	ledtrig_disk_activity();
> +
>   	/* XXX: New EH and old EH use different mechanisms to
>   	 * synchronize EH with regular execution path.
>   	 *
> diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
> index 05dbcce..5ceb176 100644
> --- a/drivers/ide/ide-disk.c
> +++ b/drivers/ide/ide-disk.c
> @@ -186,7 +186,7 @@ static ide_startstop_t ide_do_rw_disk(ide_drive_t *drive, struct request *rq,
>   	BUG_ON(drive->dev_flags & IDE_DFLAG_BLOCKED);
>   	BUG_ON(rq->cmd_type != REQ_TYPE_FS);
>
> -	ledtrig_ide_activity();
> +	ledtrig_disk_activity();
>
>   	pr_debug("%s: %sing: block=%llu, sectors=%u\n",
>   		 drive->name, rq_data_dir(rq) == READ ? "read" : "writ",
> diff --git a/drivers/leds/leds-hp6xx.c b/drivers/leds/leds-hp6xx.c
> index a6b8db0..137969f 100644
> --- a/drivers/leds/leds-hp6xx.c
> +++ b/drivers/leds/leds-hp6xx.c
> @@ -50,7 +50,7 @@ static struct led_classdev hp6xx_red_led = {
>
>   static struct led_classdev hp6xx_green_led = {
>   	.name			= "hp6xx:green",
> -	.default_trigger	= "ide-disk",
> +	.default_trigger	= "disk-activity",
>   	.brightness_set		= hp6xxled_green_set,
>   	.flags			= LED_CORE_SUSPENDRESUME,
>   };
> diff --git a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig
> index 9893d91..3f9ddb9 100644
> --- a/drivers/leds/trigger/Kconfig
> +++ b/drivers/leds/trigger/Kconfig
> @@ -33,12 +33,12 @@ config LEDS_TRIGGER_ONESHOT
>
>   	  If unsure, say Y.
>
> -config LEDS_TRIGGER_IDE_DISK
> -	bool "LED IDE Disk Trigger"
> -	depends on IDE_GD_ATA
> +config LEDS_TRIGGER_DISK
> +	bool "LED Disk Trigger"
> +	depends on IDE_GD_ATA || ATA
>   	depends on LEDS_TRIGGERS
>   	help
> -	  This allows LEDs to be controlled by IDE disk activity.
> +	  This allows LEDs to be controlled by disk activity.
>   	  If unsure, say Y.
>
>   config LEDS_TRIGGER_MTD
> diff --git a/drivers/leds/trigger/Makefile b/drivers/leds/trigger/Makefile
> index 8cc64a4..a72c43c 100644
> --- a/drivers/leds/trigger/Makefile
> +++ b/drivers/leds/trigger/Makefile
> @@ -1,6 +1,6 @@
>   obj-$(CONFIG_LEDS_TRIGGER_TIMER)	+= ledtrig-timer.o
>   obj-$(CONFIG_LEDS_TRIGGER_ONESHOT)	+= ledtrig-oneshot.o
> -obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK)	+= ledtrig-ide-disk.o
> +obj-$(CONFIG_LEDS_TRIGGER_DISK)		+= ledtrig-disk.o
>   obj-$(CONFIG_LEDS_TRIGGER_MTD)		+= ledtrig-mtd.o
>   obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)	+= ledtrig-heartbeat.o
>   obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+= ledtrig-backlight.o
> diff --git a/drivers/leds/trigger/ledtrig-ide-disk.c b/drivers/leds/trigger/ledtrig-disk.c
> similarity index 50%
> rename from drivers/leds/trigger/ledtrig-ide-disk.c
> rename to drivers/leds/trigger/ledtrig-disk.c
> index 15123d3..7a1fe44 100644
> --- a/drivers/leds/trigger/ledtrig-ide-disk.c
> +++ b/drivers/leds/trigger/ledtrig-disk.c
> @@ -1,5 +1,5 @@
>   /*
> - * LED IDE-Disk Activity Trigger
> + * LED Disk Activity Trigger
>    *
>    * Copyright 2006 Openedhand Ltd.
>    *
> @@ -17,20 +17,20 @@
>
>   #define BLINK_DELAY 30
>
> -DEFINE_LED_TRIGGER(ledtrig_ide);
> +DEFINE_LED_TRIGGER(ledtrig_disk);
>
> -void ledtrig_ide_activity(void)
> +void ledtrig_disk_activity(void)
>   {
> -	unsigned long ide_blink_delay = BLINK_DELAY;
> +	unsigned long disk_blink_delay = BLINK_DELAY;
>
> -	led_trigger_blink_oneshot(ledtrig_ide,
> -				  &ide_blink_delay, &ide_blink_delay, 0);
> +	led_trigger_blink_oneshot(ledtrig_disk,
> +				  &disk_blink_delay, &disk_blink_delay, 0);
>   }
> -EXPORT_SYMBOL(ledtrig_ide_activity);
> +EXPORT_SYMBOL(ledtrig_disk_activity);
>
> -static int __init ledtrig_ide_init(void)
> +static int __init ledtrig_disk_init(void)
>   {
> -	led_trigger_register_simple("ide-disk", &ledtrig_ide);
> +	led_trigger_register_simple("disk-activity", &ledtrig_disk);
>   	return 0;
>   }
> -device_initcall(ledtrig_ide_init);
> +device_initcall(ledtrig_disk_init);
> diff --git a/include/linux/leds.h b/include/linux/leds.h
> index d2b1306..28a3ef5 100644
> --- a/include/linux/leds.h
> +++ b/include/linux/leds.h
> @@ -324,10 +324,10 @@ static inline void *led_get_trigger_data(struct led_classdev *led_cdev)
>   #endif /* CONFIG_LEDS_TRIGGERS */
>
>   /* Trigger specific functions */
> -#ifdef CONFIG_LEDS_TRIGGER_IDE_DISK
> -extern void ledtrig_ide_activity(void);
> +#ifdef CONFIG_LEDS_TRIGGER_DISK
> +extern void ledtrig_disk_activity(void);
>   #else
> -static inline void ledtrig_ide_activity(void) {}
> +static inline void ledtrig_disk_activity(void) {}
>   #endif
>
>   #ifdef CONFIG_LEDS_TRIGGER_MTD
>

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PATCH v3 1/7] leds: convert IDE trigger to common disk trigger
  2016-06-09  7:29 ` [PATCH v3 1/7] leds: convert IDE trigger to common disk trigger Jacek Anaszewski
@ 2016-06-09 22:27   ` Stephan Linz
  0 siblings, 0 replies; 21+ messages in thread
From: Stephan Linz @ 2016-06-09 22:27 UTC (permalink / raw)
  To: Jacek Anaszewski
  Cc: linux-leds, linux-ide, Joseph Jezak, Nico Macrionitis,
	Jörg Sommer, Richard Purdie, Tejun Heo, David S. Miller,
	linux-kernel


[-- Attachment #1.1: Type: text/plain, Size: 7838 bytes --]

Hi Jacek,

to keep the original ide-disk trigger is good idea to be backward
compatible. I'll submit a new v4 patch set.


br,
Stephan

Am 09.06.2016 um 09:29 schrieb Jacek Anaszewski:
> Hi Stephan,
> 
> Thanks for the patch.
> 
> Generally it looks ok, with one exception: we have to keep
> ide-disk trigger, so as not to break existing users.
> Please just register two triggers in ledtrig_disk_init,
> similarly as it was done for mtd trigger:
> 
> drivers/leds/trigger/ledtrig-mtd.c
> 
> Thanks,
> Jacek Anaszewski
> 
> 
> On 06/09/2016 12:29 AM, Stephan Linz wrote:
>> This patch converts the IDE specific LED trigger to a generic disk
>> activity LED trigger. The libata core is now a trigger source just
>> like before the IDE disk driver. It's merely a replacement of the
>> string ide by disk.
>>
>> The patch is taken from http://dev.gentoo.org/~josejx/ata.patch and is
>> widely used by any ibook/powerbook owners with great satisfaction.
>> Likewise, it is very often used successfully on different ARM platforms.
>>
>> The original patch was split into different parts to clarify platform
>> independent and dependent changes.
>>
>> Cc: Joseph Jezak <josejx@gentoo.org>
>> Cc: Nico Macrionitis <acrux@cruxppc.org>
>> Cc: Jörg Sommer <joerg@alea.gnuu.de>
>> Cc: Richard Purdie <rpurdie@rpsys.net>
>> Cc: Jacek Anaszewski <j.anaszewski@samsung.com>
>> Signed-off-by: Stephan Linz <linz@li-pro.net>
>> ---
>> 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
>> ---
>>   drivers/ata/libata-core.c                            |  4 ++++
>>   drivers/ide/ide-disk.c                               |  2 +-
>>   drivers/leds/leds-hp6xx.c                            |  2 +-
>>   drivers/leds/trigger/Kconfig                         |  8 ++++----
>>   drivers/leds/trigger/Makefile                        |  2 +-
>>   .../trigger/{ledtrig-ide-disk.c => ledtrig-disk.c}   | 20
>> ++++++++++----------
>>   include/linux/leds.h                                 |  6 +++---
>>   7 files changed, 24 insertions(+), 20 deletions(-)
>>   rename drivers/leds/trigger/{ledtrig-ide-disk.c => ledtrig-disk.c}
>> (50%)
>>
>> diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
>> index 6be7770..2eca572 100644
>> --- a/drivers/ata/libata-core.c
>> +++ b/drivers/ata/libata-core.c
>> @@ -69,6 +69,7 @@
>>   #include <asm/unaligned.h>
>>   #include <linux/cdrom.h>
>>   #include <linux/ratelimit.h>
>> +#include <linux/leds.h>
>>   #include <linux/pm_runtime.h>
>>   #include <linux/platform_device.h>
>>
>> @@ -5072,6 +5073,9 @@ void ata_qc_complete(struct ata_queued_cmd *qc)
>>   {
>>       struct ata_port *ap = qc->ap;
>>
>> +    /* Trigger the LED (if available) */
>> +    ledtrig_disk_activity();
>> +
>>       /* XXX: New EH and old EH use different mechanisms to
>>        * synchronize EH with regular execution path.
>>        *
>> diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
>> index 05dbcce..5ceb176 100644
>> --- a/drivers/ide/ide-disk.c
>> +++ b/drivers/ide/ide-disk.c
>> @@ -186,7 +186,7 @@ static ide_startstop_t ide_do_rw_disk(ide_drive_t
>> *drive, struct request *rq,
>>       BUG_ON(drive->dev_flags & IDE_DFLAG_BLOCKED);
>>       BUG_ON(rq->cmd_type != REQ_TYPE_FS);
>>
>> -    ledtrig_ide_activity();
>> +    ledtrig_disk_activity();
>>
>>       pr_debug("%s: %sing: block=%llu, sectors=%u\n",
>>            drive->name, rq_data_dir(rq) == READ ? "read" : "writ",
>> diff --git a/drivers/leds/leds-hp6xx.c b/drivers/leds/leds-hp6xx.c
>> index a6b8db0..137969f 100644
>> --- a/drivers/leds/leds-hp6xx.c
>> +++ b/drivers/leds/leds-hp6xx.c
>> @@ -50,7 +50,7 @@ static struct led_classdev hp6xx_red_led = {
>>
>>   static struct led_classdev hp6xx_green_led = {
>>       .name            = "hp6xx:green",
>> -    .default_trigger    = "ide-disk",
>> +    .default_trigger    = "disk-activity",
>>       .brightness_set        = hp6xxled_green_set,
>>       .flags            = LED_CORE_SUSPENDRESUME,
>>   };
>> diff --git a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig
>> index 9893d91..3f9ddb9 100644
>> --- a/drivers/leds/trigger/Kconfig
>> +++ b/drivers/leds/trigger/Kconfig
>> @@ -33,12 +33,12 @@ config LEDS_TRIGGER_ONESHOT
>>
>>         If unsure, say Y.
>>
>> -config LEDS_TRIGGER_IDE_DISK
>> -    bool "LED IDE Disk Trigger"
>> -    depends on IDE_GD_ATA
>> +config LEDS_TRIGGER_DISK
>> +    bool "LED Disk Trigger"
>> +    depends on IDE_GD_ATA || ATA
>>       depends on LEDS_TRIGGERS
>>       help
>> -      This allows LEDs to be controlled by IDE disk activity.
>> +      This allows LEDs to be controlled by disk activity.
>>         If unsure, say Y.
>>
>>   config LEDS_TRIGGER_MTD
>> diff --git a/drivers/leds/trigger/Makefile
>> b/drivers/leds/trigger/Makefile
>> index 8cc64a4..a72c43c 100644
>> --- a/drivers/leds/trigger/Makefile
>> +++ b/drivers/leds/trigger/Makefile
>> @@ -1,6 +1,6 @@
>>   obj-$(CONFIG_LEDS_TRIGGER_TIMER)    += ledtrig-timer.o
>>   obj-$(CONFIG_LEDS_TRIGGER_ONESHOT)    += ledtrig-oneshot.o
>> -obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK)    += ledtrig-ide-disk.o
>> +obj-$(CONFIG_LEDS_TRIGGER_DISK)        += ledtrig-disk.o
>>   obj-$(CONFIG_LEDS_TRIGGER_MTD)        += ledtrig-mtd.o
>>   obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)    += ledtrig-heartbeat.o
>>   obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)    += ledtrig-backlight.o
>> diff --git a/drivers/leds/trigger/ledtrig-ide-disk.c
>> b/drivers/leds/trigger/ledtrig-disk.c
>> similarity index 50%
>> rename from drivers/leds/trigger/ledtrig-ide-disk.c
>> rename to drivers/leds/trigger/ledtrig-disk.c
>> index 15123d3..7a1fe44 100644
>> --- a/drivers/leds/trigger/ledtrig-ide-disk.c
>> +++ b/drivers/leds/trigger/ledtrig-disk.c
>> @@ -1,5 +1,5 @@
>>   /*
>> - * LED IDE-Disk Activity Trigger
>> + * LED Disk Activity Trigger
>>    *
>>    * Copyright 2006 Openedhand Ltd.
>>    *
>> @@ -17,20 +17,20 @@
>>
>>   #define BLINK_DELAY 30
>>
>> -DEFINE_LED_TRIGGER(ledtrig_ide);
>> +DEFINE_LED_TRIGGER(ledtrig_disk);
>>
>> -void ledtrig_ide_activity(void)
>> +void ledtrig_disk_activity(void)
>>   {
>> -    unsigned long ide_blink_delay = BLINK_DELAY;
>> +    unsigned long disk_blink_delay = BLINK_DELAY;
>>
>> -    led_trigger_blink_oneshot(ledtrig_ide,
>> -                  &ide_blink_delay, &ide_blink_delay, 0);
>> +    led_trigger_blink_oneshot(ledtrig_disk,
>> +                  &disk_blink_delay, &disk_blink_delay, 0);
>>   }
>> -EXPORT_SYMBOL(ledtrig_ide_activity);
>> +EXPORT_SYMBOL(ledtrig_disk_activity);
>>
>> -static int __init ledtrig_ide_init(void)
>> +static int __init ledtrig_disk_init(void)
>>   {
>> -    led_trigger_register_simple("ide-disk", &ledtrig_ide);
>> +    led_trigger_register_simple("disk-activity", &ledtrig_disk);
>>       return 0;
>>   }
>> -device_initcall(ledtrig_ide_init);
>> +device_initcall(ledtrig_disk_init);
>> diff --git a/include/linux/leds.h b/include/linux/leds.h
>> index d2b1306..28a3ef5 100644
>> --- a/include/linux/leds.h
>> +++ b/include/linux/leds.h
>> @@ -324,10 +324,10 @@ static inline void *led_get_trigger_data(struct
>> led_classdev *led_cdev)
>>   #endif /* CONFIG_LEDS_TRIGGERS */
>>
>>   /* Trigger specific functions */
>> -#ifdef CONFIG_LEDS_TRIGGER_IDE_DISK
>> -extern void ledtrig_ide_activity(void);
>> +#ifdef CONFIG_LEDS_TRIGGER_DISK
>> +extern void ledtrig_disk_activity(void);
>>   #else
>> -static inline void ledtrig_ide_activity(void) {}
>> +static inline void ledtrig_disk_activity(void) {}
>>   #endif
>>
>>   #ifdef CONFIG_LEDS_TRIGGER_MTD
>>
> 
> 
> 


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PATCH v3 1/7] leds: convert IDE trigger to common disk trigger
  2016-06-08 22:29 [PATCH v3 1/7] leds: convert IDE trigger to common disk trigger Stephan Linz
                   ` (6 preceding siblings ...)
  2016-06-09  7:29 ` [PATCH v3 1/7] leds: convert IDE trigger to common disk trigger Jacek Anaszewski
@ 2016-06-20  8:36 ` Jacek Anaszewski
  2016-06-20 21:28   ` Stephan Linz
  7 siblings, 1 reply; 21+ messages in thread
From: Jacek Anaszewski @ 2016-06-20  8:36 UTC (permalink / raw)
  To: Stephan Linz
  Cc: linux-leds, linux-ide, Joseph Jezak, Nico Macrionitis,
	Jörg Sommer, Richard Purdie, Tejun Heo, David S. Miller,
	linux-kernel

Hi Stephan,

On 06/09/2016 12:29 AM, Stephan Linz wrote:
> This patch converts the IDE specific LED trigger to a generic disk
> activity LED trigger. The libata core is now a trigger source just
> like before the IDE disk driver. It's merely a replacement of the
> string ide by disk.
>
> The patch is taken from http://dev.gentoo.org/~josejx/ata.patch and is
> widely used by any ibook/powerbook owners with great satisfaction.
> Likewise, it is very often used successfully on different ARM platforms.
>
> The original patch was split into different parts to clarify platform
> independent and dependent changes.
>
> Cc: Joseph Jezak <josejx@gentoo.org>
> Cc: Nico Macrionitis <acrux@cruxppc.org>
> Cc: Jörg Sommer <joerg@alea.gnuu.de>
> Cc: Richard Purdie <rpurdie@rpsys.net>
> Cc: Jacek Anaszewski <j.anaszewski@samsung.com>
> Signed-off-by: Stephan Linz <linz@li-pro.net>
> ---
> 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
> ---
>   drivers/ata/libata-core.c                            |  4 ++++
>   drivers/ide/ide-disk.c                               |  2 +-
>   drivers/leds/leds-hp6xx.c                            |  2 +-
>   drivers/leds/trigger/Kconfig                         |  8 ++++----
>   drivers/leds/trigger/Makefile                        |  2 +-
>   .../trigger/{ledtrig-ide-disk.c => ledtrig-disk.c}   | 20 ++++++++++----------
>   include/linux/leds.h                                 |  6 +++---
>   7 files changed, 24 insertions(+), 20 deletions(-)
>   rename drivers/leds/trigger/{ledtrig-ide-disk.c => ledtrig-disk.c} (50%)
>
> diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
> index 6be7770..2eca572 100644
> --- a/drivers/ata/libata-core.c
> +++ b/drivers/ata/libata-core.c
> @@ -69,6 +69,7 @@
>   #include <asm/unaligned.h>
>   #include <linux/cdrom.h>
>   #include <linux/ratelimit.h>
> +#include <linux/leds.h>
>   #include <linux/pm_runtime.h>
>   #include <linux/platform_device.h>
>
> @@ -5072,6 +5073,9 @@ void ata_qc_complete(struct ata_queued_cmd *qc)
>   {
>   	struct ata_port *ap = qc->ap;
>
> +	/* Trigger the LED (if available) */
> +	ledtrig_disk_activity();
> +
>   	/* XXX: New EH and old EH use different mechanisms to
>   	 * synchronize EH with regular execution path.
>   	 *
> diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
> index 05dbcce..5ceb176 100644
> --- a/drivers/ide/ide-disk.c
> +++ b/drivers/ide/ide-disk.c
> @@ -186,7 +186,7 @@ static ide_startstop_t ide_do_rw_disk(ide_drive_t *drive, struct request *rq,
>   	BUG_ON(drive->dev_flags & IDE_DFLAG_BLOCKED);
>   	BUG_ON(rq->cmd_type != REQ_TYPE_FS);
>
> -	ledtrig_ide_activity();
> +	ledtrig_disk_activity();
>
>   	pr_debug("%s: %sing: block=%llu, sectors=%u\n",
>   		 drive->name, rq_data_dir(rq) == READ ? "read" : "writ",
> diff --git a/drivers/leds/leds-hp6xx.c b/drivers/leds/leds-hp6xx.c
> index a6b8db0..137969f 100644
> --- a/drivers/leds/leds-hp6xx.c
> +++ b/drivers/leds/leds-hp6xx.c
> @@ -50,7 +50,7 @@ static struct led_classdev hp6xx_red_led = {
>
>   static struct led_classdev hp6xx_green_led = {
>   	.name			= "hp6xx:green",
> -	.default_trigger	= "ide-disk",
> +	.default_trigger	= "disk-activity",
>   	.brightness_set		= hp6xxled_green_set,
>   	.flags			= LED_CORE_SUSPENDRESUME,
>   };
> diff --git a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig
> index 9893d91..3f9ddb9 100644
> --- a/drivers/leds/trigger/Kconfig
> +++ b/drivers/leds/trigger/Kconfig
> @@ -33,12 +33,12 @@ config LEDS_TRIGGER_ONESHOT
>
>   	  If unsure, say Y.
>
> -config LEDS_TRIGGER_IDE_DISK
> -	bool "LED IDE Disk Trigger"
> -	depends on IDE_GD_ATA
> +config LEDS_TRIGGER_DISK
> +	bool "LED Disk Trigger"
> +	depends on IDE_GD_ATA || ATA
>   	depends on LEDS_TRIGGERS
>   	help
> -	  This allows LEDs to be controlled by IDE disk activity.
> +	  This allows LEDs to be controlled by disk activity.
>   	  If unsure, say Y.
>
>   config LEDS_TRIGGER_MTD
> diff --git a/drivers/leds/trigger/Makefile b/drivers/leds/trigger/Makefile
> index 8cc64a4..a72c43c 100644
> --- a/drivers/leds/trigger/Makefile
> +++ b/drivers/leds/trigger/Makefile
> @@ -1,6 +1,6 @@
>   obj-$(CONFIG_LEDS_TRIGGER_TIMER)	+= ledtrig-timer.o
>   obj-$(CONFIG_LEDS_TRIGGER_ONESHOT)	+= ledtrig-oneshot.o
> -obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK)	+= ledtrig-ide-disk.o
> +obj-$(CONFIG_LEDS_TRIGGER_DISK)		+= ledtrig-disk.o
>   obj-$(CONFIG_LEDS_TRIGGER_MTD)		+= ledtrig-mtd.o
>   obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)	+= ledtrig-heartbeat.o
>   obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)	+= ledtrig-backlight.o
> diff --git a/drivers/leds/trigger/ledtrig-ide-disk.c b/drivers/leds/trigger/ledtrig-disk.c
> similarity index 50%
> rename from drivers/leds/trigger/ledtrig-ide-disk.c
> rename to drivers/leds/trigger/ledtrig-disk.c
> index 15123d3..7a1fe44 100644
> --- a/drivers/leds/trigger/ledtrig-ide-disk.c
> +++ b/drivers/leds/trigger/ledtrig-disk.c
> @@ -1,5 +1,5 @@
>   /*
> - * LED IDE-Disk Activity Trigger
> + * LED Disk Activity Trigger
>    *
>    * Copyright 2006 Openedhand Ltd.
>    *
> @@ -17,20 +17,20 @@
>
>   #define BLINK_DELAY 30
>
> -DEFINE_LED_TRIGGER(ledtrig_ide);
> +DEFINE_LED_TRIGGER(ledtrig_disk);
>
> -void ledtrig_ide_activity(void)
> +void ledtrig_disk_activity(void)
>   {
> -	unsigned long ide_blink_delay = BLINK_DELAY;
> +	unsigned long disk_blink_delay = BLINK_DELAY;
>
> -	led_trigger_blink_oneshot(ledtrig_ide,
> -				  &ide_blink_delay, &ide_blink_delay, 0);
> +	led_trigger_blink_oneshot(ledtrig_disk,
> +				  &disk_blink_delay, &disk_blink_delay, 0);
>   }
> -EXPORT_SYMBOL(ledtrig_ide_activity);
> +EXPORT_SYMBOL(ledtrig_disk_activity);
>
> -static int __init ledtrig_ide_init(void)
> +static int __init ledtrig_disk_init(void)
>   {
> -	led_trigger_register_simple("ide-disk", &ledtrig_ide);
> +	led_trigger_register_simple("disk-activity", &ledtrig_disk);
>   	return 0;
>   }
> -device_initcall(ledtrig_ide_init);
> +device_initcall(ledtrig_disk_init);
> diff --git a/include/linux/leds.h b/include/linux/leds.h
> index d2b1306..28a3ef5 100644
> --- a/include/linux/leds.h
> +++ b/include/linux/leds.h
> @@ -324,10 +324,10 @@ static inline void *led_get_trigger_data(struct led_classdev *led_cdev)
>   #endif /* CONFIG_LEDS_TRIGGERS */
>
>   /* Trigger specific functions */
> -#ifdef CONFIG_LEDS_TRIGGER_IDE_DISK
> -extern void ledtrig_ide_activity(void);
> +#ifdef CONFIG_LEDS_TRIGGER_DISK
> +extern void ledtrig_disk_activity(void);
>   #else
> -static inline void ledtrig_ide_activity(void) {}
> +static inline void ledtrig_disk_activity(void) {}
>   #endif
>
>   #ifdef CONFIG_LEDS_TRIGGER_MTD
>

Applied the patchset to the for-next branch of linux-leds.git.

Thanks,
Jacek Anaszewski

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PATCH v3 1/7] leds: convert IDE trigger to common disk trigger
  2016-06-20  8:36 ` Jacek Anaszewski
@ 2016-06-20 21:28   ` Stephan Linz
  2016-06-21  7:13     ` Jacek Anaszewski
  0 siblings, 1 reply; 21+ messages in thread
From: Stephan Linz @ 2016-06-20 21:28 UTC (permalink / raw)
  To: Jacek Anaszewski
  Cc: linux-leds, linux-ide, Joseph Jezak, Nico Macrionitis,
	Jörg Sommer, Richard Purdie, Tejun Heo, David S. Miller,
	linux-kernel


[-- Attachment #1.1: Type: text/plain, Size: 7575 bytes --]

Hi Jacek,

thanks a lot. Can you tell me, when the LED for-next branch will merge
into mainline?


br,
Stephan

Am 20.06.2016 um 10:36 schrieb Jacek Anaszewski:
> Hi Stephan,
> 
> On 06/09/2016 12:29 AM, Stephan Linz wrote:
>> This patch converts the IDE specific LED trigger to a generic disk
>> activity LED trigger. The libata core is now a trigger source just
>> like before the IDE disk driver. It's merely a replacement of the
>> string ide by disk.
>>
>> The patch is taken from http://dev.gentoo.org/~josejx/ata.patch and is
>> widely used by any ibook/powerbook owners with great satisfaction.
>> Likewise, it is very often used successfully on different ARM platforms.
>>
>> The original patch was split into different parts to clarify platform
>> independent and dependent changes.
>>
>> Cc: Joseph Jezak <josejx@gentoo.org>
>> Cc: Nico Macrionitis <acrux@cruxppc.org>
>> Cc: Jörg Sommer <joerg@alea.gnuu.de>
>> Cc: Richard Purdie <rpurdie@rpsys.net>
>> Cc: Jacek Anaszewski <j.anaszewski@samsung.com>
>> Signed-off-by: Stephan Linz <linz@li-pro.net>
>> ---
>> 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
>> ---
>>   drivers/ata/libata-core.c                            |  4 ++++
>>   drivers/ide/ide-disk.c                               |  2 +-
>>   drivers/leds/leds-hp6xx.c                            |  2 +-
>>   drivers/leds/trigger/Kconfig                         |  8 ++++----
>>   drivers/leds/trigger/Makefile                        |  2 +-
>>   .../trigger/{ledtrig-ide-disk.c => ledtrig-disk.c}   | 20
>> ++++++++++----------
>>   include/linux/leds.h                                 |  6 +++---
>>   7 files changed, 24 insertions(+), 20 deletions(-)
>>   rename drivers/leds/trigger/{ledtrig-ide-disk.c => ledtrig-disk.c}
>> (50%)
>>
>> diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
>> index 6be7770..2eca572 100644
>> --- a/drivers/ata/libata-core.c
>> +++ b/drivers/ata/libata-core.c
>> @@ -69,6 +69,7 @@
>>   #include <asm/unaligned.h>
>>   #include <linux/cdrom.h>
>>   #include <linux/ratelimit.h>
>> +#include <linux/leds.h>
>>   #include <linux/pm_runtime.h>
>>   #include <linux/platform_device.h>
>>
>> @@ -5072,6 +5073,9 @@ void ata_qc_complete(struct ata_queued_cmd *qc)
>>   {
>>       struct ata_port *ap = qc->ap;
>>
>> +    /* Trigger the LED (if available) */
>> +    ledtrig_disk_activity();
>> +
>>       /* XXX: New EH and old EH use different mechanisms to
>>        * synchronize EH with regular execution path.
>>        *
>> diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
>> index 05dbcce..5ceb176 100644
>> --- a/drivers/ide/ide-disk.c
>> +++ b/drivers/ide/ide-disk.c
>> @@ -186,7 +186,7 @@ static ide_startstop_t ide_do_rw_disk(ide_drive_t
>> *drive, struct request *rq,
>>       BUG_ON(drive->dev_flags & IDE_DFLAG_BLOCKED);
>>       BUG_ON(rq->cmd_type != REQ_TYPE_FS);
>>
>> -    ledtrig_ide_activity();
>> +    ledtrig_disk_activity();
>>
>>       pr_debug("%s: %sing: block=%llu, sectors=%u\n",
>>            drive->name, rq_data_dir(rq) == READ ? "read" : "writ",
>> diff --git a/drivers/leds/leds-hp6xx.c b/drivers/leds/leds-hp6xx.c
>> index a6b8db0..137969f 100644
>> --- a/drivers/leds/leds-hp6xx.c
>> +++ b/drivers/leds/leds-hp6xx.c
>> @@ -50,7 +50,7 @@ static struct led_classdev hp6xx_red_led = {
>>
>>   static struct led_classdev hp6xx_green_led = {
>>       .name            = "hp6xx:green",
>> -    .default_trigger    = "ide-disk",
>> +    .default_trigger    = "disk-activity",
>>       .brightness_set        = hp6xxled_green_set,
>>       .flags            = LED_CORE_SUSPENDRESUME,
>>   };
>> diff --git a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig
>> index 9893d91..3f9ddb9 100644
>> --- a/drivers/leds/trigger/Kconfig
>> +++ b/drivers/leds/trigger/Kconfig
>> @@ -33,12 +33,12 @@ config LEDS_TRIGGER_ONESHOT
>>
>>         If unsure, say Y.
>>
>> -config LEDS_TRIGGER_IDE_DISK
>> -    bool "LED IDE Disk Trigger"
>> -    depends on IDE_GD_ATA
>> +config LEDS_TRIGGER_DISK
>> +    bool "LED Disk Trigger"
>> +    depends on IDE_GD_ATA || ATA
>>       depends on LEDS_TRIGGERS
>>       help
>> -      This allows LEDs to be controlled by IDE disk activity.
>> +      This allows LEDs to be controlled by disk activity.
>>         If unsure, say Y.
>>
>>   config LEDS_TRIGGER_MTD
>> diff --git a/drivers/leds/trigger/Makefile
>> b/drivers/leds/trigger/Makefile
>> index 8cc64a4..a72c43c 100644
>> --- a/drivers/leds/trigger/Makefile
>> +++ b/drivers/leds/trigger/Makefile
>> @@ -1,6 +1,6 @@
>>   obj-$(CONFIG_LEDS_TRIGGER_TIMER)    += ledtrig-timer.o
>>   obj-$(CONFIG_LEDS_TRIGGER_ONESHOT)    += ledtrig-oneshot.o
>> -obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK)    += ledtrig-ide-disk.o
>> +obj-$(CONFIG_LEDS_TRIGGER_DISK)        += ledtrig-disk.o
>>   obj-$(CONFIG_LEDS_TRIGGER_MTD)        += ledtrig-mtd.o
>>   obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)    += ledtrig-heartbeat.o
>>   obj-$(CONFIG_LEDS_TRIGGER_BACKLIGHT)    += ledtrig-backlight.o
>> diff --git a/drivers/leds/trigger/ledtrig-ide-disk.c
>> b/drivers/leds/trigger/ledtrig-disk.c
>> similarity index 50%
>> rename from drivers/leds/trigger/ledtrig-ide-disk.c
>> rename to drivers/leds/trigger/ledtrig-disk.c
>> index 15123d3..7a1fe44 100644
>> --- a/drivers/leds/trigger/ledtrig-ide-disk.c
>> +++ b/drivers/leds/trigger/ledtrig-disk.c
>> @@ -1,5 +1,5 @@
>>   /*
>> - * LED IDE-Disk Activity Trigger
>> + * LED Disk Activity Trigger
>>    *
>>    * Copyright 2006 Openedhand Ltd.
>>    *
>> @@ -17,20 +17,20 @@
>>
>>   #define BLINK_DELAY 30
>>
>> -DEFINE_LED_TRIGGER(ledtrig_ide);
>> +DEFINE_LED_TRIGGER(ledtrig_disk);
>>
>> -void ledtrig_ide_activity(void)
>> +void ledtrig_disk_activity(void)
>>   {
>> -    unsigned long ide_blink_delay = BLINK_DELAY;
>> +    unsigned long disk_blink_delay = BLINK_DELAY;
>>
>> -    led_trigger_blink_oneshot(ledtrig_ide,
>> -                  &ide_blink_delay, &ide_blink_delay, 0);
>> +    led_trigger_blink_oneshot(ledtrig_disk,
>> +                  &disk_blink_delay, &disk_blink_delay, 0);
>>   }
>> -EXPORT_SYMBOL(ledtrig_ide_activity);
>> +EXPORT_SYMBOL(ledtrig_disk_activity);
>>
>> -static int __init ledtrig_ide_init(void)
>> +static int __init ledtrig_disk_init(void)
>>   {
>> -    led_trigger_register_simple("ide-disk", &ledtrig_ide);
>> +    led_trigger_register_simple("disk-activity", &ledtrig_disk);
>>       return 0;
>>   }
>> -device_initcall(ledtrig_ide_init);
>> +device_initcall(ledtrig_disk_init);
>> diff --git a/include/linux/leds.h b/include/linux/leds.h
>> index d2b1306..28a3ef5 100644
>> --- a/include/linux/leds.h
>> +++ b/include/linux/leds.h
>> @@ -324,10 +324,10 @@ static inline void *led_get_trigger_data(struct
>> led_classdev *led_cdev)
>>   #endif /* CONFIG_LEDS_TRIGGERS */
>>
>>   /* Trigger specific functions */
>> -#ifdef CONFIG_LEDS_TRIGGER_IDE_DISK
>> -extern void ledtrig_ide_activity(void);
>> +#ifdef CONFIG_LEDS_TRIGGER_DISK
>> +extern void ledtrig_disk_activity(void);
>>   #else
>> -static inline void ledtrig_ide_activity(void) {}
>> +static inline void ledtrig_disk_activity(void) {}
>>   #endif
>>
>>   #ifdef CONFIG_LEDS_TRIGGER_MTD
>>
> 
> Applied the patchset to the for-next branch of linux-leds.git.
> 
> Thanks,
> Jacek Anaszewski
> 


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PATCH v3 1/7] leds: convert IDE trigger to common disk trigger
  2016-06-20 21:28   ` Stephan Linz
@ 2016-06-21  7:13     ` Jacek Anaszewski
  0 siblings, 0 replies; 21+ messages in thread
From: Jacek Anaszewski @ 2016-06-21  7:13 UTC (permalink / raw)
  To: linz
  Cc: linux-leds, linux-ide, Joseph Jezak, Nico Macrionitis,
	Jörg Sommer, Richard Purdie, Tejun Heo, David S. Miller,
	linux-kernel

Hi Stephan,

On 06/20/2016 11:28 PM, Stephan Linz wrote:
> Hi Jacek,
>
> thanks a lot. Can you tell me, when the LED for-next branch will merge
> into mainline?

If everything will go as usually then the merge window will start
in four weeks.

Best regards,
Jacek Anaszewski

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PATCH v3 2/7] leds: documentation: 'ide-disk' to 'disk-activity'
  2016-06-08 22:29 ` [PATCH v3 2/7] leds: documentation: 'ide-disk' to 'disk-activity' Stephan Linz
@ 2016-06-21 15:05   ` Mark Rutland
  2016-06-22  7:55     ` Jacek Anaszewski
  0 siblings, 1 reply; 21+ messages in thread
From: Mark Rutland @ 2016-06-21 15:05 UTC (permalink / raw)
  To: Stephan Linz
  Cc: linux-leds, linux-ide, Joseph Jezak, Nico Macrionitis,
	Jörg Sommer, Rob Herring, Pawel Moll, Ian Campbell,
	Kumar Gala, Jonathan Corbet, devicetree, linux-kernel, linux-doc

On Thu, Jun 09, 2016 at 12:29:37AM +0200, Stephan Linz wrote:
> Cc: Joseph Jezak <josejx@gentoo.org>
> Cc: Nico Macrionitis <acrux@cruxppc.org>
> Cc: Jörg Sommer <joerg@alea.gnuu.de>
> Signed-off-by: Stephan Linz <linz@li-pro.net>
> ---
>  Documentation/devicetree/bindings/leds/common.txt    | 2 +-
>  Documentation/devicetree/bindings/leds/leds-gpio.txt | 2 +-
>  Documentation/laptops/asus-laptop.txt                | 2 +-
>  Documentation/leds/leds-class.txt                    | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/leds/common.txt b/Documentation/devicetree/bindings/leds/common.txt
> index af10678..1e97169 100644
> --- a/Documentation/devicetree/bindings/leds/common.txt
> +++ b/Documentation/devicetree/bindings/leds/common.txt
> @@ -26,7 +26,7 @@ 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
>       "timer" - LED flashes at a fixed, configurable rate

We should not break the binding.

Code must continue to support "ide-disk", though we can mark it
deprecated in the binding documentation, and update the in-kernel dts
files to use "disk-activity".

Thanks,
Mark.

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PATCH v3 2/7] leds: documentation: 'ide-disk' to 'disk-activity'
  2016-06-21 15:05   ` Mark Rutland
@ 2016-06-22  7:55     ` Jacek Anaszewski
  2016-06-22 10:16       ` Mark Rutland
  2016-06-22 16:05       ` Stephan Linz
  0 siblings, 2 replies; 21+ messages in thread
From: Jacek Anaszewski @ 2016-06-22  7:55 UTC (permalink / raw)
  To: Mark Rutland, Stephan Linz
  Cc: linux-leds, linux-ide, Joseph Jezak, Nico Macrionitis,
	Jörg Sommer, Rob Herring, Pawel Moll, Ian Campbell,
	Kumar Gala, Jonathan Corbet, devicetree, linux-kernel, linux-doc

On 06/21/2016 05:05 PM, Mark Rutland wrote:
> On Thu, Jun 09, 2016 at 12:29:37AM +0200, Stephan Linz wrote:
>> Cc: Joseph Jezak <josejx@gentoo.org>
>> Cc: Nico Macrionitis <acrux@cruxppc.org>
>> Cc: Jörg Sommer <joerg@alea.gnuu.de>
>> Signed-off-by: Stephan Linz <linz@li-pro.net>
>> ---
>>   Documentation/devicetree/bindings/leds/common.txt    | 2 +-
>>   Documentation/devicetree/bindings/leds/leds-gpio.txt | 2 +-
>>   Documentation/laptops/asus-laptop.txt                | 2 +-
>>   Documentation/leds/leds-class.txt                    | 2 +-
>>   4 files changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/leds/common.txt b/Documentation/devicetree/bindings/leds/common.txt
>> index af10678..1e97169 100644
>> --- a/Documentation/devicetree/bindings/leds/common.txt
>> +++ b/Documentation/devicetree/bindings/leds/common.txt
>> @@ -26,7 +26,7 @@ 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
>>        "timer" - LED flashes at a fixed, configurable rate
>
> We should not break the binding.
>
> Code must continue to support "ide-disk", though we can mark it
> deprecated in the binding documentation, and update the in-kernel dts
> files to use "disk-activity".

The code in the version 4 of the patchset supports also "ide-disk".

Stephan, could you send a new version of this patch, with preserved
"ide-disk" property, marked as deprecated?

-- 
Best regards,
Jacek Anaszewski

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PATCH v3 2/7] leds: documentation: 'ide-disk' to 'disk-activity'
  2016-06-22  7:55     ` Jacek Anaszewski
@ 2016-06-22 10:16       ` Mark Rutland
  2016-06-22 16:05       ` Stephan Linz
  1 sibling, 0 replies; 21+ messages in thread
From: Mark Rutland @ 2016-06-22 10:16 UTC (permalink / raw)
  To: Jacek Anaszewski
  Cc: Stephan Linz, linux-leds, linux-ide, Joseph Jezak,
	Nico Macrionitis, Jörg Sommer, Rob Herring, Pawel Moll,
	Ian Campbell, Kumar Gala, Jonathan Corbet, devicetree,
	linux-kernel, linux-doc

On Wed, Jun 22, 2016 at 09:55:43AM +0200, Jacek Anaszewski wrote:
> On 06/21/2016 05:05 PM, Mark Rutland wrote:
> >On Thu, Jun 09, 2016 at 12:29:37AM +0200, Stephan Linz wrote:
> >>Cc: Joseph Jezak <josejx@gentoo.org>
> >>Cc: Nico Macrionitis <acrux@cruxppc.org>
> >>Cc: Jörg Sommer <joerg@alea.gnuu.de>
> >>Signed-off-by: Stephan Linz <linz@li-pro.net>
> >>---
> >>  Documentation/devicetree/bindings/leds/common.txt    | 2 +-
> >>  Documentation/devicetree/bindings/leds/leds-gpio.txt | 2 +-
> >>  Documentation/laptops/asus-laptop.txt                | 2 +-
> >>  Documentation/leds/leds-class.txt                    | 2 +-
> >>  4 files changed, 4 insertions(+), 4 deletions(-)
> >>
> >>diff --git a/Documentation/devicetree/bindings/leds/common.txt b/Documentation/devicetree/bindings/leds/common.txt
> >>index af10678..1e97169 100644
> >>--- a/Documentation/devicetree/bindings/leds/common.txt
> >>+++ b/Documentation/devicetree/bindings/leds/common.txt
> >>@@ -26,7 +26,7 @@ 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
> >>       "timer" - LED flashes at a fixed, configurable rate
> >
> >We should not break the binding.
> >
> >Code must continue to support "ide-disk", though we can mark it
> >deprecated in the binding documentation, and update the in-kernel dts
> >files to use "disk-activity".
> 
> The code in the version 4 of the patchset supports also "ide-disk".

Ah, sorry, I missed v4.

> Stephan, could you send a new version of this patch, with preserved
> "ide-disk" property, marked as deprecated?

With that, feel free to add:

Acked-by: Mark Rutland <mark.rutland@arm.com>

Thanks,
Mark.

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PATCH v3 2/7] leds: documentation: 'ide-disk' to 'disk-activity'
  2016-06-22  7:55     ` Jacek Anaszewski
  2016-06-22 10:16       ` Mark Rutland
@ 2016-06-22 16:05       ` Stephan Linz
  2016-06-23  6:40         ` Jacek Anaszewski
  1 sibling, 1 reply; 21+ messages in thread
From: Stephan Linz @ 2016-06-22 16:05 UTC (permalink / raw)
  To: Jacek Anaszewski, Mark Rutland
  Cc: linux-leds, linux-ide, Joseph Jezak, Nico Macrionitis,
	Jörg Sommer, Rob Herring, Pawel Moll, Ian Campbell,
	Kumar Gala, Jonathan Corbet, devicetree, linux-kernel, linux-doc


[-- Attachment #1.1: Type: text/plain, Size: 2023 bytes --]

Hi Jacek,

Am 22.06.2016 um 09:55 schrieb Jacek Anaszewski:
> On 06/21/2016 05:05 PM, Mark Rutland wrote:
>> On Thu, Jun 09, 2016 at 12:29:37AM +0200, Stephan Linz wrote:
>>> Cc: Joseph Jezak <josejx@gentoo.org>
>>> Cc: Nico Macrionitis <acrux@cruxppc.org>
>>> Cc: Jörg Sommer <joerg@alea.gnuu.de>
>>> Signed-off-by: Stephan Linz <linz@li-pro.net>
>>> ---
>>>   Documentation/devicetree/bindings/leds/common.txt    | 2 +-
>>>   Documentation/devicetree/bindings/leds/leds-gpio.txt | 2 +-
>>>   Documentation/laptops/asus-laptop.txt                | 2 +-
>>>   Documentation/leds/leds-class.txt                    | 2 +-
>>>   4 files changed, 4 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/Documentation/devicetree/bindings/leds/common.txt
>>> b/Documentation/devicetree/bindings/leds/common.txt
>>> index af10678..1e97169 100644
>>> --- a/Documentation/devicetree/bindings/leds/common.txt
>>> +++ b/Documentation/devicetree/bindings/leds/common.txt
>>> @@ -26,7 +26,7 @@ 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
>>>        "timer" - LED flashes at a fixed, configurable rate
>>
>> We should not break the binding.
>>
>> Code must continue to support "ide-disk", though we can mark it
>> deprecated in the binding documentation, and update the in-kernel dts
>> files to use "disk-activity".
> 
> The code in the version 4 of the patchset supports also "ide-disk".
> 
> Stephan, could you send a new version of this patch, with preserved
> "ide-disk" property, marked as deprecated?

Yes, I can. I'll submit a new v5 patch set. You can pick out then the
right patch for the LED for-next branch, okay?


br,
Stephan

> 


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PATCH v3 2/7] leds: documentation: 'ide-disk' to 'disk-activity'
  2016-06-22 16:05       ` Stephan Linz
@ 2016-06-23  6:40         ` Jacek Anaszewski
  2016-06-23 19:38           ` [PATCH v5] " Stephan Linz
  0 siblings, 1 reply; 21+ messages in thread
From: Jacek Anaszewski @ 2016-06-23  6:40 UTC (permalink / raw)
  To: linz
  Cc: Mark Rutland, linux-leds, linux-ide, Joseph Jezak,
	Nico Macrionitis, Jörg Sommer, Rob Herring, Pawel Moll,
	Ian Campbell, Kumar Gala, Jonathan Corbet, devicetree,
	linux-kernel, linux-doc

On 06/22/2016 06:05 PM, Stephan Linz wrote:
> Hi Jacek,
>
> Am 22.06.2016 um 09:55 schrieb Jacek Anaszewski:
>> On 06/21/2016 05:05 PM, Mark Rutland wrote:
>>> On Thu, Jun 09, 2016 at 12:29:37AM +0200, Stephan Linz wrote:
>>>> Cc: Joseph Jezak <josejx@gentoo.org>
>>>> Cc: Nico Macrionitis <acrux@cruxppc.org>
>>>> Cc: Jörg Sommer <joerg@alea.gnuu.de>
>>>> Signed-off-by: Stephan Linz <linz@li-pro.net>
>>>> ---
>>>>    Documentation/devicetree/bindings/leds/common.txt    | 2 +-
>>>>    Documentation/devicetree/bindings/leds/leds-gpio.txt | 2 +-
>>>>    Documentation/laptops/asus-laptop.txt                | 2 +-
>>>>    Documentation/leds/leds-class.txt                    | 2 +-
>>>>    4 files changed, 4 insertions(+), 4 deletions(-)
>>>>
>>>> diff --git a/Documentation/devicetree/bindings/leds/common.txt
>>>> b/Documentation/devicetree/bindings/leds/common.txt
>>>> index af10678..1e97169 100644
>>>> --- a/Documentation/devicetree/bindings/leds/common.txt
>>>> +++ b/Documentation/devicetree/bindings/leds/common.txt
>>>> @@ -26,7 +26,7 @@ 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
>>>>         "timer" - LED flashes at a fixed, configurable rate
>>>
>>> We should not break the binding.
>>>
>>> Code must continue to support "ide-disk", though we can mark it
>>> deprecated in the binding documentation, and update the in-kernel dts
>>> files to use "disk-activity".
>>
>> The code in the version 4 of the patchset supports also "ide-disk".
>>
>> Stephan, could you send a new version of this patch, with preserved
>> "ide-disk" property, marked as deprecated?
>
> Yes, I can. I'll submit a new v5 patch set. You can pick out then the
> right patch for the LED for-next branch, okay?

You don't need to submit whole patch set, only the affected patch.

-- 
Best regards,
Jacek Anaszewski

^ permalink raw reply	[flat|nested] 21+ messages in thread

* [PATCH v5] leds: documentation: 'ide-disk' to 'disk-activity'
  2016-06-23  6:40         ` Jacek Anaszewski
@ 2016-06-23 19:38           ` Stephan Linz
  2016-06-24  6:50             ` Jacek Anaszewski
  0 siblings, 1 reply; 21+ messages in thread
From: Stephan Linz @ 2016-06-23 19:38 UTC (permalink / raw)
  To: linux-leds, linux-ide
  Cc: Stephan Linz, Joseph Jezak, Jörg Sommer, Mark Rutland,
	Jacek Anaszewski, Richard Purdie, Rob Herring, Jonathan Corbet,
	devicetree, linux-kernel, linux-doc

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 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

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PATCH v5] leds: documentation: 'ide-disk' to 'disk-activity'
  2016-06-23 19:38           ` [PATCH v5] " Stephan Linz
@ 2016-06-24  6:50             ` Jacek Anaszewski
  2016-06-24 17:18               ` Stephan Linz
  0 siblings, 1 reply; 21+ messages in thread
From: Jacek Anaszewski @ 2016-06-24  6:50 UTC (permalink / raw)
  To: Stephan Linz
  Cc: linux-leds, linux-ide, Joseph Jezak, Jörg Sommer,
	Mark Rutland, Richard Purdie, Rob Herring, Jonathan Corbet,
	devicetree, linux-kernel, linux-doc

Hi Stephan,

On 06/23/2016 09:38 PM, Stephan Linz wrote:
> 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 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

I'd like to reorganize this change.

I think that the two affected properties should be placed next to
each other. I'd also remove the remark about ide-disk at disk-activity,
since we're leaving ide-disk, with added reference to disk-activity.

How about following:

+     "disk-activity" - LED indicates disk activity
-     "ide-disk" - 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.
>
>


-- 
Best regards,
Jacek Anaszewski

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PATCH v5] leds: documentation: 'ide-disk' to 'disk-activity'
  2016-06-24  6:50             ` Jacek Anaszewski
@ 2016-06-24 17:18               ` Stephan Linz
  0 siblings, 0 replies; 21+ messages in thread
From: Stephan Linz @ 2016-06-24 17:18 UTC (permalink / raw)
  To: Jacek Anaszewski
  Cc: linux-leds, linux-ide, Joseph Jezak, Jörg Sommer,
	Mark Rutland, Richard Purdie, Rob Herring, Jonathan Corbet,
	devicetree, linux-kernel, linux-doc


[-- Attachment #1.1: Type: text/plain, Size: 5111 bytes --]

Hi Jacek,

thanks for your help. The new patch is on the way (v6).


br,
Stephan

Am 24.06.2016 um 08:50 schrieb Jacek Anaszewski:
> Hi Stephan,
> 
> On 06/23/2016 09:38 PM, Stephan Linz wrote:
>> 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 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
> 
> I'd like to reorganize this change.
> 
> I think that the two affected properties should be placed next to
> each other. I'd also remove the remark about ide-disk at disk-activity,
> since we're leaving ide-disk, with added reference to disk-activity.
> 
> How about following:
> 
> +     "disk-activity" - LED indicates disk activity
> -     "ide-disk" - 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.
>>
>>
> 
> 


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 21+ messages in thread

end of thread, other threads:[~2016-06-24 17:19 UTC | newest]

Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-08 22:29 [PATCH v3 1/7] leds: convert IDE trigger to common disk trigger Stephan Linz
2016-06-08 22:29 ` [PATCH v3 2/7] leds: documentation: 'ide-disk' to 'disk-activity' Stephan Linz
2016-06-21 15:05   ` Mark Rutland
2016-06-22  7:55     ` Jacek Anaszewski
2016-06-22 10:16       ` Mark Rutland
2016-06-22 16:05       ` Stephan Linz
2016-06-23  6:40         ` Jacek Anaszewski
2016-06-23 19:38           ` [PATCH v5] " Stephan Linz
2016-06-24  6:50             ` Jacek Anaszewski
2016-06-24 17:18               ` Stephan Linz
2016-06-08 22:29 ` [PATCH v3 3/7] powerpc: use the new LED disk activity trigger Stephan Linz
2016-06-08 22:29 ` [PATCH v3 4/7] arm: " Stephan Linz
2016-06-09  7:18   ` Gregory CLEMENT
2016-06-08 22:29 ` [PATCH v3 5/7] mips: " Stephan Linz
2016-06-08 22:29 ` [PATCH v3 6/7] parisc: " Stephan Linz
2016-06-08 22:29 ` [PATCH v3 7/7] unicore32: " Stephan Linz
2016-06-09  7:29 ` [PATCH v3 1/7] leds: convert IDE trigger to common disk trigger Jacek Anaszewski
2016-06-09 22:27   ` Stephan Linz
2016-06-20  8:36 ` Jacek Anaszewski
2016-06-20 21:28   ` Stephan Linz
2016-06-21  7:13     ` Jacek Anaszewski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).