diff mbox

[U-Boot] qe/deep-sleep: add qe deep-sleep for generic board

Message ID 1415686226-24911-1-git-send-email-B45475@freescale.com
State Superseded
Delegated to: York Sun
Headers show

Commit Message

Zhao Qiang Nov. 11, 2014, 6:10 a.m. UTC 
Deep sleep for generic board is supported now,
and it use CONFIG_FSL_DEEP_SLEEP instead of CONFIG_DEEP_SLEEP,
so modify it for qe.

Signed-off-by: Zhao Qiang <B45475@freescale.com>
---
 drivers/qe/qe.c | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

Comments

York Sun Dec. 12, 2014, 9:27 p.m. UTC | #1 
On 11/10/2014 10:10 PM, Zhao Qiang wrote:
> Deep sleep for generic board is supported now,
> and it use CONFIG_FSL_DEEP_SLEEP instead of CONFIG_DEEP_SLEEP,
> so modify it for qe.
> 
> Signed-off-by: Zhao Qiang <B45475@freescale.com>
> ---

Qiang,

Can you rebase this patch and verify it on boards?

Thanks.

York
Zhao Qiang Dec. 15, 2014, 3:08 a.m. UTC | #2 
On 12/13/2014 5:27 AM, York Sun wrote:
> -----Original Message-----
> From: York Sun [mailto:yorksun@freescale.com]
> Sent: Saturday, December 13, 2014 5:27 AM
> To: Zhao Qiang-B45475; u-boot@lists.denx.de
> Subject: Re: [U-Boot] [PATCH] qe/deep-sleep: add qe deep-sleep for
> generic board
> 
> On 11/10/2014 10:10 PM, Zhao Qiang wrote:
> > Deep sleep for generic board is supported now, and it use
> > CONFIG_FSL_DEEP_SLEEP instead of CONFIG_DEEP_SLEEP, so modify it for
> > qe.
> >
> > Signed-off-by: Zhao Qiang <B45475@freescale.com>
> > ---
> 
> Qiang,
> 
> Can you rebase this patch and verify it on boards?


This patch doesn't needed due to the modify of its based patch from tang yuantian.
I will abandon it.
Thank you! 

> 
> Thanks.
> 
> York
> 
Best Regards
Zhao Qiang
Zhao Qiang Dec. 15, 2014, 7:55 a.m. UTC | #3 
Hi York,

I make mistake in previous email,
I have rebased the patch with link http://patchwork.ozlabs.org/patch/420999/.
Thank you!

Best Regards
Zhao Qiang


> -----Original Message-----
> From: York Sun [mailto:yorksun@freescale.com]
> Sent: Saturday, December 13, 2014 5:27 AM
> To: Zhao Qiang-B45475; u-boot@lists.denx.de
> Subject: Re: [U-Boot] [PATCH] qe/deep-sleep: add qe deep-sleep for
> generic board
> 
> On 11/10/2014 10:10 PM, Zhao Qiang wrote:
> > Deep sleep for generic board is supported now, and it use
> > CONFIG_FSL_DEEP_SLEEP instead of CONFIG_DEEP_SLEEP, so modify it for
> > qe.
> >
> > Signed-off-by: Zhao Qiang <B45475@freescale.com>
> > ---
> 
> Qiang,
> 
> Can you rebase this patch and verify it on boards?
> 
> Thanks.
> 
> York
>
diff mbox

Patch

diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c
index 2c5b9bf..8687e73 100644
--- a/drivers/qe/qe.c
+++ b/drivers/qe/qe.c
@@ -9,12 +9,15 @@ 
 
 #include "common.h"
 #include <command.h>
+#ifdef CONFIG_LS102XA
+#include <asm/arch/immap_ls102xa.h>
+#endif
 #include "asm/errno.h"
 #include "asm/io.h"
 #include "linux/immap_qe.h"
 #include "qe.h"
 
