mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-14 10:02:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

ARM: dts: armada388-clearfog: move SPI CS1

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

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
This commit is contained in:
Russell King
2017-01-02 14:59:07 +00:00
committed by Gregory CLEMENT
parent 54f0ec0a3d
commit 869fe59cd1
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
arch/arm/boot/dts/armada-388-clearfog.dts
View File

@@ -179,4 +179,18 @@ 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";
};
};
&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>;
};

10
arch/arm/boot/dts/armada-388-clearfog.dtsi
View File

@@ -227,10 +227,6 @@ clearfog_sdhci_cd_pins: clearfog-sdhci-cd-pins {
marvell,pins = "mpp20";
marvell,function = "gpio";
};
clearfog_spi1_cs_pins: spi1-cs-pins {
marvell,pins = "mpp55";
marvell,function = "spi1";
};
mikro_pins: mikro-pins {
/* int: mpp22 rst: mpp29 */
marvell,pins = "mpp22", "mpp29";
@@ -323,12 +319,10 @@ &spi1 {
/*
* Add SPI CS pins for clearfog:
* CS0: W25Q32 (not populated on uSOM)
* CS1:
* CS1: PIC microcontroller (Pro models)
* CS2: mikrobus
*/
pinctrl-0 = <&spi1_pins
&clearfog_spi1_cs_pins
&mikro_spi_pins>;
pinctrl-0 = <&spi1_pins &mikro_spi_pins>;
pinctrl-names = "default";
status = "okay";
};