diff options
| author | Richard Zhu <r65037@freescale.com> | 2014-04-22 14:49:48 +0800 |
|---|---|---|
| committer | Richard Zhu <r65037@freescale.com> | 2014-04-22 15:24:12 +0800 |
| commit | 137a6478919be81c59a12f29567a1f8a0aa00c0b (patch) | |
| tree | 43341f52cfdc819aa3af8dbbc414996c0d1437c0 | |
| parent | 63a5ec1b474c5d7e2276a50a3e30791c7b64ba16 (diff) | |
ENGR00309798 arm: create standalone dts for a9 when m4 is running
Create standalone dts for a9 when m4 is running, since there
are some conflictions in the following modules
* i2c3
* flexcan1&2
* uart2
Signed-off-by: Richard Zhu <r65037@freescale.com>
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6sx-sdb-m4.dts | 29 |
2 files changed, 30 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index fe08961b9084..db4f00c55929 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -148,6 +148,7 @@ dtb-$(CONFIG_ARCH_MXC) += \ imx6sx-sdb-lcdif1.dtb \ imx6sx-sdb-sai.dtb \ imx6sx-sdb-emmc.dtb \ + imx6sx-sdb-m4.dtb \ vf610-twr.dtb dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \ imx23-olinuxino.dtb \ diff --git a/arch/arm/boot/dts/imx6sx-sdb-m4.dts b/arch/arm/boot/dts/imx6sx-sdb-m4.dts new file mode 100644 index 000000000000..2d706853438c --- /dev/null +++ b/arch/arm/boot/dts/imx6sx-sdb-m4.dts @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2014 Freescale Semiconductor, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include "imx6sx-sdb.dts" + +/* + * The flollowing modules are conflicting with M4, disable them when m4 + * is running. + */ +&flexcan1 { + status = "disabled"; +}; + +&flexcan2 { + status = "disabled"; +}; + +&i2c3 { + status = "disabled"; +}; + +&uart2 { + status = "disabled"; +}; |