mvebu dt for 4.12 (part 2)

Use disk-activity trigger for armada-385-linksys
 Keep dts alphabetically ordered for clearfog (Armada 388)
 -----BEGIN PGP SIGNATURE-----
 
 iIEEABECAEEWIQQYqXDMF3cvSLY+g9cLBhiOFHI71QUCWOgNoSMcZ3JlZ29yeS5j
 bGVtZW50QGZyZWUtZWxlY3Ryb25zLmNvbQAKCRALBhiOFHI71V3cAJ9gBnFQKIkt
 jDbi9jpxM7vxznt0VgCgnnYcZsFjE7jFAxs+w4KDVd3jYo8=
 =XQtw
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-dt-4.12-2' of git://git.infradead.org/linux-mvebu into next/dt

mvebu dt for 4.12 (part 2)

Use disk-activity trigger for armada-385-linksys
Keep dts alphabetically ordered for clearfog (Armada 388)

* tag 'mvebu-dt-4.12-2' of git://git.infradead.org/linux-mvebu:
  ARM: dts: armada-385-linksys: disk-activity trigger for all
  ARM: dts: clearfog: keep dts alphabetically ordered

Signed-off-by: Olof Johansson <olof@lixom.net>

arch/arm/boot/dts/armada-385-linksys-caiman.dts

@@ -109,7 +109,6 @@
 
 		sata {
 			label = "caiman:white:sata";
-			linux,default-trigger = "disk-activity";
 		};
 	};
 };

arch/arm/boot/dts/armada-385-linksys-cobra.dts

@@ -109,7 +109,6 @@
 
 		sata {
 			label = "cobra:white:sata";
-			linux,default-trigger = "disk-activity";
 		};
 	};
 };

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";
 		};
 	};
 

arch/arm/boot/dts/armada-388-clearfog.dts

@@ -186,25 +186,6 @@
 	};
 };
 
-&pinctrl {
-	clearfog_dsa0_clk_pins: clearfog-dsa0-clk-pins {
-		marvell,pins = "mpp46";
-		marvell,function = "ref";
-	};
-	clearfog_dsa0_pins: clearfog-dsa0-pins {
-		marvell,pins = "mpp23", "mpp41";
-		marvell,function = "gpio";
-	};
-	clearfog_spi1_cs_pins: spi1-cs-pins {
-		marvell,pins = "mpp55";
-		marvell,function = "spi1";
-	};
-	rear_button_pins: rear-button-pins {
-		marvell,pins = "mpp34";
-		marvell,function = "gpio";
-	};
-};
-
 &mdio {
 	status = "okay";
 
@@ -268,6 +249,25 @@
 	};
 };
 
+&pinctrl {
+	clearfog_dsa0_clk_pins: clearfog-dsa0-clk-pins {
+		marvell,pins = "mpp46";
+		marvell,function = "ref";
+	};
+	clearfog_dsa0_pins: clearfog-dsa0-pins {
+		marvell,pins = "mpp23", "mpp41";
+		marvell,function = "gpio";
+	};
+	clearfog_spi1_cs_pins: spi1-cs-pins {
+		marvell,pins = "mpp55";
+		marvell,function = "spi1";
+	};
+	rear_button_pins: rear-button-pins {
+		marvell,pins = "mpp34";
+		marvell,function = "gpio";
+	};
+};
+
 &spi1 {
 	/*
 	 * Add SPI CS pins for clearfog: