diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2018-12-06 09:43:37 +0100 |
|---|---|---|
| committer | Philippe Schenker <philippe.schenker@toradex.com> | 2019-06-18 08:17:58 +0200 |
| commit | f8f6df3a378b105401fef63c72cef8399943e266 (patch) | |
| tree | eb2fa4c1707e24f39da3c39439fea9949d9bc055 /arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | |
| parent | f035416b576ea8729427f69b853e1a17b56a7d10 (diff) | |
ARM: dts: imx6ull: improve can templates
Add the pinmuxing and a inactive node for flexcan1 on SODIMM 55/63
and move the inactive flexcan modes to imx6ull-colibri-eval-v3.dtsi
where they belong.
Note that this commit does not enable flexcan functionality, but rather
eases the effort needed to do so.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
(cherry picked from commit 983ff8a6b61e9466beb6b4781fb370a6a7da937a)
Conflicts:
arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi
arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
arch/arm/boot/dts/imx6ull-colibri.dtsi
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com
Diffstat (limited to 'arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi index 006690ea98c0..f029fae409f5 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi @@ -83,6 +83,18 @@ }; }; +&flexcan1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_flexcan1>; + status = "disabled"; +}; + +&flexcan2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_flexcan2>; + status = "disabled"; +}; + &i2c1 { status = "okay"; |