* [PATCH v4 2/7] leds: documentation: 'ide-disk' to 'disk-activity' [not found] <20160610060021.12382-1-linz@li-pro.net> @ 2016-06-10 5:59 ` Stephan Linz 2016-06-10 18:07 ` Rob Herring [not found] ` <20160610060021.12382-1-linz-LlUBiLVY8XKsTnJN9+BGXg@public.gmane.org> 2016-06-10 5:59 ` [PATCH v4 4/7] arm: " Stephan Linz 2 siblings, 1 reply; 9+ messages in thread From: Stephan Linz @ 2016-06-10 5:59 UTC (permalink / raw) To: linux-leds, linux-ide Cc: Stephan Linz, Joseph Jezak, 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: Jörg Sommer <joerg@alea.gnuu.de> Signed-off-by: Stephan Linz <linz@li-pro.net> --- Documentation/devicetree/bindings/leds/common.txt | 3 ++- Documentation/devicetree/bindings/leds/leds-gpio.txt | 4 ++-- Documentation/laptops/asus-laptop.txt | 2 +- Documentation/leds/leds-class.txt | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Documentation/devicetree/bindings/leds/common.txt b/Documentation/devicetree/bindings/leds/common.txt index af10678..4c08a01 100644 --- a/Documentation/devicetree/bindings/leds/common.txt +++ b/Documentation/devicetree/bindings/leds/common.txt @@ -26,7 +26,8 @@ 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, the old name "ide-disk" is + still valid for backward compatibility "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 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 related [flat|nested] 9+ messages in thread
* Re: [PATCH v4 2/7] leds: documentation: 'ide-disk' to 'disk-activity' 2016-06-10 5:59 ` [PATCH v4 2/7] leds: documentation: 'ide-disk' to 'disk-activity' Stephan Linz @ 2016-06-10 18:07 ` Rob Herring 0 siblings, 0 replies; 9+ messages in thread From: Rob Herring @ 2016-06-10 18:07 UTC (permalink / raw) To: Stephan Linz Cc: linux-leds, linux-ide, Joseph Jezak, Jörg Sommer, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Jonathan Corbet, devicetree, linux-kernel, linux-doc On Fri, Jun 10, 2016 at 07:59:57AM +0200, Stephan Linz wrote: > Cc: Joseph Jezak <josejx@gentoo.org> > Cc: Jörg Sommer <joerg@alea.gnuu.de> > Signed-off-by: Stephan Linz <linz@li-pro.net> > --- > Documentation/devicetree/bindings/leds/common.txt | 3 ++- > Documentation/devicetree/bindings/leds/leds-gpio.txt | 4 ++-- > Documentation/laptops/asus-laptop.txt | 2 +- > Documentation/leds/leds-class.txt | 2 +- > 4 files changed, 6 insertions(+), 5 deletions(-) I'm not copied on the kernel change, but as long as the kernel still handles ide-disk as you indicated: Acked-by: Rob Herring <robh@kernel.org> ^ permalink raw reply [flat|nested] 9+ messages in thread
[parent not found: <20160610060021.12382-1-linz-LlUBiLVY8XKsTnJN9+BGXg@public.gmane.org>]
* [PATCH v4 3/7] powerpc: use the new LED disk activity trigger [not found] ` <20160610060021.12382-1-linz-LlUBiLVY8XKsTnJN9+BGXg@public.gmane.org> @ 2016-06-10 5:59 ` Stephan Linz 2016-06-13 7:46 ` Jacek Anaszewski 0 siblings, 1 reply; 9+ messages in thread From: Stephan Linz @ 2016-06-10 5:59 UTC (permalink / raw) To: linux-leds-u79uwXL29TY76Z2rM5mHXA, linux-ide-u79uwXL29TY76Z2rM5mHXA Cc: Stephan Linz, Joseph Jezak, Jörg Sommer, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman, devicetree-u79uwXL29TY76Z2rM5mHXA, linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ, linux-kernel-u79uwXL29TY76Z2rM5mHXA - dts: rename 'ide-disk' to 'disk-activity' - defconfig: rename 'ADB_PMU_LED_IDE' to 'ADB_PMU_LED_DISK' Cc: Joseph Jezak <josejx-aBrp7R+bbdUdnm+yROfE0A@public.gmane.org> Cc: Jörg Sommer <joerg-au2b9oQwubsjnolme5KbmQ@public.gmane.org> Signed-off-by: Stephan Linz <linz-LlUBiLVY8XKsTnJN9+BGXg@public.gmane.org> --- 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 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v4 3/7] powerpc: use the new LED disk activity trigger 2016-06-10 5:59 ` [PATCH v4 3/7] powerpc: use the new LED disk activity trigger Stephan Linz @ 2016-06-13 7:46 ` Jacek Anaszewski 0 siblings, 0 replies; 9+ messages in thread From: Jacek Anaszewski @ 2016-06-13 7:46 UTC (permalink / raw) To: Stephan Linz Cc: linux-leds, linux-ide, Joseph Jezak, Jörg Sommer, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman, devicetree, linuxppc-dev, linux-kernel Hi all, For consistency reasons this patch should be merged through LED tree, but I need an ack from relevant maintainer. Benjamin, Michael, Paul? Thanks, Jacek Anaszewski On 06/10/2016 07:59 AM, Stephan Linz wrote: > - 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: 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, > }; > -- Best regards, Jacek Anaszewski ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v4 4/7] arm: use the new LED disk activity trigger [not found] <20160610060021.12382-1-linz@li-pro.net> 2016-06-10 5:59 ` [PATCH v4 2/7] leds: documentation: 'ide-disk' to 'disk-activity' Stephan Linz [not found] ` <20160610060021.12382-1-linz-LlUBiLVY8XKsTnJN9+BGXg@public.gmane.org> @ 2016-06-10 5:59 ` Stephan Linz 2016-06-13 7:42 ` Jacek Anaszewski ` (2 more replies) 2 siblings, 3 replies; 9+ messages in thread From: Stephan Linz @ 2016-06-10 5:59 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 related [flat|nested] 9+ messages in thread
* Re: [PATCH v4 4/7] arm: use the new LED disk activity trigger 2016-06-10 5:59 ` [PATCH v4 4/7] arm: " Stephan Linz @ 2016-06-13 7:42 ` Jacek Anaszewski 2016-06-13 7:49 ` Tony Lindgren 2016-06-13 8:12 ` Sekhar Nori 2016-06-16 7:16 ` Robert Jarzmik 2 siblings, 1 reply; 9+ messages in thread From: Jacek Anaszewski @ 2016-06-13 7:42 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, Gregory Clement, Sebastian Hesselbarth, Sekhar Nori, Kevin Hilman, Daniel Mack, Haojian Zhuang, Robert Jarzmik, linux-omap, devicetree, linux-kernel Hi all, For consistency reasons this patch should be merged through LED tree, but I need an ack from relevant maintainer. Benoit, Tony? Thanks, Jacek Anaszewski On 06/10/2016 07:59 AM, Stephan Linz 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> > --- > 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, > }, > }; > ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v4 4/7] arm: use the new LED disk activity trigger 2016-06-13 7:42 ` Jacek Anaszewski @ 2016-06-13 7:49 ` Tony Lindgren 0 siblings, 0 replies; 9+ messages in thread From: Tony Lindgren @ 2016-06-13 7:49 UTC (permalink / raw) To: Jacek Anaszewski Cc: Stephan Linz, linux-leds, linux-ide, Benoît Cousson, 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 * Jacek Anaszewski <j.anaszewski@samsung.com> [160613 00:44]: > Hi all, > > For consistency reasons this patch should be merged through LED tree, > but I need an ack from relevant maintainer. Benoit, Tony? Seems OK to me: Acked-by: Tony Lindgren <tony@atomide.com> ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v4 4/7] arm: use the new LED disk activity trigger 2016-06-10 5:59 ` [PATCH v4 4/7] arm: " Stephan Linz 2016-06-13 7:42 ` Jacek Anaszewski @ 2016-06-13 8:12 ` Sekhar Nori 2016-06-16 7:16 ` Robert Jarzmik 2 siblings, 0 replies; 9+ messages in thread From: Sekhar Nori @ 2016-06-13 8:12 UTC (permalink / raw) To: Stephan Linz, linux-leds, linux-ide Cc: 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, Kevin Hilman, Daniel Mack, Haojian Zhuang, Robert Jarzmik, linux-omap, devicetree, linux-kernel On Friday 10 June 2016 11:29 AM, Stephan Linz 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> > --- > 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 +- For the mach-davinci change: Acked-by: Sekhar Nori <nsekhar@ti.com> Thanks, Sekhar ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v4 4/7] arm: use the new LED disk activity trigger 2016-06-10 5:59 ` [PATCH v4 4/7] arm: " Stephan Linz 2016-06-13 7:42 ` Jacek Anaszewski 2016-06-13 8:12 ` Sekhar Nori @ 2016-06-16 7:16 ` Robert Jarzmik 2 siblings, 0 replies; 9+ messages in thread From: Robert Jarzmik @ 2016-06-16 7:16 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, Gregory Clement, Sebastian Hesselbarth, Sekhar Nori, Kevin Hilman, Daniel Mack, Haojian Zhuang, linux-omap, devicetree, linux-kernel Stephan Linz <linz@li-pro.net> writes: > - 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(-) For mach-pxa: Acked-by: Robert Jarzmik <robert.jarzmik@free.fr> Cheers. -- Robert ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2016-06-16 7:16 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20160610060021.12382-1-linz@li-pro.net>
2016-06-10 5:59 ` [PATCH v4 2/7] leds: documentation: 'ide-disk' to 'disk-activity' Stephan Linz
2016-06-10 18:07 ` Rob Herring
[not found] ` <20160610060021.12382-1-linz-LlUBiLVY8XKsTnJN9+BGXg@public.gmane.org>
2016-06-10 5:59 ` [PATCH v4 3/7] powerpc: use the new LED disk activity trigger Stephan Linz
2016-06-13 7:46 ` Jacek Anaszewski
2016-06-10 5:59 ` [PATCH v4 4/7] arm: " Stephan Linz
2016-06-13 7:42 ` Jacek Anaszewski
2016-06-13 7:49 ` Tony Lindgren
2016-06-13 8:12 ` Sekhar Nori
2016-06-16 7:16 ` Robert Jarzmik
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).