aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2012-12-21 15:49:13 +0100
committerArnd Bergmann <arnd@arndb.de>2013-02-28 18:57:11 +0100
commit8059fc1de2f574db6daec76c0818b31ff840a29d (patch)
treed2a5299afefefb77bdcb4fd4104fd61458f52683 /arch/arm
parentarm: kirkwood: mplcec4: use Device Tree to probe SDIO (diff)
downloadlinux-dev-8059fc1de2f574db6daec76c0818b31ff840a29d.tar.xz
linux-dev-8059fc1de2f574db6daec76c0818b31ff840a29d.zip
arm: kirkwood: add pinmux option for the SDIO interface on 88F6282
This commit adds a pinmux option, pmx_sdio, to enable the muxing of the SDIO interface on the 88F6282 SoC from Marvell. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/kirkwood-6282.dtsi5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi
index 4ccea2130a6c..ff00dbb28988 100644
--- a/arch/arm/boot/dts/kirkwood-6282.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6282.dtsi
@@ -30,6 +30,11 @@
marvell,pins = "mpp13", "mpp14";
marvell,function = "uart1";
};
+ pmx_sdio: pmx-sdio {
+ marvell,pins = "mpp12", "mpp13", "mpp14",
+ "mpp15", "mpp16", "mpp17";
+ marvell,function = "sdio";
+ };
};
i2c@11100 {