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 | |
| 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')
| -rw-r--r-- | arch/arm/boot/dts/imx7d-sdb-epdc.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7d-sdb.dts | 4 |
2 files changed, 6 insertions, 2 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"; }; diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts index 32846ea55983..5f13a11263a5 100644 --- a/arch/arm/boot/dts/imx7d-sdb.dts +++ b/arch/arm/boot/dts/imx7d-sdb.dts @@ -97,7 +97,7 @@ regulator-name = "can2-3v3"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - gpio = <&gpio1 7 GPIO_ACTIVE_LOW>; + gpio = <&gpio2 13 GPIO_ACTIVE_LOW>; }; reg_vref_1v8: regulator-vref-1v8 { @@ -638,7 +638,6 @@ pinctrl_hog_2: hoggrp-2 { fsl,pins = < MX7D_PAD_LPSR_GPIO1_IO05__GPIO1_IO5 0x14 - MX7D_PAD_LPSR_GPIO1_IO07__GPIO1_IO7 0x59 >; }; @@ -831,6 +830,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 */ >; }; |