Commit 9d2605e5 authored by Dong Aisheng's avatar Dong Aisheng Committed by Nitin Garg
Browse files

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: default avatarDong Aisheng <b29396@freescale.com>
(cherry picked from commit 4fc10d386d02e8ae10d8512fdadb5a02ddd25228)
parent 03e105ed
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment