diff options
| author | Dong Aisheng <aisheng.dong@freescale.com> | 2015-10-30 17:31:31 +0800 |
|---|---|---|
| committer | Nitin Garg <nitin.garg@nxp.com> | 2016-01-14 11:02:39 -0600 |
| commit | ce963c9b16762651cab95deb8541978565709551 (patch) | |
| tree | 473e90de363950d63520f81173a81a156bdbc0b9 /arch/arm/boot/dts/imx7d-sdb.dts | |
| parent | 78bcf764e8737b1d16fad2183d1d0484696144e8 (diff) | |
MLK-11800 dts: imx7d-sdb: correct flexcan stby gpio pin
According to schematic, the pad used for CAN STBY signal
should be EPDC_DATA14, not GPIO1_IO07. So correct it.
And due to pin is conflict with epdc, so we also update
the imx7d-sdb-epdc.dts.
Reported-by: Peng Fan <Peng.Fan@freescale.com>
Signed-off-by: Dong Aisheng <aisheng.dong@freescale.com>
(cherry picked from commit 9036478549729580a89db90835ee5c688acbc282)
Conflicts:
arch/arm/boot/dts/imx7d-sdb.dts
Diffstat (limited to 'arch/arm/boot/dts/imx7d-sdb.dts')
| -rw-r--r-- | arch/arm/boot/dts/imx7d-sdb.dts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts index a873ac271a35..d6f490a526db 100644 --- a/arch/arm/boot/dts/imx7d-sdb.dts +++ b/arch/arm/boot/dts/imx7d-sdb.dts @@ -134,11 +134,11 @@ reg_can2_3v3: regulator@4 { compatible = "regulator-fixed"; - reg = <2>; + reg = <4>; regulator-name = "can2-3v3"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - gpio = <&gpio1 7 GPIO_ACTIVE_LOW>; + gpio = <&gpio2 14 GPIO_ACTIVE_LOW>; }; wlreg_on: fixedregulator@100 { @@ -508,6 +508,7 @@ 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 */ >; }; @@ -977,7 +978,6 @@ pinctrl_hog_2: hoggrp-2 { fsl,pins = < MX7D_PAD_GPIO1_IO05__GPIO1_IO5 0x14 - MX7D_PAD_GPIO1_IO07__GPIO1_IO7 0x59 >; }; |