|
|
|
/*
|
|
|
|
* Copyright (C) 2004-2009 Freescale Semiconductor, Inc.
|
|
|
|
*
|
|
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <common.h>
|
|
|
|
#include <mpc83xx.h>
|
|
|
|
#include <ioports.h>
|
|
|
|
#include <asm/io.h>
|
|
|
|
#ifdef CONFIG_USB_EHCI_FSL
|
|
|
|
#include <usb/ehci-fsl.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
|
|
|
|
#ifdef CONFIG_QE
|
|
|
|
extern qe_iop_conf_t qe_iop_conf_tab[];
|
|
|
|
extern void qe_config_iopin(u8 port, u8 pin, int dir,
|
|
|
|
int open_drain, int assign);
|
|
|
|
extern void qe_init(uint qe_base);
|
|
|
|
extern void qe_reset(void);
|
|
|
|
|
|
|
|
static void config_qe_ioports(void)
|
|
|
|
{
|
|
|
|
u8 port, pin;
|
|
|
|
int dir, open_drain, assign;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; qe_iop_conf_tab[i].assign != QE_IOP_TAB_END; i++) {
|
|
|
|
port = qe_iop_conf_tab[i].port;
|
|
|
|
pin = qe_iop_conf_tab[i].pin;
|
|
|
|
dir = qe_iop_conf_tab[i].dir;
|
|
|
|
open_drain = qe_iop_conf_tab[i].open_drain;
|
|
|
|
assign = qe_iop_conf_tab[i].assign;
|
|
|
|
qe_config_iopin(port, pin, dir, open_drain, assign);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Breathe some life into the CPU...
|
|
|
|
*
|
|
|
|
* Set up the memory map,
|
|
|
|
* initialize a bunch of registers,
|
|
|
|
* initialize the UPM's
|
|
|
|
*/
|
|
|
|
void cpu_init_f (volatile immap_t * im)
|
|
|
|
{
|
|
|
|
__be32 acr_mask =
|
|
|
|
#ifdef CONFIG_SYS_ACR_PIPE_DEP /* Arbiter pipeline depth */
|
|
|
|
ACR_PIPE_DEP |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_ACR_RPTCNT /* Arbiter repeat count */
|
|
|
|
ACR_RPTCNT |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_ACR_APARK /* Arbiter address parking mode */
|
|
|
|
ACR_APARK |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_ACR_PARKM /* Arbiter parking master */
|
|
|
|
ACR_PARKM |
|
|
|
|
#endif
|
|
|
|
0;
|
|
|
|
__be32 acr_val =
|
|
|
|
#ifdef CONFIG_SYS_ACR_PIPE_DEP /* Arbiter pipeline depth */
|
|
|
|
(CONFIG_SYS_ACR_PIPE_DEP << ACR_PIPE_DEP_SHIFT) |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_ACR_RPTCNT /* Arbiter repeat count */
|
|
|
|
(CONFIG_SYS_ACR_RPTCNT << ACR_RPTCNT_SHIFT) |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_ACR_APARK /* Arbiter address parking mode */
|
|
|
|
(CONFIG_SYS_ACR_APARK << ACR_APARK_SHIFT) |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_ACR_PARKM /* Arbiter parking master */
|
|
|
|
(CONFIG_SYS_ACR_PARKM << ACR_PARKM_SHIFT) |
|
|
|
|
#endif
|
|
|
|
0;
|
|
|
|
__be32 spcr_mask =
|
|
|
|
#ifdef CONFIG_SYS_SPCR_OPT /* Optimize transactions between CSB and other dev */
|
|
|
|
SPCR_OPT |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_SPCR_TSECEP /* all eTSEC's Emergency priority */
|
|
|
|
SPCR_TSECEP |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_SPCR_TSEC1EP /* TSEC1 Emergency priority */
|
|
|
|
SPCR_TSEC1EP |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_SPCR_TSEC2EP /* TSEC2 Emergency priority */
|
|
|
|
SPCR_TSEC2EP |
|
|
|
|
#endif
|
|
|
|
0;
|
|
|
|
__be32 spcr_val =
|
|
|
|
#ifdef CONFIG_SYS_SPCR_OPT
|
|
|
|
(CONFIG_SYS_SPCR_OPT << SPCR_OPT_SHIFT) |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_SPCR_TSECEP /* all eTSEC's Emergency priority */
|
|
|
|
(CONFIG_SYS_SPCR_TSECEP << SPCR_TSECEP_SHIFT) |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_SPCR_TSEC1EP /* TSEC1 Emergency priority */
|
|
|
|
(CONFIG_SYS_SPCR_TSEC1EP << SPCR_TSEC1EP_SHIFT) |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_SPCR_TSEC2EP /* TSEC2 Emergency priority */
|
|
|
|
(CONFIG_SYS_SPCR_TSEC2EP << SPCR_TSEC2EP_SHIFT) |
|
|
|
|
#endif
|
|
|
|
0;
|
|
|
|
__be32 sccr_mask =
|
|
|
|
#ifdef CONFIG_SYS_SCCR_ENCCM /* Encryption clock mode */
|
|
|
|
SCCR_ENCCM |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_SCCR_PCICM /* PCI & DMA clock mode */
|
|
|
|
SCCR_PCICM |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_SCCR_PCIEXP1CM /* PCIE1 clock mode */
|
|
|
|
SCCR_PCIEXP1CM |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_SCCR_PCIEXP2CM /* PCIE2 clock mode */
|
|
|
|
SCCR_PCIEXP2CM |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_SCCR_TSECCM /* all TSEC's clock mode */
|
|
|
|
SCCR_TSECCM |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_SCCR_TSEC1CM /* TSEC1 clock mode */
|
|
|
|
SCCR_TSEC1CM |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_SCCR_TSEC2CM /* TSEC2 clock mode */
|
|
|
|
SCCR_TSEC2CM |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_SCCR_TSEC1ON /* TSEC1 clock switch */
|
|
|
|
SCCR_TSEC1ON |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_SCCR_TSEC2ON /* TSEC2 clock switch */
|
|
|
|
SCCR_TSEC2ON |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_SCCR_USBMPHCM /* USB MPH clock mode */
|
|
|
|
SCCR_USBMPHCM |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_SCCR_USBDRCM /* USB DR clock mode */
|
|
|
|
SCCR_USBDRCM |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_SCCR_SATACM /* SATA controller clock mode */
|
|
|
|
SCCR_SATACM |
|
|
|
|
#endif
|
|
|
|
0;
|
|
|
|
__be32 sccr_val =
|
|
|
|
#ifdef CONFIG_SYS_SCCR_ENCCM /* Encryption clock mode */
|
|
|
|
(CONFIG_SYS_SCCR_ENCCM << SCCR_ENCCM_SHIFT) |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_SCCR_PCICM /* PCI & DMA clock mode */
|
|
|
|
(CONFIG_SYS_SCCR_PCICM << SCCR_PCICM_SHIFT) |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_SCCR_PCIEXP1CM /* PCIE1 clock mode */
|
|
|
|
(CONFIG_SYS_SCCR_PCIEXP1CM << SCCR_PCIEXP1CM_SHIFT) |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_SCCR_PCIEXP2CM /* PCIE2 clock mode */
|
|
|
|
(CONFIG_SYS_SCCR_PCIEXP2CM << SCCR_PCIEXP2CM_SHIFT) |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_SCCR_TSECCM /* all TSEC's clock mode */
|
|
|
|
(CONFIG_SYS_SCCR_TSECCM << SCCR_TSECCM_SHIFT) |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_SCCR_TSEC1CM /* TSEC1 clock mode */
|
|
|
|
(CONFIG_SYS_SCCR_TSEC1CM << SCCR_TSEC1CM_SHIFT) |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_SCCR_TSEC2CM /* TSEC2 clock mode */
|
|
|
|
(CONFIG_SYS_SCCR_TSEC2CM << SCCR_TSEC2CM_SHIFT) |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_SCCR_TSEC1ON /* TSEC1 clock switch */
|
|
|
|
(CONFIG_SYS_SCCR_TSEC1ON << SCCR_TSEC1ON_SHIFT) |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_SCCR_TSEC2ON /* TSEC2 clock switch */
|
|
|
|
(CONFIG_SYS_SCCR_TSEC2ON << SCCR_TSEC2ON_SHIFT) |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_SCCR_USBMPHCM /* USB MPH clock mode */
|
|
|
|
(CONFIG_SYS_SCCR_USBMPHCM << SCCR_USBMPHCM_SHIFT) |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_SCCR_USBDRCM /* USB DR clock mode */
|
|
|
|
(CONFIG_SYS_SCCR_USBDRCM << SCCR_USBDRCM_SHIFT) |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_SCCR_SATACM /* SATA controller clock mode */
|
|
|
|
(CONFIG_SYS_SCCR_SATACM << SCCR_SATACM_SHIFT) |
|
|
|
|
#endif
|
|
|
|
0;
|
mpc83xx: boot time regression, move LCRR setup back to cpu_init_f
Commit c7190f02 (retain POR values of non-configured ACR, SPCR, SCCR,
and LCRR bitfields) moved the LCRR assignment to after relocation
to RAM because of the potential problem with changing the local bus
clock while executing from flash.
This change unfortunately adversely affects the boot time, as running
all code up to cpu_init_r can cause significant slowdown.
E.G. on a 8347 board a bootup time increase of ~600ms has been observed:
0.020 CPU: e300c1, MPC8347_PBGA_EA, Rev: 3.0 at 400 MHz, CSB: 266.667 MHz
0.168 RS: 232
0.172 I2C: ready
0.176 DRAM: 64 MB
1.236 FLASH: 32 MB
Versus:
0.016 CPU: e300c1, MPC8347_PBGA_EA, Rev: 3.0 at 400 MHz, CSB: 266.667 MHz
0.092 RS: 232
0.092 I2C: ready
0.096 DRAM: 64 MB
0.644 FLASH: 32 MB
So far no boards have needed the late LCRR setup, so simply revert it
for now - If it is needed at a later time, those boards can either do
their own final LCRR setup in board code (E.G. in board_early_init_r),
or we can introduce a CONFIG_SYS_LCRR_LATE config option to only do
the setup in cpu_init_r.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
15 years ago
|
|
|
__be32 lcrr_mask =
|
|
|
|
#ifdef CONFIG_SYS_LCRR_DBYP /* PLL bypass */
|
|
|
|
LCRR_DBYP |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_LCRR_EADC /* external address delay */
|
|
|
|
LCRR_EADC |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_LCRR_CLKDIV /* system clock divider */
|
|
|
|
LCRR_CLKDIV |
|
|
|
|
#endif
|
|
|
|
0;
|
|
|
|
__be32 lcrr_val =
|
|
|
|
#ifdef CONFIG_SYS_LCRR_DBYP /* PLL bypass */
|
|
|
|
CONFIG_SYS_LCRR_DBYP |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_LCRR_EADC
|
|
|
|
CONFIG_SYS_LCRR_EADC |
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_LCRR_CLKDIV /* system clock divider */
|
|
|
|
CONFIG_SYS_LCRR_CLKDIV |
|
|
|
|
#endif
|
|
|
|
0;
|
|
|
|
|
|
|
|
/* Pointer is writable since we allocated a register for it */
|
|
|
|
gd = (gd_t *) (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_GBL_DATA_OFFSET);
|
|
|
|
|
|
|
|
/* Clear initial global data */
|
|
|
|
memset ((void *) gd, 0, sizeof (gd_t));
|
|
|
|
|
|
|
|
/* system performance tweaking */
|
|
|
|
clrsetbits_be32(&im->arbiter.acr, acr_mask, acr_val);
|
|
|
|
|
|
|
|
clrsetbits_be32(&im->sysconf.spcr, spcr_mask, spcr_val);
|
|
|
|
|
|
|
|
clrsetbits_be32(&im->clk.sccr, sccr_mask, sccr_val);
|
|
|
|
|
|
|
|
/* RSR - Reset Status Register - clear all status (4.6.1.3) */
|
|
|
|
gd->arch.reset_status = __raw_readl(&im->reset.rsr);
|
|
|
|
__raw_writel(~(RSR_RES), &im->reset.rsr);
|
|
|
|
|
|
|
|
/* AER - Arbiter Event Register - store status */
|
|
|
|
gd->arch.arbiter_event_attributes = __raw_readl(&im->arbiter.aeatr);
|
|
|
|
gd->arch.arbiter_event_address = __raw_readl(&im->arbiter.aeadr);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* RMR - Reset Mode Register
|
|
|
|
* contains checkstop reset enable (4.6.1.4)
|
|
|
|
*/
|
|
|
|
__raw_writel(RMR_CSRE & (1<<RMR_CSRE_SHIFT), &im->reset.rmr);
|
|
|
|
|
mpc83xx: boot time regression, move LCRR setup back to cpu_init_f
Commit c7190f02 (retain POR values of non-configured ACR, SPCR, SCCR,
and LCRR bitfields) moved the LCRR assignment to after relocation
to RAM because of the potential problem with changing the local bus
clock while executing from flash.
This change unfortunately adversely affects the boot time, as running
all code up to cpu_init_r can cause significant slowdown.
E.G. on a 8347 board a bootup time increase of ~600ms has been observed:
0.020 CPU: e300c1, MPC8347_PBGA_EA, Rev: 3.0 at 400 MHz, CSB: 266.667 MHz
0.168 RS: 232
0.172 I2C: ready
0.176 DRAM: 64 MB
1.236 FLASH: 32 MB
Versus:
0.016 CPU: e300c1, MPC8347_PBGA_EA, Rev: 3.0 at 400 MHz, CSB: 266.667 MHz
0.092 RS: 232
0.092 I2C: ready
0.096 DRAM: 64 MB
0.644 FLASH: 32 MB
So far no boards have needed the late LCRR setup, so simply revert it
for now - If it is needed at a later time, those boards can either do
their own final LCRR setup in board code (E.G. in board_early_init_r),
or we can introduce a CONFIG_SYS_LCRR_LATE config option to only do
the setup in cpu_init_r.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
15 years ago
|
|
|
/* LCRR - Clock Ratio Register (10.3.1.16)
|
|
|
|
* write, read, and isync per MPC8379ERM rev.1 CLKDEV field description
|
|
|
|
*/
|
|
|
|
clrsetbits_be32(&im->im_lbc.lcrr, lcrr_mask, lcrr_val);
|
|
|
|
__raw_readl(&im->im_lbc.lcrr);
|
mpc83xx: boot time regression, move LCRR setup back to cpu_init_f
Commit c7190f02 (retain POR values of non-configured ACR, SPCR, SCCR,
and LCRR bitfields) moved the LCRR assignment to after relocation
to RAM because of the potential problem with changing the local bus
clock while executing from flash.
This change unfortunately adversely affects the boot time, as running
all code up to cpu_init_r can cause significant slowdown.
E.G. on a 8347 board a bootup time increase of ~600ms has been observed:
0.020 CPU: e300c1, MPC8347_PBGA_EA, Rev: 3.0 at 400 MHz, CSB: 266.667 MHz
0.168 RS: 232
0.172 I2C: ready
0.176 DRAM: 64 MB
1.236 FLASH: 32 MB
Versus:
0.016 CPU: e300c1, MPC8347_PBGA_EA, Rev: 3.0 at 400 MHz, CSB: 266.667 MHz
0.092 RS: 232
0.092 I2C: ready
0.096 DRAM: 64 MB
0.644 FLASH: 32 MB
So far no boards have needed the late LCRR setup, so simply revert it
for now - If it is needed at a later time, those boards can either do
their own final LCRR setup in board code (E.G. in board_early_init_r),
or we can introduce a CONFIG_SYS_LCRR_LATE config option to only do
the setup in cpu_init_r.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
15 years ago
|
|
|
isync();
|
|
|
|
|
|
|
|
/* Enable Time Base & Decrementer ( so we will have udelay() )*/
|
|
|
|
setbits_be32(&im->sysconf.spcr, SPCR_TBEN);
|
|
|
|
|
|
|
|
/* System General Purpose Register */
|
|
|
|
#ifdef CONFIG_SYS_SICRH
|
|
|
|
#if defined(CONFIG_MPC834x) || defined(CONFIG_MPC8313)
|
|
|
|
/* regarding to MPC34x manual rev.1 bits 28..29 must be preserved */
|
|
|
|
__raw_writel((im->sysconf.sicrh & 0x0000000C) | CONFIG_SYS_SICRH,
|
|
|
|
&im->sysconf.sicrh);
|
|
|
|
#else
|
|
|
|
__raw_writel(CONFIG_SYS_SICRH, &im->sysconf.sicrh);
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_SICRL
|
|
|
|
__raw_writel(CONFIG_SYS_SICRL, &im->sysconf.sicrl);
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_GPR1
|
|
|
|
__raw_writel(CONFIG_SYS_GPR1, &im->sysconf.gpr1);
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_DDRCDR /* DDR control driver register */
|
|
|
|
__raw_writel(CONFIG_SYS_DDRCDR, &im->sysconf.ddrcdr);
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_OBIR /* Output buffer impedance register */
|
|
|
|
__raw_writel(CONFIG_SYS_OBIR, &im->sysconf.obir);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef CONFIG_QE
|
|
|
|
/* Config QE ioports */
|
|
|
|
config_qe_ioports();
|
|
|
|
#endif
|
|
|
|
/* Set up preliminary BR/OR regs */
|
|
|
|
init_early_memctl_regs();
|
|
|
|
|
|
|
|
/* Local Access window setup */
|
|
|
|
#if defined(CONFIG_SYS_LBLAWBAR0_PRELIM) && defined(CONFIG_SYS_LBLAWAR0_PRELIM)
|
|
|
|
im->sysconf.lblaw[0].bar = CONFIG_SYS_LBLAWBAR0_PRELIM;
|
|
|
|
im->sysconf.lblaw[0].ar = CONFIG_SYS_LBLAWAR0_PRELIM;
|
|
|
|
#else
|
|
|
|
#error CONFIG_SYS_LBLAWBAR0_PRELIM & CONFIG_SYS_LBLAWAR0_PRELIM must be defined
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if defined(CONFIG_SYS_LBLAWBAR1_PRELIM) && defined(CONFIG_SYS_LBLAWAR1_PRELIM)
|
|
|
|
im->sysconf.lblaw[1].bar = CONFIG_SYS_LBLAWBAR1_PRELIM;
|
|
|
|
im->sysconf.lblaw[1].ar = CONFIG_SYS_LBLAWAR1_PRELIM;
|
|
|
|
#endif
|
|
|
|
#if defined(CONFIG_SYS_LBLAWBAR2_PRELIM) && defined(CONFIG_SYS_LBLAWAR2_PRELIM)
|
|
|
|
im->sysconf.lblaw[2].bar = CONFIG_SYS_LBLAWBAR2_PRELIM;
|
|
|
|
im->sysconf.lblaw[2].ar = CONFIG_SYS_LBLAWAR2_PRELIM;
|
|
|
|
#endif
|
|
|
|
#if defined(CONFIG_SYS_LBLAWBAR3_PRELIM) && defined(CONFIG_SYS_LBLAWAR3_PRELIM)
|
|
|
|
im->sysconf.lblaw[3].bar = CONFIG_SYS_LBLAWBAR3_PRELIM;
|
|
|
|
im->sysconf.lblaw[3].ar = CONFIG_SYS_LBLAWAR3_PRELIM;
|
|
|
|
#endif
|
|
|
|
#if defined(CONFIG_SYS_LBLAWBAR4_PRELIM) && defined(CONFIG_SYS_LBLAWAR4_PRELIM)
|
|
|
|
im->sysconf.lblaw[4].bar = CONFIG_SYS_LBLAWBAR4_PRELIM;
|
|
|
|
im->sysconf.lblaw[4].ar = CONFIG_SYS_LBLAWAR4_PRELIM;
|
|
|
|
#endif
|
|
|
|
#if defined(CONFIG_SYS_LBLAWBAR5_PRELIM) && defined(CONFIG_SYS_LBLAWAR5_PRELIM)
|
|
|
|
im->sysconf.lblaw[5].bar = CONFIG_SYS_LBLAWBAR5_PRELIM;
|
|
|
|
im->sysconf.lblaw[5].ar = CONFIG_SYS_LBLAWAR5_PRELIM;
|
|
|
|
#endif
|
|
|
|
#if defined(CONFIG_SYS_LBLAWBAR6_PRELIM) && defined(CONFIG_SYS_LBLAWAR6_PRELIM)
|
|
|
|
im->sysconf.lblaw[6].bar = CONFIG_SYS_LBLAWBAR6_PRELIM;
|
|
|
|
im->sysconf.lblaw[6].ar = CONFIG_SYS_LBLAWAR6_PRELIM;
|
|
|
|
#endif
|
|
|
|
#if defined(CONFIG_SYS_LBLAWBAR7_PRELIM) && defined(CONFIG_SYS_LBLAWAR7_PRELIM)
|
|
|
|
im->sysconf.lblaw[7].bar = CONFIG_SYS_LBLAWBAR7_PRELIM;
|
|
|
|
im->sysconf.lblaw[7].ar = CONFIG_SYS_LBLAWAR7_PRELIM;
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_GPIO1_PRELIM
|
|
|
|
im->gpio[0].dat = CONFIG_SYS_GPIO1_DAT;
|
|
|
|
im->gpio[0].dir = CONFIG_SYS_GPIO1_DIR;
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_SYS_GPIO2_PRELIM
|
|
|
|
im->gpio[1].dat = CONFIG_SYS_GPIO2_DAT;
|
|
|
|
im->gpio[1].dir = CONFIG_SYS_GPIO2_DIR;
|
|
|
|
#endif
|
mpc83xx: restrict UTMI PHY configuration to 831x parts
i.e, to those parts that have PHY_CLK_VALID bits in their USB
CONTROL registers:
mpc8308 WU_INT, PHY_CLK_SEL, USB_EN, WU_INT_EN, ULPI_INT_EN
mpc831x PHY_CLK_VALID, WU_INT, CLKIN_SEL, PHY_CLK_SEL, UTMI_PHY_EN,
PLL_RESET, REFSEL, OTG_PORT, KEEP_OTG_ON, LSF_EN, USB_EN,
ULPI_INT_EN
mpc834x USB_EN, ULPI_INT1_EN (MPH only), ULPI_INT0_EN
mpc837x USB_EN, ULPI_INT_EN
(mpc832x, mpc8360 don't have a USB_EHCI_FSL compatible controller)
this prevents non-831x parts from never completing cpu_init_f(),
because the (non-existent) PHY_CLK_VALID bit never gets set.
Reported-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Tested-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
14 years ago
|
|
|
#if defined(CONFIG_USB_EHCI_FSL) && defined(CONFIG_MPC831x)
|
|
|
|
uint32_t temp;
|
|
|
|
struct usb_ehci *ehci = (struct usb_ehci *)CONFIG_SYS_FSL_USB1_ADDR;
|
|
|
|
|
|
|
|
/* Configure interface. */
|
|
|
|
setbits_be32(&ehci->control, REFSEL_16MHZ | UTMI_PHY_EN);
|
|
|
|
|
|
|
|
/* Wait for clock to stabilize */
|
|
|
|
do {
|
|
|
|
temp = __raw_readl(&ehci->control);
|
|
|
|
udelay(1000);
|
|
|
|
} while (!(temp & PHY_CLK_VALID));
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
int cpu_init_r (void)
|
|
|
|
{
|
|
|
|
#ifdef CONFIG_QE
|
|
|
|
uint qe_base = CONFIG_SYS_IMMR + 0x00100000; /* QE immr base */
|
|
|
|
|
|
|
|
qe_init(qe_base);
|
|
|
|
qe_reset();
|
|
|
|
#endif
|
|
|
|
return 0;
|
|
|
|
}
|
mpc83xx: Add support for the display of reset status
83xx processor family has many reset sources, such as
power on reset, software hard reset, software soft reset,
JTAG, bus monitor, software watchdog, check stop reset,
external hard reset, external software reset.
sometimes, to figure out the fault of system, we need to
know the cause of reset early before the prompt of
u-boot present.
Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
18 years ago
|
|
|
|
|
|
|
/*
|
|
|
|
* Print out the bus arbiter event
|
|
|
|
*/
|
|
|
|
#if defined(CONFIG_DISPLAY_AER_FULL)
|
|
|
|
static int print_83xx_arb_event(int force)
|
|
|
|
{
|
|
|
|
static char* event[] = {
|
|
|
|
"Address Time Out",
|
|
|
|
"Data Time Out",
|
|
|
|
"Address Only Transfer Type",
|
|
|
|
"External Control Word Transfer Type",
|
|
|
|
"Reserved Transfer Type",
|
|
|
|
"Transfer Error",
|
|
|
|
"reserved",
|
|
|
|
"reserved"
|
|
|
|
};
|
|
|
|
static char* master[] = {
|
|
|
|
"e300 Core Data Transaction",
|
|
|
|
"reserved",
|
|
|
|
"e300 Core Instruction Fetch",
|
|
|
|
"reserved",
|
|
|
|
"TSEC1",
|
|
|
|
"TSEC2",
|
|
|
|
"USB MPH",
|
|
|
|
"USB DR",
|
|
|
|
"Encryption Core",
|
|
|
|
"I2C Boot Sequencer",
|
|
|
|
"JTAG",
|
|
|
|
"reserved",
|
|
|
|
"eSDHC",
|
|
|
|
"PCI1",
|
|
|
|
"PCI2",
|
|
|
|
"DMA",
|
|
|
|
"QUICC Engine 00",
|
|
|
|
"QUICC Engine 01",
|
|
|
|
"QUICC Engine 10",
|
|
|
|
"QUICC Engine 11",
|
|
|
|
"reserved",
|
|
|
|
"reserved",
|
|
|
|
"reserved",
|
|
|
|
"reserved",
|
|
|
|
"SATA1",
|
|
|
|
"SATA2",
|
|
|
|
"SATA3",
|
|
|
|
"SATA4",
|
|
|
|
"reserved",
|
|
|
|
"PCI Express 1",
|
|
|
|
"PCI Express 2",
|
|
|
|
"TDM-DMAC"
|
|
|
|
};
|
|
|
|
static char *transfer[] = {
|
|
|
|
"Address-only, Clean Block",
|
|
|
|
"Address-only, lwarx reservation set",
|
|
|
|
"Single-beat or Burst write",
|
|
|
|
"reserved",
|
|
|
|
"Address-only, Flush Block",
|
|
|
|
"reserved",
|
|
|
|
"Burst write",
|
|
|
|
"reserved",
|
|
|
|
"Address-only, sync",
|
|
|
|
"Address-only, tlbsync",
|
|
|
|
"Single-beat or Burst read",
|
|
|
|
"Single-beat or Burst read",
|
|
|
|
"Address-only, Kill Block",
|
|
|
|
"Address-only, icbi",
|
|
|
|
"Burst read",
|
|
|
|
"reserved",
|
|
|
|
"Address-only, eieio",
|
|
|
|
"reserved",
|
|
|
|
"Single-beat write",
|
|
|
|
"reserved",
|
|
|
|
"ecowx - Illegal single-beat write",
|
|
|
|
"reserved",
|
|
|
|
"reserved",
|
|
|
|
"reserved",
|
|
|
|
"Address-only, TLB Invalidate",
|
|
|
|
"reserved",
|
|
|
|
"Single-beat or Burst read",
|
|
|
|
"reserved",
|
|
|
|
"eciwx - Illegal single-beat read",
|
|
|
|
"reserved",
|
|
|
|
"Burst read",
|
|
|
|
"reserved"
|
|
|
|
};
|
|
|
|
|
|
|
|
int etype = (gd->arch.arbiter_event_attributes & AEATR_EVENT)
|
|
|
|
>> AEATR_EVENT_SHIFT;
|
|
|
|
int mstr_id = (gd->arch.arbiter_event_attributes & AEATR_MSTR_ID)
|
|
|
|
>> AEATR_MSTR_ID_SHIFT;
|
|
|
|
int tbst = (gd->arch.arbiter_event_attributes & AEATR_TBST)
|
|
|
|
>> AEATR_TBST_SHIFT;
|
|
|
|
int tsize = (gd->arch.arbiter_event_attributes & AEATR_TSIZE)
|
|
|
|
>> AEATR_TSIZE_SHIFT;
|
|
|
|
int ttype = (gd->arch.arbiter_event_attributes & AEATR_TTYPE)
|
|
|
|
>> AEATR_TTYPE_SHIFT;
|
|
|
|
|
|
|
|
if (!force && !gd->arch.arbiter_event_address)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
puts("Arbiter Event Status:\n");
|
|
|
|
printf(" Event Address: 0x%08lX\n",
|
|
|
|
gd->arch.arbiter_event_address);
|
|
|
|
printf(" Event Type: 0x%1x = %s\n", etype, event[etype]);
|
|
|
|
printf(" Master ID: 0x%02x = %s\n", mstr_id, master[mstr_id]);
|
|
|
|
printf(" Transfer Size: 0x%1x = %d bytes\n", (tbst<<3) | tsize,
|
|
|
|
tbst ? (tsize ? tsize : 8) : 16 + 8 * tsize);
|
|
|
|
printf(" Transfer Type: 0x%02x = %s\n", ttype, transfer[ttype]);
|
|
|
|
|
|
|
|
return gd->arch.arbiter_event_address;
|
|
|
|
}
|
|
|
|
|
|
|
|
#elif defined(CONFIG_DISPLAY_AER_BRIEF)
|
|
|
|
|
|
|
|
static int print_83xx_arb_event(int force)
|
|
|
|
{
|
|
|
|
if (!force && !gd->arch.arbiter_event_address)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
printf("Arbiter Event Status: AEATR=0x%08lX, AEADR=0x%08lX\n",
|
|
|
|
gd->arch.arbiter_event_attributes,
|
|
|
|
gd->arch.arbiter_event_address);
|
|
|
|
|
|
|
|
return gd->arch.arbiter_event_address;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_DISPLAY_AER_xxxx */
|
|
|
|
|
|
|
|
/*
|
mpc83xx: Add support for the display of reset status
83xx processor family has many reset sources, such as
power on reset, software hard reset, software soft reset,
JTAG, bus monitor, software watchdog, check stop reset,
external hard reset, external software reset.
sometimes, to figure out the fault of system, we need to
know the cause of reset early before the prompt of
u-boot present.
Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
18 years ago
|
|
|
* Figure out the cause of the reset
|
|
|
|
*/
|
|
|
|
int prt_83xx_rsr(void)
|
|
|
|
{
|
|
|
|
static struct {
|
|
|
|
ulong mask;
|
|
|
|
char *desc;
|
|
|
|
} bits[] = {
|
|
|
|
{
|
|
|
|
RSR_SWSR, "Software Soft"}, {
|
|
|
|
RSR_SWHR, "Software Hard"}, {
|
|
|
|
RSR_JSRS, "JTAG Soft"}, {
|
|
|
|
RSR_CSHR, "Check Stop"}, {
|
|
|
|
RSR_SWRS, "Software Watchdog"}, {
|
|
|
|
RSR_BMRS, "Bus Monitor"}, {
|
|
|
|
RSR_SRS, "External/Internal Soft"}, {
|
|
|
|
RSR_HRS, "External/Internal Hard"}
|
|
|
|
};
|
|
|
|
static int n = sizeof bits / sizeof bits[0];
|
|
|
|
ulong rsr = gd->arch.reset_status;
|
mpc83xx: Add support for the display of reset status
83xx processor family has many reset sources, such as
power on reset, software hard reset, software soft reset,
JTAG, bus monitor, software watchdog, check stop reset,
external hard reset, external software reset.
sometimes, to figure out the fault of system, we need to
know the cause of reset early before the prompt of
u-boot present.
Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
18 years ago
|
|
|
int i;
|
|
|
|
char *sep;
|
|
|
|
|
|
|
|
puts("Reset Status:");
|
|
|
|
|
|
|
|
sep = " ";
|
|
|
|
for (i = 0; i < n; i++)
|
|
|
|
if (rsr & bits[i].mask) {
|
|
|
|
printf("%s%s", sep, bits[i].desc);
|
|
|
|
sep = ", ";
|
|
|
|
}
|
|
|
|
puts("\n");
|
|
|
|
|
|
|
|
#if defined(CONFIG_DISPLAY_AER_FULL) || defined(CONFIG_DISPLAY_AER_BRIEF)
|
|
|
|
print_83xx_arb_event(rsr & RSR_BMRS);
|
|
|
|
#endif
|
|
|
|
puts("\n");
|
|
|
|
|
mpc83xx: Add support for the display of reset status
83xx processor family has many reset sources, such as
power on reset, software hard reset, software soft reset,
JTAG, bus monitor, software watchdog, check stop reset,
external hard reset, external software reset.
sometimes, to figure out the fault of system, we need to
know the cause of reset early before the prompt of
u-boot present.
Signed-off-by: Dave Liu <daveliu@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
18 years ago
|
|
|
return 0;
|
|
|
|
}
|