aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/oxnas
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2014-12-12 20:24:33 +0000
committerJohn Crispin <blogic@openwrt.org>2014-12-12 20:24:33 +0000
commit1c40c5b7adf06e76a2c31e56fa9d851675a999d3 (patch)
treeef7f717215ae4693504976747db434f1a4ab20cf /target/linux/oxnas
parent5f5e4cf3eb367db583cee31334dcbf18d7bd67b7 (diff)
downloadupstream-1c40c5b7adf06e76a2c31e56fa9d851675a999d3.tar.gz
upstream-1c40c5b7adf06e76a2c31e56fa9d851675a999d3.tar.bz2
upstream-1c40c5b7adf06e76a2c31e56fa9d851675a999d3.zip
oxnas: use libata ledtrig support for kd20 hdd leds
Signed-off-by: Daniel Golle <daniel@makrotopia.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43675 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/oxnas')
-rw-r--r--target/linux/oxnas/config-3.141
-rw-r--r--target/linux/oxnas/config-3.181
-rw-r--r--target/linux/oxnas/files/arch/arm/boot/dts/ox820-kd20.dts2
-rw-r--r--target/linux/oxnas/files/arch/arm/mach-oxnas/Kconfig1
4 files changed, 5 insertions, 0 deletions
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.