summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/kizbox.dts
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-01-28 10:07:11 +0400
committerOlof Johansson <olof@lixom.net>2013-01-28 10:07:20 +0400
commit6b914c998787d65022e80d6262dfd0edef58cadb (patch)
treeec9d9605ae08e6e40664c4302a181979ab4fe1d3 /arch/arm/boot/dts/kizbox.dts
parent1f87a404d02a96519284e1928445ca5cfe9667db (diff)
parent949db153b6466c6f7cad5a427ecea94985927311 (diff)
downloadlinux-6b914c998787d65022e80d6262dfd0edef58cadb.tar.xz
Merge tag 'v3.8-rc5' into next/cleanup
Linux 3.8-rc5 Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/kizbox.dts')
-rw-r--r--arch/arm/boot/dts/kizbox.dts2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/kizbox.dts b/arch/arm/boot/dts/kizbox.dts
index e8814fe0e277..b4dc3ed9a3ec 100644
--- a/arch/arm/boot/dts/kizbox.dts
+++ b/arch/arm/boot/dts/kizbox.dts
@@ -48,6 +48,8 @@
macb0: ethernet@fffc4000 {
phy-mode = "mii";
+ pinctrl-0 = <&pinctrl_macb_rmii
+ &pinctrl_macb_rmii_mii_alt>;
status = "okay";
};