Messages in this thread | | | Date | Mon, 13 Jun 2016 09:53:07 +0200 | From | Jacek Anaszewski <> | Subject | Re: [PATCH v4 5/7] mips: use the new LED disk activity trigger |
| |
Hi Ralf,
For consistency reasons this patch should be merged through LED tree, but I need an ack for this.
Thanks, Jacek Anaszewski
On 06/10/2016 08:00 AM, Stephan Linz wrote: > - 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", > }; > >
-- Best regards, Jacek Anaszewski
| |