public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH] qe/deep-sleep: modify qe deep-sleep for generic board
@ 2014-12-15  7:50 Zhao Qiang
  2014-12-15 16:52 ` York Sun
  2014-12-16 17:21 ` York Sun
  0 siblings, 2 replies; 3+ messages in thread
From: Zhao Qiang @ 2014-12-15  7:50 UTC (permalink / raw)
  To: u-boot

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(+)

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;
-- 
2.1.0.27.g96db324

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [U-Boot] [PATCH] qe/deep-sleep: modify qe deep-sleep for generic board
  2014-12-15  7:50 [U-Boot] [PATCH] qe/deep-sleep: modify qe deep-sleep for generic board Zhao Qiang
@ 2014-12-15 16:52 ` York Sun
  2014-12-16 17:21 ` York Sun
  1 sibling, 0 replies; 3+ messages in thread
From: York Sun @ 2014-12-15 16:52 UTC (permalink / raw)
  To: u-boot

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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [U-Boot] [PATCH] qe/deep-sleep: modify qe deep-sleep for generic board
  2014-12-15  7:50 [U-Boot] [PATCH] qe/deep-sleep: modify qe deep-sleep for generic board Zhao Qiang
  2014-12-15 16:52 ` York Sun
@ 2014-12-16 17:21 ` York Sun
  1 sibling, 0 replies; 3+ messages in thread
From: York Sun @ 2014-12-16 17:21 UTC (permalink / raw)
  To: u-boot

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

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-12-16 17:21 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-15  7:50 [U-Boot] [PATCH] qe/deep-sleep: modify qe deep-sleep for generic board Zhao Qiang
2014-12-15 16:52 ` York Sun
2014-12-16 17:21 ` York Sun

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox