Skip to contentSkip to conversation

qe/deep-sleep: modify qe deep-sleep for generic board

PATCH New Zhao Qiang 2 participants 3 messages Dec 15, 2014 – Dec 16, 2014

lore
Share & tools
lore

Zhao Qiang

author
#0 lore raw

PATCH 1/1 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 <[email protected]>

---
Changes for v2:
- rebase

 drivers/qe/qe.c | 11 +++++++++++
 1 file changed, 11 insertions(+)
drivers/qe/qe.c +11 -0
index bc94673..d24651b 100644
@@ -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;
Signature · 1 line
2.1.0.27.g96db324
#1 lore raw

PATCH 1/1 qe/deep-sleep: modify qe deep-sleep for generic board

Quoted 7 lines · Zhao Qiang

Deep sleep for generic board is supported now,
modify qe deep-sleep code to adapt it.

Signed-off-by Zhao Qiang <[email protected]>

---
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

#2 lore raw

PATCH 1/1 qe/deep-sleep: modify qe deep-sleep for generic board

In reply to Zhao Qiang
Quoted 8 lines · Zhao Qiang

Deep sleep for generic board is supported now,
modify qe deep-sleep code to adapt it.

Signed-off-by Zhao Qiang <[email protected]>

---
Changes for v2:
- rebase

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

York