From: John Crispin <john@openwrt.org>
Date: Fri, 12 Dec 2014 20:24:33 +0000 (+0000)
Subject: oxnas: use libata ledtrig support for kd20 hdd leds
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=118534ea39f52feafb0b89e10ed76d4919f7a64d;p=openwrt%2Fstaging%2Flinusw.git

oxnas: use libata ledtrig support for kd20 hdd leds

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 43675
---

diff --git a/target/linux/oxnas/config-3.14 b/target/linux/oxnas/config-3.14
index 473a2bf75b..a065363fb3 100644
--- a/target/linux/oxnas/config-3.14
+++ b/target/linux/oxnas/config-3.14
@@ -345,3 +345,4 @@ CONFIG_ZBOOT_ROM_TEXT=0
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZONE_DMA_FLAG=0
+CONFIG_ATA_LEDS=y
diff --git a/target/linux/oxnas/config-3.18 b/target/linux/oxnas/config-3.18
index 56dce65caf..b9172d98c6 100644
--- a/target/linux/oxnas/config-3.18
+++ b/target/linux/oxnas/config-3.18
@@ -364,3 +364,4 @@ CONFIG_ZBOOT_ROM_TEXT=0
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZONE_DMA_FLAG=0
+CONFIG_ATA_LEDS=y
diff --git a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-kd20.dts b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-kd20.dts
index 2db15ea5dc..79442be346 100644
--- a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-kd20.dts
+++ b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-kd20.dts
@@ -107,6 +107,7 @@
 		hdd1blue {
 			label = "kd20:blue:hdd1";
 			gpios = <&GPIOA 27 0>;
+			linux,default-trigger = "ata1";
 		};
 		hdd1red {
 			label = "kd20:red:hdd1";
@@ -115,6 +116,7 @@
 		hdd2blue {
 			label = "kd20:blue:hdd2";
 			gpios = <&GPIOB 6 0>;
+			linux,default-trigger = "ata2";
 		};
 		hdd2red {
 			label = "kd20:red:hdd2";
diff --git a/target/linux/oxnas/files/arch/arm/mach-oxnas/Kconfig b/target/linux/oxnas/files/arch/arm/mach-oxnas/Kconfig
index eb96f1b74c..6bdf3f6efd 100644
--- a/target/linux/oxnas/files/arch/arm/mach-oxnas/Kconfig
+++ b/target/linux/oxnas/files/arch/arm/mach-oxnas/Kconfig
@@ -18,6 +18,7 @@ config MACH_OX820
 	select PINCTRL_OXNAS
 	select PINCTRL
 	select RESET_CONTROLLER_OXNAS
+	select ARCH_WANT_LIBATA_LEDS
 	help
 	  Include support for the ox820 platform.