]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2f77c6b) | patch
MLK-9833-2 dts: imx6sx: do not touch CAN gpios pads if M4 is enabled
authorDong Aisheng <b29396@freescale.com>
Tue, 11 Nov 2014 13:18:12 +0000 (21:18 +0800)
committerDong Aisheng <b29396@freescale.com>
Wed, 21 Jan 2015 10:23:33 +0000 (18:23 +0800)
commit3ec9d927209c823abbefc7b78a6c56b30ca5ddc1
tree9311be912433aa38565e89d1660dc5d2541a7f39tree | snapshot
parent2f77c6bad9a5693acdeab8381819dfbeb96f462dcommit | 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)
arch/arm/boot/dts/imx6sx-sdb-m4.dts diff | blob | history
arch/arm/boot/dts/imx6sx-sdb.dts diff | blob | history
Linux kernel for KaRo TX COM modules