diff mbox

[U-Boot,2/4] powerpc, 8xx: Implement GLL2 ERRATA

Message ID 8be66e1dd57e24e6442e88ec175161f5c819f993.1498132599.git.christophe.leroy@c-s.fr
State Superseded
Delegated to: Tom Rini
Headers show

Commit Message

Christophe Leroy June 23, 2017, 12:57 p.m. UTC 
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
---
 arch/powerpc/cpu/mpc8xx/cpu_init.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

Comments

Tom Rini June 23, 2017, 1:28 p.m. UTC | #1 
On Fri, Jun 23, 2017 at 02:57:40PM +0200, Christophe Leroy wrote:

> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>

Reviewed-by: Tom Rini <trini@konsulko.com>
Wolfgang Denk June 23, 2017, 1:48 p.m. UTC | #2 
Dear Christophe Leroy,

In message <8be66e1dd57e24e6442e88ec175161f5c819f993.1498132599.git.christophe.leroy@c-s.fr> you wrote:
> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>

NAK.

The patch does not even apply as there is no such file in mainline:

CONFLICT (modify/delete): arch/powerpc/cpu/mpc8xx/cpu_init.c deleted in 431c66a3bad13e13c1d44ef4ec3638f95e72e11d and modified in powerpc, 8xx: Implement GLL2 ERRATA. Version powerpc, 8xx: Implement GLL2 ERRATA of arch/powerpc/cpu/mpc8xx/cpu_init.c left in tree.


Best regards,

Wolfgang Denk
Tom Rini June 23, 2017, 2:02 p.m. UTC | #3 
On Fri, Jun 23, 2017 at 03:48:54PM +0200, Wolfgang Denk wrote:

> Dear Christophe Leroy,
> 
> In message <8be66e1dd57e24e6442e88ec175161f5c819f993.1498132599.git.christophe.leroy@c-s.fr> you wrote:
> > Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
> 
> NAK.
> 
> The patch does not even apply as there is no such file in mainline:
> 
> CONFLICT (modify/delete): arch/powerpc/cpu/mpc8xx/cpu_init.c deleted in 431c66a3bad13e13c1d44ef4ec3638f95e72e11d and modified in powerpc, 8xx: Implement GLL2 ERRATA. Version powerpc, 8xx: Implement GLL2 ERRATA of arch/powerpc/cpu/mpc8xx/cpu_init.c left in tree.

Clearly depends on the "bring back mpc8xx" patch.  So yes, you can fault
Christophe for not stating in the cover letter that of course the series
depends on that patch.  Please otherwise review the content of the patch
with that in mind, thanks.
diff mbox

Patch

diff --git a/arch/powerpc/cpu/mpc8xx/cpu_init.c b/arch/powerpc/cpu/mpc8xx/cpu_init.c
index f621d6285c..5da12faf21 100644
--- a/arch/powerpc/cpu/mpc8xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc8xx/cpu_init.c
@@ -64,6 +64,18 @@  void cpu_init_f (volatile immap_t * immr)
 	reg |= CONFIG_SYS_SCCR;
 	immr->im_clkrst.car_sccr = reg;
 
+#ifdef CONFIG_MPC86x
+	/* BUG MPC866 GLL2 consideration */
+	reg = immr->im_clkrst.car_sccr;
+	/* probably we use the mode 1:2:1 */
+	if ((reg & 0x00060000) == 0x00020000) {
+		reg &= ~0x00060000;
+		immr->im_clkrst.car_sccr = reg;
+		reg |= 0x00020000;
+		immr->im_clkrst.car_sccr = reg;
+	}
+#endif
+
 	/* PLL (CPU clock) settings (15-30) */
 
 	immr->im_clkrstk.cark_plprcrk = KAPWR_KEY;