summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAnson Huang <b20788@freescale.com>2014-11-19 15:13:19 +0800
committerAnson Huang <b20788@freescale.com>2014-11-20 13:09:20 +0800
commit270121f760579ed8b0bd8ea4d9eb03c4ac0bfbe0 (patch)
tree02eb5e09fa92d74702c6a7fc4910e14f2f2a2752 /arch
parent4f6d9ffe32ed79169db91279d1ec09b2d40fca63 (diff)
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 <b20788@freescale.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/imx6sx-sabreauto-m4.dts5
-rw-r--r--arch/arm/boot/dts/imx6sx-sdb-m4.dts4
-rw-r--r--arch/arm/boot/dts/imx6sx.dtsi6
3 files changed, 15 insertions, 0 deletions
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>;