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

Commit 744771fc authored by Russell King's avatar Russell King Committed by Gregory CLEMENT
Browse files

ARM: dts: armada388-clearfog: move SPI flash into microsom 



The optional SPI flash is fitted to the microsom, not the clearfog
board, so it should be specified in the microsom DTS include file.

Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
parent 2cd36735

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

+2 −12
Original line number Diff line number Diff line
@@ -423,9 +423,8 @@ 


&spi1 {

	/*

	 * We don't seem to have the W25Q32 on the

	 * A1 Rev 2.0 boards, so disable SPI.

	 * CS0: W25Q32 (doesn't appear to be present)

	 * Add SPI CS pins for clearfog:

	 * CS0: W25Q32 (not populated on uSOM)

	 * CS1:

	 * CS2: mikrobus

	 */
@@ -434,13 +433,4 @@ 
		     &mikro_spi_pins>;

	pinctrl-names = "default";

	status = "okay";



	spi-flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "w25q32", "jedec,spi-nor";

		reg = <0>; /* Chip select 0 */

		spi-max-frequency = <3000000>;

		status = "disabled";

	};

};

arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -126,3 +126,17 @@ 


	};

};



&spi1 {

	/* The microsom has an optional W25Q32 on board, connected to CS0 */

	pinctrl-0 = <&spi1_pins>;



	w25q32: spi-flash@0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "w25q32", "jedec,spi-nor";

		reg = <0>; /* Chip select 0 */

		spi-max-frequency = <3000000>;

		status = "disabled";

	};

};