[PATCH 43/61] 8xx: Always reset CPM if not using early console.
From: Scott Wood <hidden>
Date: 2007-07-18 01:36:02
Subsystem:
linux for powerpc (32-bit and 64-bit), the rest · Maintainers:
Madhavan Srinivasan, Linus Torvalds
Some CPM devices conflict with each other, and the bootloader may have initialized a conflicting device. Signed-off-by: Scott Wood <redacted> --- arch/powerpc/sysdev/commproc.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/arch/powerpc/sysdev/commproc.c b/arch/powerpc/sysdev/commproc.c
index b0a58fd..eb791ea 100644
--- a/arch/powerpc/sysdev/commproc.c
+++ b/arch/powerpc/sysdev/commproc.c@@ -208,7 +208,7 @@ void cpm_reset(void) cpmp = &mpc8xx_immr->im_cpm; -#ifdef CONFIG_UCODE_PATCH +#ifndef CONFIG_PPC_EARLY_DEBUG /* Perform a reset. */ out_be16(&cpmp->cp_cpcr, CPM_CR_RST | CPM_CR_FLG);
@@ -216,7 +216,9 @@ void cpm_reset(void) /* Wait for it. */ while (in_be16(&cpmp->cp_cpcr) & CPM_CR_FLG); +#endif +#ifdef CONFIG_UCODE_PATCH cpm_load_patch(cpmp); #endif
--
1.5.0.3