diff options
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 2 | ||||
| -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, 26 insertions, 11 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index ae15b3083c64..11d49b744ac3 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -433,6 +433,7 @@ dtb-$(CONFIG_SOC_IMX6SX) += \ imx6sx-nitrogen6sx.dtb \ imx6sx-14x14-arm2.dtb \ imx6sx-sabreauto.dtb \ + imx6sx-sabreauto-m4.dtb \ imx6sx-sdb-reva.dtb \ imx6sx-sdb-sai.dtb \ imx6sx-sdb-reva-ldo.dtb \ @@ -440,6 +441,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-sdb-sai.dtb \ imx6sx-19x19-arm2.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 833dc5a06cc1..54fca46aa67d 100644 --- a/arch/arm/boot/dts/imx6sx.dtsi +++ b/arch/arm/boot/dts/imx6sx.dtsi @@ -1408,6 +1408,11 @@ status = "okay"; }; + rpmsg: rpmsg{ + compatible = "fsl,imx6sx-rpmsg"; + status = "disabled"; + }; + uart6: serial@022a0000 { compatible = "fsl,imx6sx-uart", "fsl,imx6q-uart", "fsl,imx21-uart"; |