* [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 ` Stephan Linz
2016-06-13 7:42 ` Jacek Anaszewski
` (2 more replies)
0 siblings, 3 replies; 5+ 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] 5+ 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: use the new LED disk activity trigger 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; 5+ 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] 5+ 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; 5+ 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] 5+ 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: use the new LED disk activity trigger 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; 5+ 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] 5+ 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: use the new LED disk activity trigger 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; 5+ 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] 5+ messages in thread
end of thread, other threads:[~2016-06-16 7:16 UTC | newest]
Thread overview: 5+ 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 4/7] arm: use the new LED disk activity trigger 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).