From 63443582a565b32c9c1bdd30efbd92c36ca2f418 Mon Sep 17 00:00:00 2001 From: Robby Cai Date: Wed, 2 Dec 2015 15:32:47 +0800 Subject: MLK-11944-2 ARM: dts: move CAN_STBY out of hog group to avoid pin conflict EPDC_DATA14 (can be used as CAN_STBY for flexcan) is also shared with EPDC. To make EPDC work, need move it from hog pinctrl group to its own pinctrl group to avoid the conflict. Signed-off-by: Robby Cai --- arch/arm/boot/dts/imx7d-sdb.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/boot/dts/imx7d-sdb.dts') diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts index d6f490a526db..22f16d57720b 100644 --- a/arch/arm/boot/dts/imx7d-sdb.dts +++ b/arch/arm/boot/dts/imx7d-sdb.dts @@ -508,7 +508,6 @@ fsl,pins = < MX7D_PAD_UART3_CTS_B__GPIO4_IO7 0x14 MX7D_PAD_ECSPI2_SS0__GPIO4_IO23 0x80000000 /* bt reg on */ - MX7D_PAD_EPDC_DATA14__GPIO2_IO14 0x59 /* CAN_STBY */ >; }; @@ -599,6 +598,7 @@ fsl,pins = < MX7D_PAD_GPIO1_IO14__FLEXCAN2_RX 0x59 MX7D_PAD_GPIO1_IO15__FLEXCAN2_TX 0x59 + MX7D_PAD_EPDC_DATA14__GPIO2_IO14 0x59 /* CAN_STBY */ >; }; -- cgit v1.2.3