From: Robby Cai Date: Wed, 2 Dec 2015 07:32:47 +0000 (+0800) Subject: MLK-11944-2 ARM: dts: move CAN_STBY out of hog group to avoid pin conflict X-Git-Tag: C0P2-H0.0--20200415~3942 X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=ca0f40ce5821451e95b810dfe678db9415075687;p=linux.git 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 --- diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts index 85f7b6f71738..a420a0292176 100644 --- a/arch/arm/boot/dts/imx7d-sdb.dts +++ b/arch/arm/boot/dts/imx7d-sdb.dts @@ -818,7 +818,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 */ >; }; @@ -859,6 +858,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 */ >; };