]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
qe/deep-sleep: modify qe deep-sleep for generic board
authorZhao Qiang <B45475@freescale.com>
Mon, 15 Dec 2014 07:50:49 +0000 (15:50 +0800)
committerYork Sun <yorksun@freescale.com>
Mon, 15 Dec 2014 17:16:49 +0000 (09:16 -0800)
Deep sleep for generic board is supported now, modify qe
deep-sleep code to adapt it.

Signed-off-by: Zhao Qiang <B45475@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
drivers/qe/qe.c

index bc946731a1eb20aa670722a9bdde67efb1d20eee..d24651b5ba2b786e2a050cb3d98204d130365d6c 100644 (file)
@@ -13,6 +13,9 @@
 #include "asm/io.h"
 #include "linux/immap_qe.h"
 #include "qe.h"
+#ifdef CONFIG_LS102XA
+#include <asm/arch/immap_ls102xa.h>
+#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");