arm: use the new LED disk activity trigger

- 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>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>

diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts
index 81d6c3033b51028a01d06c64e9a514db3af0271c..c4d04c5293b90b01c9dfcaa8185a3755d34e7166 100644 (file)
--- 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 1f2ca60d8b3d46f283672b93af35772a852797c9..2c661add0cc031e5e2a35f08878aad209f289634 100644 (file)
--- 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 f5c8c0dd41dc82f7e7671f7713182186b250ec8e..1e9a72100a450dacb3ebcc8d5d44460708b8f3d2 100644 (file)
--- 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 6c56ad086c7ca8deed6ffa75aeb86925c8e83150..52dbad5619e276825297acd283e628c47816a121 100644 (file)
--- 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 24636cfdf6dfbb6ba229b36b6c12d695cdd169fb..cf4918a2c51f7cf28529a718dc0d60c531043d89 100644 (file)
--- 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 68cc099078289262d938e974b7aa7ad77ac12ddc..ab47b8eb1b1502fd05bed8efdefeee0a5aa4573d 100644 (file)
--- 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 209aecb0df68ce91064224bc8a0253c2016c5b96..4dfb995048103b8bff965b6119f3665e54887a40 100644 (file)
--- 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 bd7cd8b6a286ec3713145c3713e861c7419bd25e..1080580b1343d1bdf164230bff82d6fed2e8b0d5 100644 (file)
--- 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,
        },
 };