Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10719376 authored by Olof Johansson's avatar Olof Johansson
Browse files

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: default avatarOlof Johansson <olof@lixom.net>
parents a51ed6cf 34240c26

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

+0 −1
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ 


		sata {

			label = "caiman:white:sata";

			linux,default-trigger = "disk-activity";

		};

	};

};

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

+0 −1
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ 


		sata {

			label = "cobra:white:sata";

			linux,default-trigger = "disk-activity";

		};

	};

};

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

+1 −0
Original line number Diff line number Diff line
@@ -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

+19 −19
Original line number Diff line number Diff line
@@ -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: