diff options
| author | Ansuel Smith <ansuelsmth@gmail.com> | 2017-03-07 18:44:29 +0100 |
|---|---|---|
| committer | Mathias Kresin <dev@kresin.me> | 2017-03-08 19:06:04 +0100 |
| commit | 2261c9cc7715e6d590952989ebef96e08cc019fc (patch) | |
| tree | 236be118f0f5e5ba2871cc02c89004c770e86309 | |
| parent | 3d0bd150565767f395eae333bcbca7bbe89edf48 (diff) | |
| download | upstream-2261c9cc7715e6d590952989ebef96e08cc019fc.tar.gz upstream-2261c9cc7715e6d590952989ebef96e08cc019fc.tar.bz2 upstream-2261c9cc7715e6d590952989ebef96e08cc019fc.zip | |
mvebu: add default sata trigger
Change dts file to add default sata trigger to sata led.
Backport upstream accepted patch to add sata trigger to device tree
source files already upstreamed.
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
[backport upstream accepted patch]
Signed-off-by: Mathias Kresin <dev@kresin.me>
3 files changed, 60 insertions, 0 deletions
diff --git a/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-linksys-rango.dts b/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-linksys-rango.dts index 804ba0d6aa..61f4592137 100644 --- a/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-linksys-rango.dts +++ b/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-linksys-rango.dts @@ -326,6 +326,7 @@ sata { label = "rango:white:sata"; gpios = <&gpio0 21 GPIO_ACTIVE_LOW>; + linux,default-trigger = "disk-activity"; }; wlan_2g { diff --git a/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-linksys-shelby.dts b/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-linksys-shelby.dts index c7a8ddd7f9..f8dd193ef0 100644 --- a/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-linksys-shelby.dts +++ b/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-linksys-shelby.dts @@ -109,6 +109,7 @@ sata { label = "shelby:white:sata"; + linux,default-trigger = "disk-activity"; }; }; }; diff --git a/target/linux/mvebu/patches-4.9/004-add_sata_disk_activity_trigger.patch b/target/linux/mvebu/patches-4.9/004-add_sata_disk_activity_trigger.patch new file mode 100644 index 0000000000..8a18cfa278 --- /dev/null +++ b/target/linux/mvebu/patches-4.9/004-add_sata_disk_activity_trigger.patch @@ -0,0 +1,58 @@ +From 172230195068703b78ad5733a09492f5d6814c09 Mon Sep 17 00:00:00 2001 +From: Ansuel Smith <ansuelsmth@gmail.com> +Date: Tue, 28 Feb 2017 14:15:50 +0100 +Subject: [PATCH] ARM: dts: armada: Add default trigger for sata led + +In others board we have the sata led set to function +with the sata led trigger by default. +This patch makes the same for these board that have sata +led but get disabled by not associating it to any trigger. + +Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com> +Acked-by: Jason Cooper <jason@lakedaemon.net> +Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> +--- + arch/arm/boot/dts/armada-385-linksys-caiman.dts | 1 + + arch/arm/boot/dts/armada-385-linksys-cobra.dts | 1 + + arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/arch/arm/boot/dts/armada-385-linksys-caiman.dts b/arch/arm/boot/dts/armada-385-linksys-caiman.dts +index f3cee91..a1b6e68 100644 +--- a/arch/arm/boot/dts/armada-385-linksys-caiman.dts ++++ b/arch/arm/boot/dts/armada-385-linksys-caiman.dts +@@ -315,6 +315,7 @@ + + sata { + label = "caiman:white:sata"; ++ linux,default-trigger = "disk-activity"; + }; + }; + }; +diff --git a/arch/arm/boot/dts/armada-385-linksys-cobra.dts b/arch/arm/boot/dts/armada-385-linksys-cobra.dts +index 1110718..a1a75af 100644 +--- a/arch/arm/boot/dts/armada-385-linksys-cobra.dts ++++ b/arch/arm/boot/dts/armada-385-linksys-cobra.dts +@@ -315,6 +315,7 @@ + + sata { + label = "cobra:white:sata"; ++ linux,default-trigger = "disk-activity"; + }; + }; + }; +diff --git a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts +index 42ea876..3744ba3 100644 +--- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts ++++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts +@@ -266,6 +266,7 @@ + esata@4 { + label = "mamba:white:esata"; + reg = <0x4>; ++ linux,default-trigger = "disk-activity"; + }; + + usb2@5 { +-- +2.9.3 + |