aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalph Sennhauser <ralph.sennhauser@gmail.com>2017-03-30 12:54:04 -0400
committerGregory CLEMENT <gregory.clement@free-electrons.com>2017-04-05 11:25:17 -0400
commit34240c26d1d7b4365d4d0a8d231b244eb396c8dc (patch)
treec026baedda2adea83f70ab65ebbdc3da0531ab0a
parent485a9d2cfa8d4f5f86a1432136e998391cfd130c (diff)
ARM: dts: armada-385-linksys: disk-activity trigger for all
Commit a4ee7e18d808 ("ARM: dts: armada: Add default trigger for sata led") adds the default trigger to individual boards, move it to armada-385-linksys.dtsi which effectively enables the definition for the WRT1900ACS (Shelby) as well as for future boards. Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
-rw-r--r--arch/arm/boot/dts/armada-385-linksys-caiman.dts1
-rw-r--r--arch/arm/boot/dts/armada-385-linksys-cobra.dts1
-rw-r--r--arch/arm/boot/dts/armada-385-linksys.dtsi1
3 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/armada-385-linksys-caiman.dts b/arch/arm/boot/dts/armada-385-linksys-caiman.dts
index a1b6e68144f3..f3cee918d285 100644
--- a/arch/arm/boot/dts/armada-385-linksys-caiman.dts
+++ b/arch/arm/boot/dts/armada-385-linksys-caiman.dts
@@ -109,7 +109,6 @@
109 109
110 sata { 110 sata {
111 label = "caiman:white:sata"; 111 label = "caiman:white:sata";
112 linux,default-trigger = "disk-activity";
113 }; 112 };
114 }; 113 };
115}; 114};
diff --git a/arch/arm/boot/dts/armada-385-linksys-cobra.dts b/arch/arm/boot/dts/armada-385-linksys-cobra.dts
index a1a75af8c694..111071860559 100644
--- a/arch/arm/boot/dts/armada-385-linksys-cobra.dts
+++ b/arch/arm/boot/dts/armada-385-linksys-cobra.dts
@@ -109,7 +109,6 @@
109 109
110 sata { 110 sata {
111 label = "cobra:white:sata"; 111 label = "cobra:white:sata";
112 linux,default-trigger = "disk-activity";
113 }; 112 };
114 }; 113 };
115}; 114};
diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi
index aa0d225ecfbf..2306c45685b1 100644
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
@@ -320,6 +320,7 @@
320 sata { 320 sata {
321 gpios = <&gpio1 22 GPIO_ACTIVE_LOW>; 321 gpios = <&gpio1 22 GPIO_ACTIVE_LOW>;
322 default-state = "off"; 322 default-state = "off";
323 linux,default-trigger = "disk-activity";
323 }; 324 };
324 }; 325 };
325 326