diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2018-12-06 09:43:37 +0100 |
|---|---|---|
| committer | Philippe Schenker <philippe.schenker@toradex.com> | 2020-08-13 16:05:14 +0200 |
| commit | 3b52d3b2bfc26efb7cdaaa8b8016e826c3dd5726 (patch) | |
| tree | 315d51bdf6fb6c2de333d893daeca9913667262a /arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi | |
| parent | 198e16cfe1aa9a6c95752ffce99ecb5df362c35d (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
(cherry picked from commit 169685c139d72eee36914727cd4405fee4c2ee9b)
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 038d8c90f6df..a0545431b3dc 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi @@ -26,7 +26,7 @@ &iomuxc { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3 - &pinctrl_gpio4 &pinctrl_gpio5>; + &pinctrl_gpio4 &pinctrl_gpio5 &pinctrl_gpio7>; }; |