From 270121f760579ed8b0bd8ea4d9eb03c4ac0bfbe0 Mon Sep 17 00:00:00 2001 From: Anson Huang Date: Wed, 19 Nov 2014 15:13:19 +0800 Subject: MLK-9872-2 arm: dts: imx6sx: add new qspi restore node As on different boards, MQX may run on different QSPI module, such as i.MX6SX SDB board using QSPI2, and i.MX6SX SABREAUTO using QSPI1, so here we add a node to tell kernel which QSPI module need to be restored after resume from DSM mode with Mega/Fast off, by default it is for QSPI2 to align with i.MX6SX SDB board, modify the baord dtb file to change it. Signed-off-by: Anson Huang --- arch/arm/boot/dts/imx6sx-sabreauto-m4.dts | 5 +++++ arch/arm/boot/dts/imx6sx-sdb-m4.dts | 4 ++++ arch/arm/boot/dts/imx6sx.dtsi | 6 ++++++ 3 files changed, 15 insertions(+) (limited to 'arch/arm/boot') diff --git a/arch/arm/boot/dts/imx6sx-sabreauto-m4.dts b/arch/arm/boot/dts/imx6sx-sabreauto-m4.dts index f18a643fa6ba..935a87046567 100644 --- a/arch/arm/boot/dts/imx6sx-sabreauto-m4.dts +++ b/arch/arm/boot/dts/imx6sx-sabreauto-m4.dts @@ -55,6 +55,11 @@ status = "disabled"; }; +&qspi_m4 { + reg = <0x021e0000 0x4000>; + status = "okay"; +}; + &ocram { reg = <0x00901000 0x1E000>; }; diff --git a/arch/arm/boot/dts/imx6sx-sdb-m4.dts b/arch/arm/boot/dts/imx6sx-sdb-m4.dts index 8841630f97f1..98a8f55eeb16 100644 --- a/arch/arm/boot/dts/imx6sx-sdb-m4.dts +++ b/arch/arm/boot/dts/imx6sx-sdb-m4.dts @@ -60,6 +60,10 @@ status = "disabled"; }; +&qspi_m4 { + status = "okay"; +}; + &ocram { reg = <0x00901000 0x1E000>; }; diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi index 39f738c3f193..0333cc0bf2c9 100644 --- a/arch/arm/boot/dts/imx6sx.dtsi +++ b/arch/arm/boot/dts/imx6sx.dtsi @@ -1068,6 +1068,12 @@ status = "disabled"; }; + qspi_m4: qspi-m4 { + compatible = "fsl,imx6sx-qspi-m4-restore"; + reg = <0x021e4000 0x4000>; + status = "disabled"; + }; + romcp@021ac000 { compatible = "fsl,imx6sx-romcp", "syscon"; reg = <0x021ac000 0x4000>; -- cgit v1.2.3