diff options
| author | Tom Rini <trini@ti.com> | 2014-12-16 15:20:02 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-12-16 15:20:02 -0500 |
| commit | e3bf81b1e841ecabe7c8b3d48621256db8b8623e (patch) | |
| tree | 5206fb056d00a7dc17eee3578ee7fd10bdbf9d5b /drivers/qe/qe.c | |
| parent | 3bfbf32b6fe5e2d4605bc7ee99d1844b572662c2 (diff) | |
| parent | 00233528559c913e4bfafb1505ebf65f78e02976 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'drivers/qe/qe.c')
| -rw-r--r-- | drivers/qe/qe.c | 11 |
1 files changed, 11 insertions, 0 deletions
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 <asm/arch/immap_ls102xa.h> +#endif #define MPC85xx_DEVDISR_QE_DISABLE 0x1 @@ -335,8 +338,12 @@ 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"); return -EINVAL; @@ -470,8 +477,12 @@ 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"); return -EINVAL; |