Skip to contentSkip to conversation

ARM: dts: imx6ul: add sram support for i.mx6ul

PATCH New Anson Huang 2 participants 4 messages Aug 4, 2015 – Sep 6, 2015

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/3 ARM: dts: imx6ul: add sram support for i.mx6ul

Add SRAM support for i.MX6UL, it has 128KB ocram
starting from 0x900000.

---
 arch/arm/boot/dts/imx6ul.dtsi | 5 +++++
 1 file changed, 5 insertions(+)
arch/arm/boot/dts/imx6ul.dtsi +5 -0
index b6c6c31..227ba6e 100644
@@ -133,6 +133,11 @@
 			status = "disabled";
 		};
 
+		ocram: sram at 00900000 {
+			compatible = "mmio-sram";
+			reg = <0x00900000 0x20000>;
+		};
+
 		aips1: aips-bus at 02000000 {
 			compatible = "fsl,aips-bus", "simple-bus";
 			#address-cells = <1>;
Signature · 1 line
1.9.1
#1 lore raw

PATCH 2/3 ARM: dts: imx6ul: add mmdc support for i.mx6ul

Add MMDC support for i.MX6UL.

---
 arch/arm/boot/dts/imx6ul.dtsi | 5 +++++
 1 file changed, 5 insertions(+)
arch/arm/boot/dts/imx6ul.dtsi +5 -0
index 227ba6e..d3c7ae1 100644
@@ -585,6 +585,11 @@
 				status = "disabled";
 			};
 
+			mmdc: mmdc at 021b0000 {
+				compatible = "fsl,imx6ul-mmdc", "fsl,imx6q-mmdc";
+				reg = <0x021b0000 0x4000>;
+			};
+
 			qspi: qspi at 021e0000 {
 				#address-cells = <1>;
 				#size-cells = <0>;
Signature · 1 line
1.9.1
#2 lore raw

PATCH 3/3 ARM: imx: add suspend/resume support for i.mx6ul

In reply to Anson Huang

This patch adds suspend function for i.MX6UL, it supports "standby" and "mem" mode, for "standby" mode, SoC will enter STOP mode only, while for "mem" mode, SoC will enter STOP mode and DDR IO will be set to low power mode.

As i.MX6UL contains a "Cortex-A7" ARM core which has no PL310, so we need to avoid any PL310 operations during suspend/resume, also, we need to flush Cortex-A7's inernal L2 cache before suspend.

---
 arch/arm/mach-imx/common.h       |  1 +
 arch/arm/mach-imx/mach-imx6ul.c  |  2 ++
 arch/arm/mach-imx/pm-imx6.c      | 46 ++++++++++++++++++++++++++++++++++------
 arch/arm/mach-imx/suspend-imx6.S |  3 +++
 4 files changed, 46 insertions(+), 6 deletions(-)
arch/arm/mach-imx/common.h +1 -0
index 21e4e86..e2d5383 100644
@@ -131,6 +131,7 @@ void imx6q_pm_init(void);
 void imx6dl_pm_init(void);
 void imx6sl_pm_init(void);
 void imx6sx_pm_init(void);
+void imx6ul_pm_init(void);
 
 #ifdef CONFIG_PM
 void imx51_pm_init(void);
arch/arm/mach-imx/mach-imx6ul.c +2 -0
index f206506..f78c107 100644
@@ -22,6 +22,7 @@ static void __init imx6ul_init_machine(void)
 
 	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 	imx_anatop_init();
+	imx6ul_pm_init();
 }
 
 static void __init imx6ul_init_irq(void)
@@ -29,6 +30,7 @@ static void __init imx6ul_init_irq(void)
 	imx_init_revision_from_anatop();
 	imx_src_init();
 	irqchip_init();
+	imx6_pm_ccm_init("fsl,imx6ul-ccm");
 }
 
 static const char *imx6ul_dt_compat[] __initconst = {
arch/arm/mach-imx/pm-imx6.c +40 -6

112 lines not on this page · raw message

arch/arm/mach-imx/suspend-imx6.S +3 -0
index b99987b..76ee2ce 100644
@@ -79,12 +79,15 @@
 	/* sync L2 cache to drain L2's buffers to DRAM. */
 #ifdef CONFIG_CACHE_L2X0
 	ldr	r11, [r0, #PM_INFO_MX6Q_L2_V_OFFSET]
+	teq	r11, #0
+	beq	6f
 	mov	r6, #0x0
 	str	r6, [r11, #L2X0_CACHE_SYNC]
 1:
 	ldr	r6, [r11, #L2X0_CACHE_SYNC]
 	ands	r6, r6, #0x1
 	bne	1b
+6:
 #endif
 
 	.endm
Signature · 1 line
1.9.1