Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ba4573c authored by Josh Boyer's avatar Josh Boyer
Browse files

[POWERPC] Bamboo zImage wrapper 



Add a bootwrapper for the AMCC 440EP Bamboo Eval board.  This also adds a
common fixup_clock function for all 440EP(x) chips.

Signed-off-by: default avatarJosh Boyer <jwboyer@linux.vnet.ibm.com>
Acked-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 8c1449bd

arch/powerpc/boot/44x.h

+1 −0
Original line number Diff line number Diff line
@@ -11,5 +11,6 @@ 
#define _PPC_BOOT_44X_H_



void ebony_init(void *mac0, void *mac1);

void bamboo_init(void);



#endif /* _PPC_BOOT_44X_H_ */

arch/powerpc/boot/4xx.c

+82 −0
Original line number Diff line number Diff line
@@ -108,3 +108,85 @@ void ibm4xx_fixup_ebc_ranges(const char *ebc) 


	setprop(devp, "ranges", ranges, (p - ranges) * sizeof(u32));

}



#define SPRN_CCR1 0x378

void ibm440ep_fixup_clocks(unsigned int sysclk, unsigned int ser_clk)

{

	u32 cpu, plb, opb, ebc, tb, uart0, m, vco;

	u32 reg;

	u32 fwdva, fwdvb, fbdv, lfbdv, opbdv0, perdv0, spcid0, prbdv0, tmp;



	mtdcr(DCRN_CPR0_ADDR, CPR0_PLLD0);

	reg = mfdcr(DCRN_CPR0_DATA);

	tmp = (reg & 0x000F0000) >> 16;

	fwdva = tmp ? tmp : 16;

	tmp = (reg & 0x00000700) >> 8;

	fwdvb = tmp ? tmp : 8;

	tmp = (reg & 0x1F000000) >> 24;

	fbdv = tmp ? tmp : 32;

	lfbdv = (reg & 0x0000007F);



	mtdcr(DCRN_CPR0_ADDR, CPR0_OPBD0);

	reg = mfdcr(DCRN_CPR0_DATA);

	tmp = (reg & 0x03000000) >> 24;

	opbdv0 = tmp ? tmp : 4;



	mtdcr(DCRN_CPR0_ADDR, CPR0_PERD0);

	reg = mfdcr(DCRN_CPR0_DATA);

	tmp = (reg & 0x07000000) >> 24;

	perdv0 = tmp ? tmp : 8;



	mtdcr(DCRN_CPR0_ADDR, CPR0_PRIMBD0);

	reg = mfdcr(DCRN_CPR0_DATA);

	tmp = (reg & 0x07000000) >> 24;

	prbdv0 = tmp ? tmp : 8;



	mtdcr(DCRN_CPR0_ADDR, CPR0_SCPID);

	reg = mfdcr(DCRN_CPR0_DATA);

	tmp = (reg & 0x03000000) >> 24;

	spcid0 = tmp ? tmp : 4;



	/* Calculate M */

	mtdcr(DCRN_CPR0_ADDR, CPR0_PLLC0);

	reg = mfdcr(DCRN_CPR0_DATA);

	tmp = (reg & 0x03000000) >> 24;

	if (tmp == 0) { /* PLL output */

		tmp = (reg & 0x20000000) >> 29;

		if (!tmp) /* PLLOUTA */

			m = fbdv * lfbdv * fwdva;

		else

			m = fbdv * lfbdv * fwdvb;

	}

	else if (tmp == 1) /* CPU output */

		m = fbdv * fwdva;

	else

		m = perdv0 * opbdv0 * fwdvb;



	vco = (m * sysclk) + (m >> 1);

	cpu = vco / fwdva;

	plb = vco / fwdvb / prbdv0;

	opb = plb / opbdv0;

	ebc = plb / perdv0;



	/* FIXME */

	uart0 = ser_clk;



	/* Figure out timebase.  Either CPU or default TmrClk */

	asm volatile (

			"mfspr	%0,%1\n"

			:

			"=&r"(reg) : "i"(SPRN_CCR1));

	if (reg & 0x0080)

		tb = 25000000; /* TmrClk is 25MHz */

	else

		tb = cpu;



	dt_fixup_cpu_clocks(cpu, tb, 0);

	dt_fixup_clock("/plb", plb);

	dt_fixup_clock("/plb/opb", opb);

	dt_fixup_clock("/plb/opb/ebc", ebc);

	dt_fixup_clock("/plb/opb/serial@ef600300", uart0);

	dt_fixup_clock("/plb/opb/serial@ef600400", uart0);

	dt_fixup_clock("/plb/opb/serial@ef600500", uart0);

	dt_fixup_clock("/plb/opb/serial@ef600600", uart0);

}

