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-epdc.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-epdc.dts')
| -rw-r--r-- | arch/arm/boot/dts/imx7d-sdb-epdc.dts | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx7d-sdb-epdc.dts b/arch/arm/boot/dts/imx7d-sdb-epdc.dts index 2cc80450a639..2bad80af7ba6 100644 --- a/arch/arm/boot/dts/imx7d-sdb-epdc.dts +++ b/arch/arm/boot/dts/imx7d-sdb-epdc.dts @@ -20,6 +20,10 @@ status = "disabled"; }; +&flexcan2 { + status = "disabled"; +}; + &max17135 { status = "okay"; }; |