From 9c7c86f431866ee102cc68e6b5152f63250f49dc Mon Sep 17 00:00:00 2001 From: Zhao Qiang Date: Mon, 15 Dec 2014 15:50:49 +0800 Subject: [PATCH] qe/deep-sleep: modify qe deep-sleep for generic board Deep sleep for generic board is supported now, modify qe deep-sleep code to adapt it. Signed-off-by: Zhao Qiang Reviewed-by: York Sun --- drivers/qe/qe.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c index bc946731a1..d24651b5ba 100644 --- a/drivers/qe/qe.c +++ b/drivers/qe/qe.c @@ -13,6 +13,9 @@ #include "asm/io.h" #include "linux/immap_qe.h" #include "qe.h" +#ifdef CONFIG_LS102XA +#include +#endif #define MPC85xx_DEVDISR_QE_DISABLE 0x1 @@ -335,7 +338,11 @@ int qe_upload_firmware(const struct qe_firmware *firmware) size_t length; const struct qe_header *hdr; #ifdef CONFIG_DEEP_SLEEP +#ifdef CONFIG_LS102XA + struct ccsr_gur __iomem *gur = (void *)CONFIG_SYS_FSL_GUTS_ADDR; +#else ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); +#endif #endif if (!firmware) { printf("Invalid address\n"); @@ -470,7 +477,11 @@ int u_qe_upload_firmware(const struct qe_firmware *firmware) size_t length; const struct qe_header *hdr; #ifdef CONFIG_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"); -- 2.30.2