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>

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 804ba0d6aa73399a91c10624037d591a5ca7519d..61f45921375892befdf2de92eb3bd1d04c508384 100644 (file)
--- 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 c7a8ddd7f9a55487c72d27e6f9b0bed732858ce2..f8dd193ef047d3385a1bc85f2ae04e892e69ca4e 100644 (file)
--- 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 (file)
index 0000000..8a18cfa
--- /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
+