summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2015-10-07 10:37:42 -0700
committerStefan Agner <stefan.agner@toradex.com>2015-10-07 13:16:04 -0700
commita169a7e7b83607f576520ac51a73b077e9c5cfe8 (patch)
treedf7bc90682beeb58fb6daaafda5d9e80a1eab275 /arch
parent32f2e5fb24bb6e733dc413318928eb74b2e2724d (diff)
ARM: dts: vf610: include multiplexed pads in dual eth pinmux
Some pins used for the second, external ethernet PHY are multiplexed to multiple pads on the module. Add those to the pinctrl node of the ethernet to make sure that these pads are properly disabled and no conflicts with other pinmux specifications arise.
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/vf-colibri-dual-eth.dtsi3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/vf-colibri-dual-eth.dtsi b/arch/arm/boot/dts/vf-colibri-dual-eth.dtsi
index e6824f3ffe2f..8fed7304276a 100644
--- a/arch/arm/boot/dts/vf-colibri-dual-eth.dtsi
+++ b/arch/arm/boot/dts/vf-colibri-dual-eth.dtsi
@@ -68,6 +68,9 @@
VF610_PAD_PTC6__ENET_RMII0_TXD1 0x30d2
VF610_PAD_PTC7__ENET_RMII0_TXD0 0x30d2
VF610_PAD_PTC8__ENET_RMII0_TXEN 0x30d2
+ /* Disable pads multiplexed with PTC7/PTC6 */
+ VF610_PAD_PTB0__GPIO_22 0x0000
+ VF610_PAD_PTB9__GPIO_31 0x0000
>;
};