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>

diff --git a/arch/arm/boot/dts/armada-385-linksys-caiman.dts b/arch/arm/boot/dts/armada-385-linksys-caiman.dts
index a1b6e68144f30ae2374dc0d1a8c214b6661af563..f3cee918d28500de6498c5cdb9868fe924fd6cbe 100644 (file)
--- a/arch/arm/boot/dts/armada-385-linksys-caiman.dts
+++ b/arch/arm/boot/dts/armada-385-linksys-caiman.dts
@@ -109,7 +109,6 @@
 
                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 a1a75af8c694015bcde4b8e0706f9200843780a6..11107186055980d9831b07890cdb14846befd599 100644 (file)
--- a/arch/arm/boot/dts/armada-385-linksys-cobra.dts
+++ b/arch/arm/boot/dts/armada-385-linksys-cobra.dts
@@ -109,7 +109,6 @@
 
                sata {
                        label = "cobra:white:sata";
-                       linux,default-trigger = "disk-activity";
                };
        };
 };

diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi
index aa0d225ecfbf2aa0fc5f312bd39b3fa7d8bbd055..2306c45685b1f14788e4e5f3e0927a7724ca554d 100644 (file)
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
@@ -320,6 +320,7 @@
                sata {
                        gpios = <&gpio1 22 GPIO_ACTIVE_LOW>;
                        default-state = "off";
+                       linux,default-trigger = "disk-activity";
                };
        };