summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2019-08-27 15:18:38 +0200
committerShawn Guo <shawnguo@kernel.org>2019-10-02 03:09:51 +0200
commit242bab2dd46d5f83f8b356ee507df7e3d0b2e04e (patch)
treeadfafaab404878c83e6db254aa801c4f5030cf16 /arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi
parentARM: dts: imx6ull-colibri: Add watchdog (diff)
downloadlinux-242bab2dd46d5f83f8b356ee507df7e3d0b2e04e.tar.xz
linux-242bab2dd46d5f83f8b356ee507df7e3d0b2e04e.zip
ARM: dts: imx6ull: improve can templates
Add the pinmuxing and a inactive node for flexcan1 on SODIMM 55/63 and move the inactive flexcan nodes 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> Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi')
-rw-r--r--arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi b/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi
index fb213bec4654..95a11b8bcbdb 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi
@@ -15,7 +15,7 @@
&iomuxc {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3
- &pinctrl_gpio4 &pinctrl_gpio5 &pinctrl_gpio6>;
+ &pinctrl_gpio4 &pinctrl_gpio5 &pinctrl_gpio6 &pinctrl_gpio7>;
};
&iomuxc_snvs {