diff options
| author | Dong Aisheng <aisheng.dong@freescale.com> | 2015-10-30 17:31:31 +0800 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:23:58 +0800 |
| commit | 0fab46c32e38a241b50b86ad361d324545b42cf5 (patch) | |
| tree | 09abbf1b7be365775edb94f3c70f0d7a07146cec /arch/arm/boot/dts/imx7d-sdb-epdc.dts | |
| parent | 2605ad0b09affb4978be909dbc78c0e2324ccc57 (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>
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"; }; |