summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/armada-388-clearfog.dts
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2017-01-02 17:58:46 +0300
committerGregory CLEMENT <gregory.clement@free-electrons.com>2017-01-04 13:38:13 +0300
commit77fb9c04a8afb650526ef9e45a09516c0ec1318c (patch)
tree6ec7fdc2f4192da33b2c7c7a223acc77b2175a9e /arch/arm/boot/dts/armada-388-clearfog.dts
parent744771fc982a0670f4828f36504ba71f83b074d9 (diff)
downloadlinux-77fb9c04a8afb650526ef9e45a09516c0ec1318c.tar.xz
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: Russell King <rmk+kernel@armlinux.org.uk> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Diffstat (limited to 'arch/arm/boot/dts/armada-388-clearfog.dts')
-rw-r--r--arch/arm/boot/dts/armada-388-clearfog.dts8
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/armada-388-clearfog.dts b/arch/arm/boot/dts/armada-388-clearfog.dts
index 00618d8f4484..7a30332ae42c 100644
--- a/arch/arm/boot/dts/armada-388-clearfog.dts
+++ b/arch/arm/boot/dts/armada-388-clearfog.dts
@@ -257,12 +257,6 @@
marvell,pins = "mpp20";
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 {
marvell,pins = "mpp55";
marvell,function = "spi1";
@@ -300,7 +294,7 @@
bus-width = <4>;
cd-gpios = <&gpio0 20 GPIO_ACTIVE_LOW>;
no-1-8-v;
- pinctrl-0 = <&clearfog_sdhci_pins
+ pinctrl-0 = <&microsom_sdhci_pins
&clearfog_sdhci_cd_pins>;
pinctrl-names = "default";
status = "okay";