From d47d204d382728d5e80aa3415c254ba706713d6c Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Sun, 23 Dec 2012 11:34:34 +0900 Subject: [PATCH] --- yaml --- r: 359934 b: refs/heads/master c: 00211e96507a1f061d38519e2e7e385c74962c5c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/dts/kirkwood-6282.dtsi | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4bc0668411b8..8762c740fc28 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8059fc1de2f574db6daec76c0818b31ff840a29d +refs/heads/master: 00211e96507a1f061d38519e2e7e385c74962c5c diff --git a/trunk/arch/arm/boot/dts/kirkwood-6282.dtsi b/trunk/arch/arm/boot/dts/kirkwood-6282.dtsi index ff00dbb28988..64b937441fa0 100644 --- a/trunk/arch/arm/boot/dts/kirkwood-6282.dtsi +++ b/trunk/arch/arm/boot/dts/kirkwood-6282.dtsi @@ -21,6 +21,12 @@ marvell,pins = "mpp8", "mpp9"; marvell,function = "twsi0"; }; + + pmx_twsi1: pmx-twsi1 { + marvell,pins = "mpp36", "mpp37"; + marvell,function = "twsi1"; + }; + pmx_uart0: pmx-uart0 { marvell,pins = "mpp10", "mpp11"; marvell,function = "uart0";