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: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

diff --git a/arch/arm/boot/dts/armada-388-clearfog.dts b/arch/arm/boot/dts/armada-388-clearfog.dts
index 2c4a8ad98c4fc0f31ae7898adb07aa9ca810cd66..72fd80e209cec68684223429c9cac1707bf5be82 100644 (file)
--- a/arch/arm/boot/dts/armada-388-clearfog.dts
+++ b/arch/arm/boot/dts/armada-388-clearfog.dts
@@ -179,4 +179,18 @@
                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>;
 };

diff --git a/arch/arm/boot/dts/armada-388-clearfog.dtsi b/arch/arm/boot/dts/armada-388-clearfog.dtsi
index ef4fbc6db7cf853f1567bae0b26cc2b2accd44df..30b75379377a057afc815593a6e1ddc5f58264e2 100644 (file)
--- a/arch/arm/boot/dts/armada-388-clearfog.dtsi
+++ b/arch/arm/boot/dts/armada-388-clearfog.dtsi
@@ -227,10 +227,6 @@
                                        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 @@
        /*
         * 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";
 };