summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx7d-sdb.dts
diff options
context:
space:
mode:
authorRobby Cai <r63905@freescale.com>2015-12-02 15:32:47 +0800
committerLeonard Crestez <leonard.crestez@nxp.com>2018-08-24 12:20:42 +0300
commitd34234e26df1640ba1693e6daf9e27d69d3af93f (patch)
tree0eb6f0608c9fcf214303d70ad61698db14ae8215 /arch/arm/boot/dts/imx7d-sdb.dts
parentcf2e23f94ca5fce681f17e927461fe9bd993d0c6 (diff)
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 <r63905@freescale.com>
Diffstat (limited to 'arch/arm/boot/dts/imx7d-sdb.dts')
-rw-r--r--arch/arm/boot/dts/imx7d-sdb.dts2
1 files changed, 1 insertions, 1 deletions
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 */
>;
};