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

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

ARM: dts: armada388-clearfog: move sdhci pinctrl node to microsom 



Move the SDHCI pinctrl node to the microsom file - the microsom can have
optional eMMC support which uses these same pinctrl settings, so it is
sensible to have these here.

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

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

+1 −7
Original line number Original line Diff line number Diff line
@@ -257,12 +257,6 @@ 
					marvell,pins = "mpp20";

					marvell,pins = "mpp20";

					marvell,function = "gpio";

					marvell,function = "gpio";

				};

				};

				clearfog_sdhci_pins: clearfog-sdhci-pins {

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

						       "mpp37", "mpp38",

						       "mpp39", "mpp40";

					marvell,function = "sd0";

				};

				clearfog_spi1_cs_pins: spi1-cs-pins {

				clearfog_spi1_cs_pins: spi1-cs-pins {

					marvell,pins = "mpp55";

					marvell,pins = "mpp55";

					marvell,function = "spi1";

					marvell,function = "spi1";
@@ -300,7 +294,7 @@ 
				bus-width = <4>;

				bus-width = <4>;

				cd-gpios = <&gpio0 20 GPIO_ACTIVE_LOW>;

				cd-gpios = <&gpio0 20 GPIO_ACTIVE_LOW>;

				no-1-8-v;

				no-1-8-v;

				pinctrl-0 = <&clearfog_sdhci_pins

				pinctrl-0 = <&microsom_sdhci_pins

					     &clearfog_sdhci_cd_pins>;

					     &clearfog_sdhci_cd_pins>;

				pinctrl-names = "default";

				pinctrl-names = "default";

				status = "okay";

				status = "okay";

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -99,6 +99,13 @@ 
					marvell,pins = "mpp45";

					marvell,pins = "mpp45";

					marvell,function = "ref";

					marvell,function = "ref";

				};

				};

				/* Optional eMMC */

				microsom_sdhci_pins: microsom-sdhci-pins {

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

						       "mpp37", "mpp38",

						       "mpp39", "mpp40";

					marvell,function = "sd0";

				};

			};

			};





			rtc@a3800 {

			rtc@a3800 {