-#define MPC85xx_DEVDISR_QE_DISABLE	0x1
+#define DEVDISR_QE_DISABLE	0x1
 
 qe_map_t		*qe_immr = NULL;
 static qe_snum_t	snums[QE_NUM_OF_SNUM];
@@ -346,7 +349,7 @@  int qe_upload_firmware(const struct qe_firmware *firmware)
 	size_t calc_size = sizeof(struct qe_firmware);
 	size_t length;
 	const struct qe_header *hdr;
-#ifdef CONFIG_DEEP_SLEEP
+#if defined(CONFIG_FSL_DEEP_SLEEP) && defined(CONFIG_QE)
 	ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
 #endif
 	if (!firmware) {
@@ -361,8 +364,8 @@  int qe_upload_firmware(const struct qe_firmware *firmware)
 	if ((hdr->magic[0] != 'Q') || (hdr->magic[1] != 'E') ||
 	    (hdr->magic[2] != 'F')) {
 		printf("Not a microcode\n");
-#ifdef CONFIG_DEEP_SLEEP
-		setbits_be32(&gur->devdisr, MPC85xx_DEVDISR_QE_DISABLE);
+#if defined(CONFIG_FSL_DEEP_SLEEP) && defined(CONFIG_QE)
+		setbits_be32(&gur->devdisr, DEVDISR_QE_DISABLE);
 #endif
 		return -EPERM;
 	}
@@ -481,9 +484,13 @@  int u_qe_upload_firmware(const struct qe_firmware *firmware)
 	size_t calc_size = sizeof(struct qe_firmware);
 	size_t length;
 	const struct qe_header *hdr;
-#ifdef CONFIG_DEEP_SLEEP
+#ifdef CONFIG_FSL_DEEP_SLEEP
+#ifdef CONFIG_LS102XA
+	struct ccsr_gur __iomem *gur = (void *)CONFIG_SYS_FSL_GUTS_ADDR;
+#else
 	ccsr_gur_t __iomem *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
 #endif
+#endif
 	if (!firmware) {
 		printf("Invalid address\n");
 		return -EINVAL;
@@ -496,8 +503,8 @@  int u_qe_upload_firmware(const struct qe_firmware *firmware)
 	if ((hdr->magic[0] != 'Q') || (hdr->magic[1] != 'E') ||
 	    (hdr->magic[2] != 'F')) {
 		printf("Not a microcode\n");
-#ifdef CONFIG_DEEP_SLEEP
-		setbits_be32(&gur->devdisr, MPC85xx_DEVDISR_QE_DISABLE);
+#ifdef CONFIG_FSL_DEEP_SLEEP
+		setbits_be32(&gur->devdisr, DEVDISR_QE_DISABLE);
 #endif
 		return -EPERM;
 	}
@@ -588,9 +595,13 @@  int u_qe_firmware_resume(const struct qe_firmware *firmware, qe_map_t *qe_immrr)
 	unsigned int j;
 	const struct qe_header *hdr;
 	const u32 *code;
-#ifdef CONFIG_DEEP_SLEEP
+#ifdef CONFIG_FSL_DEEP_SLEEP
+#ifdef CONFIG_LS102XA
+	struct ccsr_gur __iomem *gur = (void *)CONFIG_SYS_FSL_GUTS_ADDR;
+#else
 	ccsr_gur_t __iomem *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
 #endif
+#endif
 
 	if (!firmware)
 		return -EINVAL;
@@ -600,8 +611,8 @@  int u_qe_firmware_resume(const struct qe_firmware *firmware, qe_map_t *qe_immrr)
 	/* Check the magic */
 	if ((hdr->magic[0] != 'Q') || (hdr->magic[1] != 'E') ||
 	    (hdr->magic[2] != 'F')) {
-#ifdef CONFIG_DEEP_SLEEP
-		setbits_be32(&gur->devdisr, MPC85xx_DEVDISR_QE_DISABLE);
+#ifdef CONFIG_FSL_DEEP_SLEEP
+		setbits_be32(&gur->devdisr, DEVDISR_QE_DISABLE);
 #endif
 		return -EPERM;
 	}