Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5808227 authored by Stephan Linz's avatar Stephan Linz Committed by Jacek Anaszewski
Browse files

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: default avatarStephan Linz <linz@li-pro.net>
Acked-by: default avatarSekhar Nori <nsekhar@ti.com>
Acked-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarJacek Anaszewski <j.anaszewski@samsung.com>
parent 83e2c70e

arch/arm/boot/dts/am57xx-beagle-x15.dts

+1 −1
Original line number Original line Diff line number Diff line
@@ -86,7 +86,7 @@ 
		led@3 {

		led@3 {

			label = "beagle-x15:usr3";

			label = "beagle-x15:usr3";

			gpios = <&gpio7 15 GPIO_ACTIVE_HIGH>;

			gpios = <&gpio7 15 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "ide-disk";

			linux,default-trigger = "disk-activity";

			default-state = "off";

			default-state = "off";

		};

		};

	};

	};

arch/arm/boot/dts/kirkwood-ns2lite.dts

+1 −1
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ 
		blue-sata {

		blue-sata {

			label = "ns2:blue:sata";

			label = "ns2:blue:sata";

			gpios = <&gpio0 30 GPIO_ACTIVE_LOW>;

			gpios = <&gpio0 30 GPIO_ACTIVE_LOW>;

			linux,default-trigger = "ide-disk";

			linux,default-trigger = "disk-activity";

		};

		};

	};

	};

};

};

arch/arm/boot/dts/kirkwood-topkick.dts

+1 −1
Original line number Original line Diff line number Diff line
@@ -129,7 +129,7 @@ 
		disk {

		disk {

			label = "topkick:yellow:disk";

			label = "topkick:yellow:disk";

			gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;

			gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;

			linux,default-trigger = "ide-disk";

			linux,default-trigger = "disk-activity";

		};

		};

		system2 {

		system2 {

			label = "topkick:red:system";

			label = "topkick:red:system";

arch/arm/configs/collie_defconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -76,7 +76,7 @@ CONFIG_LEDS_CLASS=y 
CONFIG_LEDS_LOCOMO=y

CONFIG_LEDS_LOCOMO=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_LEDS_TRIGGER_IDE_DISK=y

CONFIG_LEDS_TRIGGER_DISK=y

# CONFIG_DNOTIFY is not set

# CONFIG_DNOTIFY is not set

CONFIG_VFAT_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_TMPFS=y

arch/arm/configs/ixp4xx_defconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -180,7 +180,7 @@ CONFIG_LEDS_FSG=y 
CONFIG_LEDS_GPIO=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_TIMER=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_HEARTBEAT=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_ISL1208=y

CONFIG_RTC_DRV_ISL1208=y