diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2018-12-06 09:43:37 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-02-09 22:45:43 +0100 |
| commit | f56c26d4734519b3bff0d706e4db566c163a120e (patch) | |
| tree | 4bae13d3b56843eab3ead87b415ab29eaf98c0c1 /arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi | |
| parent | afec02777f94282e911c5138d18c08a9ab8b61a1 (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-wifi.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi index 4c0d22304115..4274794c1d0d 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi @@ -40,7 +40,7 @@ &iomuxc { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3 - &pinctrl_gpio4 &pinctrl_gpio5>; + &pinctrl_gpio4 &pinctrl_gpio5 &pinctrl_gpio7>; }; |