tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Stephan Linz and committed by
Jacek Anaszewski e5808227 83e2c70e

+8 -8
+1 -1
arch/arm/boot/dts/am57xx-beagle-x15.dts
··· 86 86 led@3 { 87 87 label = "beagle-x15:usr3"; 88 88 gpios = <&gpio7 15 GPIO_ACTIVE_HIGH>; 89 - linux,default-trigger = "ide-disk"; 89 + linux,default-trigger = "disk-activity"; 90 90 default-state = "off"; 91 91 }; 92 92 };
+1 -1
arch/arm/boot/dts/kirkwood-ns2lite.dts
··· 26 26 blue-sata { 27 27 label = "ns2:blue:sata"; 28 28 gpios = <&gpio0 30 GPIO_ACTIVE_LOW>; 29 - linux,default-trigger = "ide-disk"; 29 + linux,default-trigger = "disk-activity"; 30 30 }; 31 31 }; 32 32 };
+1 -1
arch/arm/boot/dts/kirkwood-topkick.dts
··· 129 129 disk { 130 130 label = "topkick:yellow:disk"; 131 131 gpios = <&gpio0 21 GPIO_ACTIVE_LOW>; 132 - linux,default-trigger = "ide-disk"; 132 + linux,default-trigger = "disk-activity"; 133 133 }; 134 134 system2 { 135 135 label = "topkick:red:system";
+1 -1
arch/arm/configs/collie_defconfig
··· 76 76 CONFIG_LEDS_LOCOMO=y 77 77 CONFIG_LEDS_TRIGGERS=y 78 78 CONFIG_LEDS_TRIGGER_TIMER=y 79 - CONFIG_LEDS_TRIGGER_IDE_DISK=y 79 + CONFIG_LEDS_TRIGGER_DISK=y 80 80 # CONFIG_DNOTIFY is not set 81 81 CONFIG_VFAT_FS=y 82 82 CONFIG_TMPFS=y
+1 -1
arch/arm/configs/ixp4xx_defconfig
··· 180 180 CONFIG_LEDS_GPIO=y 181 181 CONFIG_LEDS_TRIGGERS=y 182 182 CONFIG_LEDS_TRIGGER_TIMER=y 183 - CONFIG_LEDS_TRIGGER_IDE_DISK=y 183 + CONFIG_LEDS_TRIGGER_DISK=y 184 184 CONFIG_LEDS_TRIGGER_HEARTBEAT=y 185 185 CONFIG_RTC_CLASS=y 186 186 CONFIG_RTC_DRV_ISL1208=y
+1 -1
arch/arm/mach-davinci/board-dm644x-evm.c
··· 288 288 { .name = "DS2", .active_low = 1, 289 289 .default_trigger = "mmc0", }, 290 290 { .name = "DS1", .active_low = 1, 291 - .default_trigger = "ide-disk", }, 291 + .default_trigger = "disk-activity", }, 292 292 }; 293 293 294 294 static const struct gpio_led_platform_data evm_led_data = {
+1 -1
arch/arm/mach-omap1/board-osk.c
··· 172 172 * Also, D9 requires non-battery power. 173 173 */ 174 174 { .gpio = OSK_TPS_GPIO_LED_D9, .name = "d9", 175 - .default_trigger = "ide-disk", }, 175 + .default_trigger = "disk-activity", }, 176 176 { .gpio = OSK_TPS_GPIO_LED_D2, .name = "d2", }, 177 177 { .gpio = OSK_TPS_GPIO_LED_D3, .name = "d3", .active_low = 1, 178 178 .default_trigger = "heartbeat", },
+1 -1
arch/arm/mach-pxa/spitz.c
··· 464 464 }, 465 465 { 466 466 .name = "spitz:green:hddactivity", 467 - .default_trigger = "ide-disk", 467 + .default_trigger = "disk-activity", 468 468 .gpio = SPITZ_GPIO_LED_GREEN, 469 469 }, 470 470 };