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

Commit 869fe59c authored by Russell King's avatar Russell King Committed by Gregory CLEMENT
Browse files

ARM: dts: armada388-clearfog: move SPI CS1 



Move the SPI CS1 configuration to the clearfog .dts file as this is only
present on pro models.

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

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

+14 −0
Original line number Original line Diff line number Diff line
@@ -179,4 +179,18 @@ 
		marvell,pins = "mpp23", "mpp41";

		marvell,pins = "mpp23", "mpp41";

		marvell,function = "gpio";

		marvell,function = "gpio";

	};

	};

	clearfog_spi1_cs_pins: spi1-cs-pins {

		marvell,pins = "mpp55";

		marvell,function = "spi1";

	};

};



&spi1 {

	/*

	 * Add SPI CS pins for clearfog:

	 * CS0: W25Q32 (not populated on uSOM)

	 * CS1:

	 * CS2: mikrobus

	 */

	pinctrl-0 = <&spi1_pins &clearfog_spi1_cs_pins &mikro_spi_pins>;

};
 
};

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

+2 −8
Original line number Original line Diff line number Diff line
@@ -227,10 +227,6 @@ 
					marvell,pins = "mpp20";

					marvell,pins = "mpp20";

					marvell,function = "gpio";

					marvell,function = "gpio";

				};

				};

				clearfog_spi1_cs_pins: spi1-cs-pins {

					marvell,pins = "mpp55";

					marvell,function = "spi1";

				};

				mikro_pins: mikro-pins {

				mikro_pins: mikro-pins {

					/* int: mpp22 rst: mpp29 */

					/* int: mpp22 rst: mpp29 */

					marvell,pins = "mpp22", "mpp29";

					marvell,pins = "mpp22", "mpp29";
@@ -323,12 +319,10 @@ 
	/*

	/*

	 * Add SPI CS pins for clearfog:

	 * Add SPI CS pins for clearfog:

	 * CS0: W25Q32 (not populated on uSOM)

	 * CS0: W25Q32 (not populated on uSOM)

	 * CS1:

	 * CS1: PIC microcontroller (Pro models)

	 * CS2: mikrobus

	 * CS2: mikrobus

	 */

	 */

	pinctrl-0 = <&spi1_pins

	pinctrl-0 = <&spi1_pins &mikro_spi_pins>;

		     &clearfog_spi1_cs_pins

		     &mikro_spi_pins>;

	pinctrl-names = "default";

	pinctrl-names = "default";

	status = "okay";

	status = "okay";

};
 
};