diff mbox

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

Message ID 1418629849-37617-1-git-send-email-B45475@freescale.com
State Accepted
Delegated to: York Sun
Headers show

Commit Message

Zhao Qiang Dec. 15, 2014, 7:50 a.m. UTC 
Deep sleep for generic board is supported now,
modify qe deep-sleep code to adapt it.

Signed-off-by: Zhao Qiang <B45475@freescale.com>
---
Changes for v2:
	- rebase

 drivers/qe/qe.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

Comments

York Sun Dec. 15, 2014, 4:52 p.m. UTC | #1 
On 12/14/2014 11:50 PM, Zhao Qiang wrote:
> Deep sleep for generic board is supported now,
> modify qe deep-sleep code to adapt it.
> 
> Signed-off-by: Zhao Qiang <B45475@freescale.com>
> ---
> Changes for v2:
> 	- rebase

For future patches, please add version number in the subject. You can do so
using git format-patch --subject-prefix="Patch v2".

York
York Sun Dec. 16, 2014, 5:21 p.m. UTC | #2 
On 12/14/2014 11:50 PM, Zhao Qiang wrote:
> Deep sleep for generic board is supported now,
> modify qe deep-sleep code to adapt it.
> 
> Signed-off-by: Zhao Qiang <B45475@freescale.com>
> ---
> Changes for v2:
> 	- rebase
> 

Applied to u-boot-mpc85xx master, awaiting upstream.

York
diff mbox

Patch

diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c
index bc94673..d24651b 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;