brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-09-28 23:50:26 +09:00
Code Issues Projects Releases Wiki Activity

ColdFire: Clean up checkpatch warnings for MCF5227x

Browse Source 
Signed-off-by: Alison Wang <b18965@freescale.com>
This commit is contained in:
Alison Wang 2012-03-26 21:49:03 +00:00 committed by jason
parent 33d4411931
commit 849fc42471
5 changed files with 122 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/m68k/cpu/mcf5227x/cpu.c
View File

@ -3,7 +3,7 @@
* (C) Copyright 2000-2003 * (C) Copyright 2000-2003
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* Copyright (C) 2004-2007 Freescale Semiconductor, Inc. * Copyright (C) 2004-2007, 2012 Freescale Semiconductor, Inc.
* TsiChung Liew (Tsi-Chung.Liew@freescale.com) * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -30,14 +30,15 @@
#include <command.h> #include <command.h>
#include <asm/immap.h> #include <asm/immap.h>
#include <asm/io.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
volatile rcm_t *rcm = (rcm_t *) (MMAP_RCM); rcm_t *rcm = (rcm_t *) (MMAP_RCM);
udelay(1000); udelay(1000);
rcm->rcr |= RCM_RCR_SOFTRST; setbits_8(&rcm->rcr, RCM_RCR_SOFTRST);
/* we don't return! */ /* we don't return! */
return 0; return 0;
@ -45,14 +46,14 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
int checkcpu(void) int checkcpu(void)
{ {
volatile ccm_t *ccm = (ccm_t *) MMAP_CCM; ccm_t *ccm = (ccm_t *) MMAP_CCM;
u16 msk; u16 msk;
u16 id = 0; u16 id = 0;
u8 ver; u8 ver;
puts("CPU: "); puts("CPU: ");
msk = (ccm->cir >> 6); msk = (in_be16(&ccm->cir) >> 6);
ver = (ccm->cir & 0x003f); ver = (in_be16(&ccm->cir) & 0x003f);
switch (msk) { switch (msk) {
case 0x6c: case 0x6c:
id = 52277; id = 52277;

138
arch/m68k/cpu/mcf5227x/cpu_init.c
View File

@ -3,7 +3,7 @@
* (C) Copyright 2000-2003 * (C) Copyright 2000-2003
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* (C) Copyright 2004-2007 Freescale Semiconductor, Inc. * (C) Copyright 2004-2007, 2012 Freescale Semiconductor, Inc.
* TsiChung Liew (Tsi-Chung.Liew@freescale.com) * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -29,6 +29,7 @@
#include <watchdog.h> #include <watchdog.h>
#include <asm/immap.h> #include <asm/immap.h>
#include <asm/io.h>
#include <asm/rtc.h> #include <asm/rtc.h>
/* /*
@ -40,70 +41,70 @@
*/ */
void cpu_init_f(void) void cpu_init_f(void)
{ {
volatile scm1_t *scm1 = (scm1_t *) MMAP_SCM1; scm1_t *scm1 = (scm1_t *) MMAP_SCM1;
volatile gpio_t *gpio = (gpio_t *) MMAP_GPIO; gpio_t *gpio = (gpio_t *) MMAP_GPIO;
volatile fbcs_t *fbcs = (fbcs_t *) MMAP_FBCS; fbcs_t *fbcs = (fbcs_t *) MMAP_FBCS;
volatile pll_t *pll = (volatile pll_t *)MMAP_PLL; pll_t *pll = (pll_t *)MMAP_PLL;
#if !defined(CONFIG_CF_SBF) #if !defined(CONFIG_CF_SBF)
/* Workaround, must place before fbcs */ /* Workaround, must place before fbcs */
pll->psr = 0x12; out_be32(&pll->psr, 0x12);
scm1->mpr = 0x77777777; out_be32(&scm1->mpr, 0x77777777);
scm1->pacra = 0; out_be32(&scm1->pacra, 0);
scm1->pacrb = 0; out_be32(&scm1->pacrb, 0);
scm1->pacrc = 0; out_be32(&scm1->pacrc, 0);
scm1->pacrd = 0; out_be32(&scm1->pacrd, 0);
scm1->pacre = 0; out_be32(&scm1->pacre, 0);
scm1->pacrf = 0; out_be32(&scm1->pacrf, 0);
scm1->pacrg = 0; out_be32(&scm1->pacrg, 0);
scm1->pacri = 0; out_be32(&scm1->pacri, 0);
#if (defined(CONFIG_SYS_CS0_BASE) && defined(CONFIG_SYS_CS0_MASK) \ #if (defined(CONFIG_SYS_CS0_BASE) && defined(CONFIG_SYS_CS0_MASK) \
&& defined(CONFIG_SYS_CS0_CTRL)) && defined(CONFIG_SYS_CS0_CTRL))
fbcs->csar0 = CONFIG_SYS_CS0_BASE; out_be32(&fbcs->csar0, CONFIG_SYS_CS0_BASE);
fbcs->cscr0 = CONFIG_SYS_CS0_CTRL; out_be32(&fbcs->cscr0, CONFIG_SYS_CS0_CTRL);
fbcs->csmr0 = CONFIG_SYS_CS0_MASK; out_be32(&fbcs->csmr0, CONFIG_SYS_CS0_MASK);
#endif #endif
#endif /* CONFIG_CF_SBF */ #endif /* CONFIG_CF_SBF */
#if (defined(CONFIG_SYS_CS1_BASE) && defined(CONFIG_SYS_CS1_MASK) \ #if (defined(CONFIG_SYS_CS1_BASE) && defined(CONFIG_SYS_CS1_MASK) \
&& defined(CONFIG_SYS_CS1_CTRL)) && defined(CONFIG_SYS_CS1_CTRL))
fbcs->csar1 = CONFIG_SYS_CS1_BASE; out_be32(&fbcs->csar1, CONFIG_SYS_CS1_BASE);
fbcs->cscr1 = CONFIG_SYS_CS1_CTRL; out_be32(&fbcs->cscr1, CONFIG_SYS_CS1_CTRL);
fbcs->csmr1 = CONFIG_SYS_CS1_MASK; out_be32(&fbcs->csmr1, CONFIG_SYS_CS1_MASK);
#endif #endif
#if (defined(CONFIG_SYS_CS2_BASE) && defined(CONFIG_SYS_CS2_MASK) \ #if (defined(CONFIG_SYS_CS2_BASE) && defined(CONFIG_SYS_CS2_MASK) \
&& defined(CONFIG_SYS_CS2_CTRL)) && defined(CONFIG_SYS_CS2_CTRL))
fbcs->csar2 = CONFIG_SYS_CS2_BASE; out_be32(&fbcs->csar2, CONFIG_SYS_CS2_BASE);
fbcs->cscr2 = CONFIG_SYS_CS2_CTRL; out_be32(&fbcs->cscr2, CONFIG_SYS_CS2_CTRL);
fbcs->csmr2 = CONFIG_SYS_CS2_MASK; out_be32(&fbcs->csmr2, CONFIG_SYS_CS2_MASK);
#endif #endif
#if (defined(CONFIG_SYS_CS3_BASE) && defined(CONFIG_SYS_CS3_MASK) \ #if (defined(CONFIG_SYS_CS3_BASE) && defined(CONFIG_SYS_CS3_MASK) \
&& defined(CONFIG_SYS_CS3_CTRL)) && defined(CONFIG_SYS_CS3_CTRL))
fbcs->csar3 = CONFIG_SYS_CS3_BASE; out_be32(&fbcs->csar3, CONFIG_SYS_CS3_BASE);
fbcs->cscr3 = CONFIG_SYS_CS3_CTRL; out_be32(&fbcs->cscr3, CONFIG_SYS_CS3_CTRL);
fbcs->csmr3 = CONFIG_SYS_CS3_MASK; out_be32(&fbcs->csmr3, CONFIG_SYS_CS3_MASK);
#endif #endif
#if (defined(CONFIG_SYS_CS4_BASE) && defined(CONFIG_SYS_CS4_MASK) \ #if (defined(CONFIG_SYS_CS4_BASE) && defined(CONFIG_SYS_CS4_MASK) \
&& defined(CONFIG_SYS_CS4_CTRL)) && defined(CONFIG_SYS_CS4_CTRL))
fbcs->csar4 = CONFIG_SYS_CS4_BASE; out_be32(&fbcs->csar4, CONFIG_SYS_CS4_BASE);
fbcs->cscr4 = CONFIG_SYS_CS4_CTRL; out_be32(&fbcs->cscr4, CONFIG_SYS_CS4_CTRL);
fbcs->csmr4 = CONFIG_SYS_CS4_MASK; out_be32(&fbcs->csmr4, CONFIG_SYS_CS4_MASK);
#endif #endif
#if (defined(CONFIG_SYS_CS5_BASE) && defined(CONFIG_SYS_CS5_MASK) \ #if (defined(CONFIG_SYS_CS5_BASE) && defined(CONFIG_SYS_CS5_MASK) \
&& defined(CONFIG_SYS_CS5_CTRL)) && defined(CONFIG_SYS_CS5_CTRL))
fbcs->csar5 = CONFIG_SYS_CS5_BASE; out_be32(&fbcs->csar5, CONFIG_SYS_CS5_BASE);
fbcs->cscr5 = CONFIG_SYS_CS5_CTRL; out_be32(&fbcs->cscr5, CONFIG_SYS_CS5_CTRL);
fbcs->csmr5 = CONFIG_SYS_CS5_MASK; out_be32(&fbcs->csmr5, CONFIG_SYS_CS5_MASK);
#endif #endif
#ifdef CONFIG_FSL_I2C #ifdef CONFIG_FSL_I2C
gpio->par_i2c = GPIO_PAR_I2C_SCL_SCL | GPIO_PAR_I2C_SDA_SDA; out_8(&gpio->par_i2c, GPIO_PAR_I2C_SCL_SCL | GPIO_PAR_I2C_SDA_SDA);
#endif #endif
icache_enable(); icache_enable();
@ -115,11 +116,11 @@ void cpu_init_f(void)
int cpu_init_r(void) int cpu_init_r(void)
{ {
#ifdef CONFIG_MCFRTC #ifdef CONFIG_MCFRTC
volatile rtc_t *rtc = (volatile rtc_t *)(CONFIG_SYS_MCFRTC_BASE); rtc_t *rtc = (rtc_t *)(CONFIG_SYS_MCFRTC_BASE);
volatile rtcex_t *rtcex = (volatile rtcex_t *)&rtc->extended; rtcex_t *rtcex = (rtcex_t *)&rtc->extended;
rtcex->gocu = (CONFIG_SYS_RTC_OSCILLATOR >> 16) & 0xFFFF; out_be32(&rtcex->gocu, (CONFIG_SYS_RTC_OSCILLATOR >> 16) & 0xffff);
rtcex->gocl = CONFIG_SYS_RTC_OSCILLATOR & 0xFFFF; out_be32(&rtcex->gocl, CONFIG_SYS_RTC_OSCILLATOR & 0xffff);
#endif #endif
return (0); return (0);
@ -127,27 +128,27 @@ int cpu_init_r(void)
void uart_port_conf(int port) void uart_port_conf(int port)
{ {
volatile gpio_t *gpio = (gpio_t *) MMAP_GPIO; gpio_t *gpio = (gpio_t *) MMAP_GPIO;
/* Setup Ports: */ /* Setup Ports: */
switch (port) { switch (port) {
case 0: case 0:
gpio->par_uart &= clrbits_be16(&gpio->par_uart,
(GPIO_PAR_UART_U0TXD_UNMASK & GPIO_PAR_UART_U0RXD_UNMASK); ~(GPIO_PAR_UART_U0TXD_UNMASK & GPIO_PAR_UART_U0RXD_UNMASK));
gpio->par_uart |= setbits_be16(&gpio->par_uart,
(GPIO_PAR_UART_U0TXD_U0TXD | GPIO_PAR_UART_U0RXD_U0RXD); GPIO_PAR_UART_U0TXD_U0TXD | GPIO_PAR_UART_U0RXD_U0RXD);
break; break;
case 1: case 1:
gpio->par_uart &= clrbits_be16(&gpio->par_uart,
(GPIO_PAR_UART_U1TXD_UNMASK & GPIO_PAR_UART_U1RXD_UNMASK); ~(GPIO_PAR_UART_U1TXD_UNMASK & GPIO_PAR_UART_U1RXD_UNMASK));
gpio->par_uart |= setbits_be16(&gpio->par_uart,
(GPIO_PAR_UART_U1TXD_U1TXD | GPIO_PAR_UART_U1RXD_U1RXD); GPIO_PAR_UART_U1TXD_U1TXD | GPIO_PAR_UART_U1RXD_U1RXD);
break; break;
case 2: case 2:
gpio->par_dspi &= clrbits_8(&gpio->par_dspi,
(GPIO_PAR_DSPI_SIN_UNMASK & GPIO_PAR_DSPI_SOUT_UNMASK); ~(GPIO_PAR_DSPI_SIN_UNMASK & GPIO_PAR_DSPI_SOUT_UNMASK));
gpio->par_dspi = out_8(&gpio->par_dspi,
(GPIO_PAR_DSPI_SIN_U2RXD | GPIO_PAR_DSPI_SOUT_U2TXD); GPIO_PAR_DSPI_SIN_U2RXD | GPIO_PAR_DSPI_SOUT_U2TXD);
break; break;
} }
} }
@ -155,32 +156,32 @@ void uart_port_conf(int port)
#ifdef CONFIG_CF_DSPI #ifdef CONFIG_CF_DSPI
void cfspi_port_conf(void) void cfspi_port_conf(void)
{ {
volatile gpio_t *gpio = (gpio_t *) MMAP_GPIO; gpio_t *gpio = (gpio_t *) MMAP_GPIO;
gpio->par_dspi = out_8(&gpio->par_dspi,
GPIO_PAR_DSPI_SIN_SIN | GPIO_PAR_DSPI_SOUT_SOUT | GPIO_PAR_DSPI_SIN_SIN | GPIO_PAR_DSPI_SOUT_SOUT |
GPIO_PAR_DSPI_SCK_SCK; GPIO_PAR_DSPI_SCK_SCK);
} }
int cfspi_claim_bus(uint bus, uint cs) int cfspi_claim_bus(uint bus, uint cs)
{ {
volatile dspi_t *dspi = (dspi_t *) MMAP_DSPI; dspi_t *dspi = (dspi_t *) MMAP_DSPI;
volatile gpio_t *gpio = (gpio_t *) MMAP_GPIO; gpio_t *gpio = (gpio_t *) MMAP_GPIO;
if ((dspi->sr & DSPI_SR_TXRXS) != DSPI_SR_TXRXS) if ((in_be32(&dspi->sr) & DSPI_SR_TXRXS) != DSPI_SR_TXRXS)
return -1; return -1;
/* Clear FIFO and resume transfer */ /* Clear FIFO and resume transfer */
dspi->mcr &= ~(DSPI_MCR_CTXF | DSPI_MCR_CRXF); clrbits_be32(&dspi->mcr, DSPI_MCR_CTXF | DSPI_MCR_CRXF);
switch (cs) { switch (cs) {
case 0: case 0:
gpio->par_dspi &= ~GPIO_PAR_DSPI_PCS0_UNMASK; clrbits_8(&gpio->par_dspi, GPIO_PAR_DSPI_PCS0_UNMASK);
gpio->par_dspi |= GPIO_PAR_DSPI_PCS0_PCS0; setbits_8(&gpio->par_dspi, GPIO_PAR_DSPI_PCS0_PCS0);
break; break;
case 2: case 2:
gpio->par_timer &= GPIO_PAR_TIMER_T2IN_UNMASK; clrbits_8(&gpio->par_timer, ~GPIO_PAR_TIMER_T2IN_UNMASK);
gpio->par_timer |= GPIO_PAR_TIMER_T2IN_DSPIPCS2; setbits_8(&gpio->par_timer, GPIO_PAR_TIMER_T2IN_DSPIPCS2);
break; break;
} }
@ -189,17 +190,18 @@ int cfspi_claim_bus(uint bus, uint cs)
void cfspi_release_bus(uint bus, uint cs) void cfspi_release_bus(uint bus, uint cs)
{ {
volatile dspi_t *dspi = (dspi_t *) MMAP_DSPI; dspi_t *dspi = (dspi_t *) MMAP_DSPI;
volatile gpio_t *gpio = (gpio_t *) MMAP_GPIO; gpio_t *gpio = (gpio_t *) MMAP_GPIO;
dspi->mcr &= ~(DSPI_MCR_CTXF | DSPI_MCR_CRXF); /* Clear FIFO */ /* Clear FIFO */
clrbits_be32(&dspi->mcr, DSPI_MCR_CTXF | DSPI_MCR_CRXF);
switch (cs) { switch (cs) {
case 0: case 0:
gpio->par_dspi &= ~GPIO_PAR_DSPI_PCS0_PCS0; clrbits_8(&gpio->par_dspi, GPIO_PAR_DSPI_PCS0_PCS0);
break; break;
case 2: case 2:
gpio->par_timer &= GPIO_PAR_TIMER_T2IN_UNMASK; clrbits_8(&gpio->par_timer, ~GPIO_PAR_TIMER_T2IN_UNMASK);
break; break;
} }
} }

15
arch/m68k/cpu/mcf5227x/interrupts.c
View File

@ -3,7 +3,7 @@
* (C) Copyright 2000-2004 * (C) Copyright 2000-2004
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* Copyright (C) 2004-2007 Freescale Semiconductor, Inc. * Copyright (C) 2004-2007, 2012 Freescale Semiconductor, Inc.
* TsiChung Liew (Tsi-Chung.Liew@freescale.com) * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -28,14 +28,15 @@
/* CPU specific interrupt routine */ /* CPU specific interrupt routine */
#include <common.h> #include <common.h>
#include <asm/immap.h> #include <asm/immap.h>
#include <asm/io.h>
int interrupt_init(void) int interrupt_init(void)
{ {
volatile int0_t *intp = (int0_t *) (CONFIG_SYS_INTR_BASE); int0_t *intp = (int0_t *) (CONFIG_SYS_INTR_BASE);
/* Make sure all interrupts are disabled */ /* Make sure all interrupts are disabled */
intp->imrh0 |= 0xFFFFFFFF; setbits_be32(&intp->imrh0, 0xffffffff);
intp->imrl0 |= 0xFFFFFFFF; setbits_be32(&intp->imrl0, 0xffffffff);
enable_interrupts(); enable_interrupts();
return 0; return 0;
@ -44,9 +45,9 @@ int interrupt_init(void)
#if defined(CONFIG_MCFTMR) #if defined(CONFIG_MCFTMR)
void dtimer_intr_setup(void) void dtimer_intr_setup(void)
{ {
volatile int0_t *intp = (int0_t *) (CONFIG_SYS_INTR_BASE); int0_t *intp = (int0_t *) (CONFIG_SYS_INTR_BASE);
intp->icr0[CONFIG_SYS_TMRINTR_NO] = CONFIG_SYS_TMRINTR_PRI; out_8(&intp->icr0[CONFIG_SYS_TMRINTR_NO], CONFIG_SYS_TMRINTR_PRI);
intp->imrh0 &= ~CONFIG_SYS_TMRINTR_MASK; clrbits_be32(&intp->imrh0, CONFIG_SYS_TMRINTR_MASK);
} }
#endif #endif

40
arch/m68k/cpu/mcf5227x/speed.c
View File

@ -1,6 +1,6 @@
/* /*
* *
* Copyright (C) 2004-2007 Freescale Semiconductor, Inc. * Copyright (C) 2004-2007, 2012 Freescale Semiconductor, Inc.
* TsiChung Liew (Tsi-Chung.Liew@freescale.com) * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -26,6 +26,7 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/immap.h> #include <asm/immap.h>
#include <asm/io.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -44,7 +45,7 @@ DECLARE_GLOBAL_DATA_PTR;
void clock_enter_limp(int lpdiv) void clock_enter_limp(int lpdiv)
{ {
volatile ccm_t *ccm = (volatile ccm_t *)MMAP_CCM; ccm_t *ccm = (ccm_t *)MMAP_CCM;
int i, j; int i, j;
/* Check bounds of divider */ /* Check bounds of divider */
@ -57,10 +58,10 @@ void clock_enter_limp(int lpdiv)
for (i = 0, j = lpdiv; j != 1; j >>= 1, i++) ; for (i = 0, j = lpdiv; j != 1; j >>= 1, i++) ;
/* Apply the divider to the system clock */ /* Apply the divider to the system clock */
ccm->cdr = (ccm->cdr & 0xF0FF) | CCM_CDR_LPDIV(i); clrsetbits_be16(&ccm->cdr, 0x0f00, CCM_CDR_LPDIV(i));
/* Enable Limp Mode */ /* Enable Limp Mode */
ccm->misccr |= CCM_MISCCR_LIMP; setbits_be16(&ccm->misccr, CCM_MISCCR_LIMP);
} }
/* /*
@ -69,14 +70,15 @@ void clock_enter_limp(int lpdiv)
*/ */
void clock_exit_limp(void) void clock_exit_limp(void)
{ {
volatile ccm_t *ccm = (volatile ccm_t *)MMAP_CCM; ccm_t *ccm = (ccm_t *)MMAP_CCM;
volatile pll_t *pll = (volatile pll_t *)MMAP_PLL; pll_t *pll = (pll_t *)MMAP_PLL;
/* Exit Limp mode */ /* Exit Limp mode */
ccm->misccr &= ~CCM_MISCCR_LIMP; clrbits_be16(&ccm->misccr, CCM_MISCCR_LIMP);
/* Wait for the PLL to lock */ /* Wait for the PLL to lock */
while (!(pll->psr & PLL_PSR_LOCK)) ; while (!(in_be32(&pll->psr) & PLL_PSR_LOCK))
;
} }
/* /*
@ -85,12 +87,12 @@ void clock_exit_limp(void)
int get_clocks(void) int get_clocks(void)
{ {
volatile ccm_t *ccm = (volatile ccm_t *)MMAP_CCM; ccm_t *ccm = (ccm_t *)MMAP_CCM;
volatile pll_t *pll = (volatile pll_t *)MMAP_PLL; pll_t *pll = (pll_t *)MMAP_PLL;
int vco, temp, pcrvalue, pfdr; int vco, temp, pcrvalue, pfdr;
u8 bootmode; u8 bootmode;
pcrvalue = pll->pcr & 0xFF0F0FFF; pcrvalue = in_be32(&pll->pcr) & 0xFF0F0FFF;
pfdr = pcrvalue >> 24; pfdr = pcrvalue >> 24;
if (pfdr == 0x1E) if (pfdr == 0x1E)
@ -102,32 +104,32 @@ int get_clocks(void)
if (bootmode == 0) { if (bootmode == 0) {
/* Normal mode */ /* Normal mode */
vco = ((pll->pcr & 0xFF000000) >> 24) * CONFIG_SYS_INPUT_CLKSRC; vco = ((in_be32(&pll->pcr) & 0xFF000000) >> 24) * CONFIG_SYS_INPUT_CLKSRC;
if ((vco < CLOCK_PLL_FVCO_MIN) || (vco > CLOCK_PLL_FVCO_MAX)) { if ((vco < CLOCK_PLL_FVCO_MIN) || (vco > CLOCK_PLL_FVCO_MAX)) {
/* Default value */ /* Default value */
pcrvalue = (pll->pcr & 0x00FFFFFF); pcrvalue = (in_be32(&pll->pcr) & 0x00FFFFFF);
pcrvalue |= 0x1E << 24; pcrvalue |= 0x1E << 24;
pll->pcr = pcrvalue; out_be32(&pll->pcr, pcrvalue);
vco = vco =
((pll->pcr & 0xFF000000) >> 24) * ((in_be32(&pll->pcr) & 0xFF000000) >> 24) *
CONFIG_SYS_INPUT_CLKSRC; CONFIG_SYS_INPUT_CLKSRC;
} }
gd->vco_clk = vco; /* Vco clock */ gd->vco_clk = vco; /* Vco clock */
} else if (bootmode == 3) { } else if (bootmode == 3) {
/* serial mode */ /* serial mode */
vco = ((pll->pcr & 0xFF000000) >> 24) * CONFIG_SYS_INPUT_CLKSRC; vco = ((in_be32(&pll->pcr) & 0xFF000000) >> 24) * CONFIG_SYS_INPUT_CLKSRC;
gd->vco_clk = vco; /* Vco clock */ gd->vco_clk = vco; /* Vco clock */
} }
if ((ccm->ccr & CCM_MISCCR_LIMP) == CCM_MISCCR_LIMP) { if ((in_be16(&ccm->ccr) & CCM_MISCCR_LIMP) == CCM_MISCCR_LIMP) {
/* Limp mode */ /* Limp mode */
} else { } else {
gd->inp_clk = CONFIG_SYS_INPUT_CLKSRC; /* Input clock */ gd->inp_clk = CONFIG_SYS_INPUT_CLKSRC; /* Input clock */
temp = (pll->pcr & PLL_PCR_OUTDIV1_MASK) + 1; temp = (in_be32(&pll->pcr) & PLL_PCR_OUTDIV1_MASK) + 1;
gd->cpu_clk = vco / temp; /* cpu clock */ gd->cpu_clk = vco / temp; /* cpu clock */
temp = ((pll->pcr & PLL_PCR_OUTDIV2_MASK) >> 4) + 1; temp = ((in_be32(&pll->pcr) & PLL_PCR_OUTDIV2_MASK) >> 4) + 1;
gd->flb_clk = vco / temp; /* flexbus clock */ gd->flb_clk = vco / temp; /* flexbus clock */
gd->bus_clk = gd->flb_clk; gd->bus_clk = gd->flb_clk;
} }

30
board/freescale/m52277evb/m52277evb.c
View File

@ -2,7 +2,7 @@
* (C) Copyright 2000-2003 * (C) Copyright 2000-2003
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* *
* Copyright (C) 2004-2007 Freescale Semiconductor, Inc. * Copyright (C) 2004-2007, 2012 Freescale Semiconductor, Inc.
* TsiChung Liew (Tsi-Chung.Liew@freescale.com) * TsiChung Liew (Tsi-Chung.Liew@freescale.com)
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -26,6 +26,7 @@
#include <common.h> #include <common.h>
#include <asm/immap.h> #include <asm/immap.h>
#include <asm/io.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -47,8 +48,8 @@ phys_size_t initdram(int board_type)
*/ */
dramsize = CONFIG_SYS_SDRAM_SIZE * 0x100000; dramsize = CONFIG_SYS_SDRAM_SIZE * 0x100000;
#else #else
volatile sdramc_t *sdram = (volatile sdramc_t *)(MMAP_SDRAM); sdramc_t *sdram = (sdramc_t *)(MMAP_SDRAM);
volatile gpio_t *gpio = (volatile gpio_t *)(MMAP_GPIO); gpio_t *gpio = (gpio_t *)(MMAP_GPIO);
u32 i; u32 i;
dramsize = CONFIG_SYS_SDRAM_SIZE * 0x100000; dramsize = CONFIG_SYS_SDRAM_SIZE * 0x100000;
@ -59,36 +60,37 @@ phys_size_t initdram(int board_type)
} }
i--; i--;
gpio->mscr_sdram = CONFIG_SYS_SDRAM_DRV_STRENGTH; out_8(&gpio->mscr_sdram, CONFIG_SYS_SDRAM_DRV_STRENGTH);
sdram->sdcs0 = (CONFIG_SYS_SDRAM_BASE | i); out_be32(&sdram->sdcs0, CONFIG_SYS_SDRAM_BASE | i);
sdram->sdcfg1 = CONFIG_SYS_SDRAM_CFG1; out_be32(&sdram->sdcfg1, CONFIG_SYS_SDRAM_CFG1);
sdram->sdcfg2 = CONFIG_SYS_SDRAM_CFG2; out_be32(&sdram->sdcfg2, CONFIG_SYS_SDRAM_CFG2);
/* Issue PALL */ /* Issue PALL */
sdram->sdcr = CONFIG_SYS_SDRAM_CTRL | 2; out_be32(&sdram->sdcr, CONFIG_SYS_SDRAM_CTRL | 2);
__asm__("nop"); __asm__("nop");
/* Issue LEMR */ /* Issue LEMR */
sdram->sdmr = CONFIG_SYS_SDRAM_MODE; out_be32(&sdram->sdmr, CONFIG_SYS_SDRAM_MODE);
__asm__("nop"); __asm__("nop");
sdram->sdmr = CONFIG_SYS_SDRAM_EMOD; out_be32(&sdram->sdmr, CONFIG_SYS_SDRAM_EMOD);
__asm__("nop"); __asm__("nop");
udelay(1000); udelay(1000);
/* Issue PALL */ /* Issue PALL */
sdram->sdcr = CONFIG_SYS_SDRAM_CTRL | 2; out_be32(&sdram->sdcr, CONFIG_SYS_SDRAM_CTRL | 2);
__asm__("nop"); __asm__("nop");
/* Perform two refresh cycles */ /* Perform two refresh cycles */
sdram->sdcr = CONFIG_SYS_SDRAM_CTRL | 4; out_be32(&sdram->sdcr, CONFIG_SYS_SDRAM_CTRL | 4);
__asm__("nop"); __asm__("nop");
sdram->sdcr = CONFIG_SYS_SDRAM_CTRL | 4; out_be32(&sdram->sdcr, CONFIG_SYS_SDRAM_CTRL | 4);
__asm__("nop"); __asm__("nop");
sdram->sdcr = (CONFIG_SYS_SDRAM_CTRL & ~0x80000000) | 0x10000C00; out_be32(&sdram->sdcr,
(CONFIG_SYS_SDRAM_CTRL & ~0x80000000) | 0x10000c00);
udelay(100); udelay(100);
#endif #endif