diff options
| author | Leonard Crestez <leonard.crestez@nxp.com> | 2018-06-18 15:52:54 +0300 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:32:14 +0800 |
| commit | bdeb9a01e78c4b8672d5aeefa243d8bd185ac963 (patch) | |
| tree | 3b4e430c6e13b6754f55ca3b01ffd0f5b60469f3 /arch/arm/boot/dts/imx7d-sdb-epdc.dtsi | |
| parent | 2a4a5c2770417ff6bfb95f5989b87585fcb3da19 (diff) | |
MLK-18626-1 ARM: dts: imx7d-sdb-epdc: Fix pin conflict with can2
In upstream the flexcan2 regulator was added with its own pinctrl group
and the EPDC_DATA14 pin is claimed even if the can controller is marked
as disabled.
Mark the regulator itself with status = "disabled" so it won't claim the
pin.
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Acked-by: Robert Chiras <robert.chiras@nxp.com>
Diffstat (limited to 'arch/arm/boot/dts/imx7d-sdb-epdc.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx7d-sdb-epdc.dtsi | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx7d-sdb-epdc.dtsi b/arch/arm/boot/dts/imx7d-sdb-epdc.dtsi index 8d564b33d5d2..765fdc4bba72 100644 --- a/arch/arm/boot/dts/imx7d-sdb-epdc.dtsi +++ b/arch/arm/boot/dts/imx7d-sdb-epdc.dtsi @@ -18,6 +18,10 @@ status = "disabled"; }; +®_can2_3v3 { + status = "disabled"; +}; + &flexcan2 { status = "disabled"; }; |