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

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

ARM: dts: armada388-clearfog: move device specific pinctrl nodes 



Move the device specific pinctrl nodes over to use the label form to
reference the pin mux controller, rather than replicating the device
node path.

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

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

+25 −25
Original line number Diff line number Diff line
@@ -217,31 +217,6 @@ 
				status = "okay";

			};



			pinctrl@18000 {

				clearfog_i2c1_pins: i2c1-pins {

					/* SFP, PCIe, mSATA, mikrobus */

					marvell,pins = "mpp26", "mpp27";

					marvell,function = "i2c1";

				};

				clearfog_sdhci_cd_pins: clearfog-sdhci-cd-pins {

					marvell,pins = "mpp20";

					marvell,function = "gpio";

				};

				mikro_pins: mikro-pins {

					/* int: mpp22 rst: mpp29 */

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

					marvell,function = "gpio";

				};

				mikro_spi_pins: mikro-spi-pins {

					marvell,pins = "mpp43";

					marvell,function = "spi1";

				};

				mikro_uart_pins: mikro-uart-pins {

					marvell,pins = "mpp24", "mpp25";

					marvell,function = "ua1";

				};

			};



			sata@a8000 {

				/* pinctrl? */

				status = "okay";
@@ -297,6 +272,31 @@ 
	};

};



&pinctrl {

	clearfog_i2c1_pins: i2c1-pins {

		/* SFP, PCIe, mSATA, mikrobus */

		marvell,pins = "mpp26", "mpp27";

		marvell,function = "i2c1";

	};

	clearfog_sdhci_cd_pins: clearfog-sdhci-cd-pins {

		marvell,pins = "mpp20";

		marvell,function = "gpio";

	};

	mikro_pins: mikro-pins {

		/* int: mpp22 rst: mpp29 */

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

		marvell,function = "gpio";

	};

	mikro_spi_pins: mikro-spi-pins {

		marvell,pins = "mpp43";

		marvell,function = "spi1";

	};

	mikro_uart_pins: mikro-uart-pins {

		marvell,pins = "mpp24", "mpp25";

		marvell,function = "ua1";

	};

};



&spi1 {

	/*

	 * Add SPI CS pins for clearfog:

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

+13 −14
Original line number Diff line number Diff line
@@ -94,20 +94,6 @@ 
				};

			};



			pinctrl@18000 {

				microsom_phy_clk_pins: microsom-phy-clk-pins {

					marvell,pins = "mpp45";

					marvell,function = "ref";

				};

				/* Optional eMMC */

				microsom_sdhci_pins: microsom-sdhci-pins {

					marvell,pins = "mpp21", "mpp28",

						       "mpp37", "mpp38",

						       "mpp39", "mpp40";

					marvell,function = "sd0";

				};

			};



			rtc@a3800 {

				/*

				 * If the rtc doesn't work, run "date reset"
@@ -134,6 +120,19 @@ 
	};

};



&pinctrl {

	microsom_phy_clk_pins: microsom-phy-clk-pins {

		marvell,pins = "mpp45";

		marvell,function = "ref";

	};

	/* Optional eMMC */

	microsom_sdhci_pins: microsom-sdhci-pins {

		marvell,pins = "mpp21", "mpp28", "mpp37",

			       "mpp38", "mpp39", "mpp40";

		marvell,function = "sd0";

	};

};



&spi1 {

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

	pinctrl-0 = <&spi1_pins>;