MLK-9833-2 dts: imx6sx: do not touch CAN gpios pads if M4 is enabled

CAN devices are allocated to run on M4.
So do not touch CAN pads setting if M4 is enabled.

Signed-off-by: Dong Aisheng <b29396@freescale.com>
(cherry picked from commit 9d2605e51b9ba83382c5da3a838656c9910d75a1)
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

diff --git a/arch/arm/boot/dts/imx6sx-sdb-m4.dts b/arch/arm/boot/dts/imx6sx-sdb-m4.dts
index 78f1b6b..7b67b8e 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-sdb-m4.dts
+++ b/arch/arm/boot/dts/imx6sx-sdb-m4.dts
@@ -17,6 +17,7 @@
 
 &iomuxc {
        pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_hog>;
 };
 
 /*

diff --git a/arch/arm/boot/dts/imx6sx-sdb.dtsi b/arch/arm/boot/dts/imx6sx-sdb.dtsi
index 05e55a5..0964302 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-sdb.dtsi
+++ b/arch/arm/boot/dts/imx6sx-sdb.dtsi
@@ -688,7 +688,7 @@
 
 &iomuxc {
        pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_hog>;
+       pinctrl-0 = <&pinctrl_hog &pinctrl_can_gpios>;
 
        imx6x-sdb {
                pinctrl_hog: hoggrp {
@@ -699,6 +699,13 @@
                        >;
                };
 
+               pinctrl_can_gpios: can-gpios {
+                       fsl,pins = <
+                               MX6SX_PAD_QSPI1B_DATA1__GPIO4_IO_25 0x17059
+                               MX6SX_PAD_QSPI1B_DATA3__GPIO4_IO_27 0x17059
+                       >;
+               };
+
                pinctrl_audmux: audmuxgrp {
                        fsl,pins = <
                                MX6SX_PAD_CSI_DATA00__AUDMUX_AUD6_TXC   0x130b0