diff options
| author | Richard Zhu <Richard.Zhu@freescale.com> | 2015-11-06 10:47:15 +0800 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:24:00 +0800 |
| commit | b80afc06cdfc1044fb12c55c5af16c4a487df0ef (patch) | |
| tree | 1911c8f407d9babb7dc54721c9e7101f5cc99328 | |
| parent | 806e87f79ebc38e7aa70327b00b4f5f501667fa2 (diff) | |
MLK-11979 arm: imx: enable rpmsg on imx6sx platforms
enable rpmsg on imx6sx platforms
- imx6sx sdb board
- imx6sx sabreauto board
Signed-off-by: Richard Zhu <Richard.Zhu@freescale.com>
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6sx-sabreauto-m4.dts | 26 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6sx-sdb-m4.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6sx.dtsi | 5 |
4 files changed, 25 insertions, 11 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 82a41f7daad3..bb5bfcf62b3a 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -494,6 +494,7 @@ dtb-$(CONFIG_SOC_IMX6SX) += \ imx6sx-sdb-btwifi.dtb \ imx6sx-sdb-lcdif1.dtb \ imx6sx-sdb-ldo.dtb \ + imx6sx-sdb-m4.dtb \ imx6sx-sdb-mqs.dtb \ imx6sx-19x19-arm2.dtb \ imx6sx-19x19-arm2-ldo.dtb \ diff --git a/arch/arm/boot/dts/imx6sx-sabreauto-m4.dts b/arch/arm/boot/dts/imx6sx-sabreauto-m4.dts index 159e90739255..51ac31caee91 100644 --- a/arch/arm/boot/dts/imx6sx-sabreauto-m4.dts +++ b/arch/arm/boot/dts/imx6sx-sabreauto-m4.dts @@ -20,28 +20,28 @@ * The flollowing modules are conflicting with M4, disable them when m4 * is running. */ -&flexcan1 { - status = "disabled"; +&adc1 { + status = "disabled"; }; -&flexcan2 { - status = "disabled"; +&adc2 { + status = "disabled"; }; -&i2c3 { +&flexcan1 { status = "disabled"; }; -&uart2 { +&flexcan2 { status = "disabled"; }; -&adc1 { +&i2c3 { status = "disabled"; }; -&adc2 { - status = "disabled"; +&ocram { + reg = <0x00901000 0x1E000>; }; &ocram { @@ -57,8 +57,12 @@ status = "okay"; }; -&ocram { - reg = <0x00901000 0x1E000>; +&rpmsg{ + status = "okay"; +}; + +&uart2 { + status = "disabled"; }; &clks { diff --git a/arch/arm/boot/dts/imx6sx-sdb-m4.dts b/arch/arm/boot/dts/imx6sx-sdb-m4.dts index d96544deed9f..78f1b6b034d3 100644 --- a/arch/arm/boot/dts/imx6sx-sdb-m4.dts +++ b/arch/arm/boot/dts/imx6sx-sdb-m4.dts @@ -55,6 +55,10 @@ status = "okay"; }; +&rpmsg{ + status = "okay"; +}; + &uart2 { status = "disabled"; }; diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi index 4e3410038555..cb46cda1ac2a 100644 --- a/arch/arm/boot/dts/imx6sx.dtsi +++ b/arch/arm/boot/dts/imx6sx.dtsi @@ -1402,6 +1402,11 @@ status = "okay"; }; + rpmsg: rpmsg{ + compatible = "fsl,imx6sx-rpmsg"; + status = "disabled"; + }; + uart6: serial@022a0000 { compatible = "fsl,imx6sx-uart", "fsl,imx6q-uart", "fsl,imx21-uart"; |