[OpenWrt-Devel,2/2] oxnas: use libata ledtrig support for kd20 hdd leds
diff mbox

Message ID 20141212160756.GA13096@makrotopia.org
State Accepted
Delegated to: John Crispin
Headers show

Commit Message

Daniel Golle Dec. 12, 2014, 4:08 p.m. UTC
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
 target/linux/oxnas/config-3.14                            | 1 +
 target/linux/oxnas/config-3.18                            | 1 +
 target/linux/oxnas/files/arch/arm/boot/dts/ox820-kd20.dts | 2 ++
 target/linux/oxnas/files/arch/arm/mach-oxnas/Kconfig      | 1 +
 4 files changed, 5 insertions(+)

Patch
diff mbox

diff --git a/target/linux/oxnas/config-3.14 b/target/linux/oxnas/config-3.14
index 473a2bf..a065363 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 56dce65..b9172d9 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 2db15ea..79442be 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 eb96f1b..6bdf3f6 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.