arch/powerpc/boot/4xx.h

+1 −0
Original line number Diff line number Diff line
@@ -16,5 +16,6 @@ void ibm44x_dbcr_reset(void); 
void ibm40x_dbcr_reset(void);

void ibm4xx_quiesce_eth(u32 *emac0, u32 *emac1);

void ibm4xx_fixup_ebc_ranges(const char *ebc);

void ibm440ep_fixup_clocks(unsigned int sysclk, unsigned int ser_clk);



#endif /* _POWERPC_BOOT_4XX_H_ */

arch/powerpc/boot/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -44,10 +44,10 @@ $(addprefix $(obj)/,$(zlib) gunzip_util.o main.o): \ 
src-wlib := string.S crt0.S stdio.c main.c flatdevtree.c flatdevtree_misc.c \

		ns16550.c serial.c simple_alloc.c div64.S util.S \

		gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \

		4xx.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c cuboot.c

		4xx.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c cuboot.c bamboo.c

src-plat := of.c cuboot-83xx.c cuboot-85xx.c holly.c \

		cuboot-ebony.c treeboot-ebony.c prpmc2800.c \

		ps3-head.S ps3-hvcall.S ps3.c

		ps3-head.S ps3-hvcall.S ps3.c treeboot-bamboo.c

src-boot := $(src-wlib) $(src-plat) empty.c



src-boot := $(addprefix $(obj)/, $(src-boot))
@@ -142,6 +142,7 @@ ifneq ($(CONFIG_DEVICE_TREE),"") 
image-$(CONFIG_PPC_83xx)		+= cuImage.83xx

image-$(CONFIG_PPC_85xx)		+= cuImage.85xx

image-$(CONFIG_EBONY)			+= treeImage.ebony cuImage.ebony

image-$(CONFIG_BAMBOO)			+= treeImage.bamboo

endif



# For 32-bit powermacs, build the COFF and miboot images

arch/powerpc/boot/bamboo.c

0 → 100644
+45 −0
Original line number Diff line number Diff line 
/*

 * Copyright IBM Corporation, 2007

 * Josh Boyer <jwboyer@linux.vnet.ibm.com>

 *

 * Based on ebony wrapper:

 * Copyright 2007 David Gibson, IBM Corporation.

 *

 * Clocking code based on code by:

 * Stefan Roese <sr@denx.de>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; version 2 of the License

 */

#include <stdarg.h>

#include <stddef.h>

#include "types.h"

#include "elf.h"

#include "string.h"

#include "stdio.h"

#include "page.h"

#include "ops.h"

#include "dcr.h"

#include "4xx.h"

#include "44x.h"



extern char _dtb_start[];

extern char _dtb_end[];



static void bamboo_fixups(void)

{

	unsigned long sysclk = 33333333;



	ibm440ep_fixup_clocks(sysclk, 11059200);

	ibm4xx_fixup_memsize();

	ibm4xx_quiesce_eth((u32 *)0xef600e00, (u32 *)0xef600f00);

}



void bamboo_init(void)

{

	platform_ops.fixups = bamboo_fixups;

	platform_ops.exit = ibm44x_dbcr_reset;

	ft_init(_dtb_start, 0, 32);

	serial_console_init();

}