aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorNobuhiro Iwamatsu <iwamatsu@nigauri.org>2012-12-22 21:34:34 -0500
committerArnd Bergmann <arnd@arndb.de>2013-02-28 12:57:11 -0500
commit00211e96507a1f061d38519e2e7e385c74962c5c (patch)
tree204f13a2e631d3fb6643462c1009964699286672 /arch/arm/boot
parent8059fc1de2f574db6daec76c0818b31ff840a29d (diff)
ARM: Kirkwood: Add pinctrl of TWSI1 to 88f6282
The 88f6282 has one more TWSI(TWSI1). This add the information to enable pinctl of TWSI1. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Acked-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/kirkwood-6282.dtsi6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi
index ff00dbb28988..64b937441fa0 100644
--- a/arch/arm/boot/dts/kirkwood-6282.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6282.dtsi
@@ -21,6 +21,12 @@
21 marvell,pins = "mpp8", "mpp9"; 21 marvell,pins = "mpp8", "mpp9";
22 marvell,function = "twsi0"; 22 marvell,function = "twsi0";
23 }; 23 };
24
25 pmx_twsi1: pmx-twsi1 {
26 marvell,pins = "mpp36", "mpp37";
27 marvell,function = "twsi1";
28 };
29
24 pmx_uart0: pmx-uart0 { 30 pmx_uart0: pmx-uart0 {
25 marvell,pins = "mpp10", "mpp11"; 31 marvell,pins = "mpp10", "mpp11";
26 marvell,function = "uart0"; 32 marvell,function = "uart0";