projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: dd37965) | patch
MLK-11801 imx: mx7d: resolve conflicts with A7 and M4
authorPeng Fan <Peng.Fan@freescale.com>
Fri, 30 Oct 2015 07:59:58 +0000 (15:59 +0800)
committerNitin Garg <nitin.garg@nxp.com>
Mon, 19 Mar 2018 19:49:28 +0000 (14:49 -0500)
commit875f0d116aab6d04e7ac65a1af3f0d89e764edef
tree96f438ca07786218f907cd0cd5b7f47a8ec3a16ftree | snapshot
parentdd379656a052e9261cabdbaa948ae779805af0cdcommit | diff
MLK-11801 imx: mx7d: resolve conflicts with A7 and M4

M4 will use UART2, and RDC is configured that kernel can not
access. If still enable it, kernel will panic.

To validation board, disable gpio-keys, since m4 will use volume keys.

Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
(cherry picked from commit ccd54fd2096b8f3443bafd0b86499e1eda027fc9)

Conflicts:
arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-m4.dts
arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-m4.dts diff | blob | history
arch/arm/boot/dts/imx7d-sdb-m4.dts diff | blob | history