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.

Conflicts:

	arch/arm/boot/dts/imx6sx-sdb.dts

Signed-off-by: Dong Aisheng <b29396@freescale.com>
(cherry picked from commit 4fc10d386d02e8ae10d8512fdadb5a02ddd25228)

diff --git a/arch/arm/boot/dts/imx6sx-sdb-m4.dts b/arch/arm/boot/dts/imx6sx-sdb-m4.dts
index 5309be9180b178865168ac6e6343fdd5379c5eef..d2c6a673352ca937ce69e614ae683dfa3462c9f9 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-sdb-m4.dts
+++ b/arch/arm/boot/dts/imx6sx-sdb-m4.dts
@@ -15,6 +15,11 @@
        };
 };
 
+&iomuxc {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_hog>;
+};
+
 /*
  * The flollowing modules are conflicting with M4, disable them when m4
  * is running.

diff --git a/arch/arm/boot/dts/imx6sx-sdb.dts b/arch/arm/boot/dts/imx6sx-sdb.dts
index 8a5a9ef584f23507ec172f79796d7d3fd110c406..ecfb7affa6fe4e07663a87630658f085812dccbc 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-sdb.dts
+++ b/arch/arm/boot/dts/imx6sx-sdb.dts
@@ -683,7 +683,7 @@
 
 &iomuxc {
        pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_hog>;
+       pinctrl-0 = <&pinctrl_hog &pinctrl_can_gpios>;
 
        imx6x-sdb {
                pinctrl_hog: hoggrp {
@@ -806,6 +806,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_i2c1: i2c1grp {
                        fsl,pins = <
                                MX6SX_PAD_GPIO1_IO01__I2C1_SDA 0x4001b8b1