diff options
| author | Dong Aisheng <b29396@freescale.com> | 2014-11-11 21:18:12 +0800 |
|---|---|---|
| committer | Dong Aisheng <b29396@freescale.com> | 2015-01-21 18:23:33 +0800 |
| commit | 3ec9d927209c823abbefc7b78a6c56b30ca5ddc1 (patch) | |
| tree | 9311be912433aa38565e89d1660dc5d2541a7f39 /arch/arm/boot/dts/imx6sx-sdb-m4.dts | |
| parent | 2f77c6bad9a5693acdeab8381819dfbeb96f462d (diff) | |
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)
Diffstat (limited to 'arch/arm/boot/dts/imx6sx-sdb-m4.dts')
| -rw-r--r-- | arch/arm/boot/dts/imx6sx-sdb-m4.dts | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6sx-sdb-m4.dts b/arch/arm/boot/dts/imx6sx-sdb-m4.dts index 5309be9180b1..d2c6a673352c 100644 --- 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. |