GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 06:31:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ColdFire: Clean up checkpatch warnings for MCF547x and MCF548x

Browse source 
Signed-off-by: Alison Wang <b18965@freescale.com>
This commit is contained in:
Alison Wang 2012-03-26 21:49:07 +00:00 • committed by jason
parent c6d8863015
commit a4110eecf2
7 changed files with 158 additions and 144 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
arch/m68k/cpu/mcf547x_8x/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
@ -31,19 +31,20 @@
#include <netdev.h> #include <netdev.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 gptmr_t *gptmr = (gptmr_t *) (MMAP_GPTMR); gptmr_t *gptmr = (gptmr_t *) (MMAP_GPTMR);
gptmr->pre = 10; out_be16(&gptmr->pre, 10);
gptmr->cnt = 1; out_be16(&gptmr->cnt, 1);
/* enable watchdog, set timeout to 0 and wait */ /* enable watchdog, set timeout to 0 and wait */
gptmr->mode = GPT_TMS_SGPIO; out_8(&gptmr->mode, GPT_TMS_SGPIO);
gptmr->ctrl = GPT_CTRL_WDEN | GPT_CTRL_CE; out_8(&gptmr->ctrl, GPT_CTRL_WDEN | GPT_CTRL_CE);
/* we don't return! */ /* we don't return! */
return 1; return 1;
@ -51,12 +52,12 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
int checkcpu(void) int checkcpu(void)
{ {
volatile siu_t *siu = (siu_t *) MMAP_SIU; siu_t *siu = (siu_t *) MMAP_SIU;
u16 id = 0; u16 id = 0;
puts("CPU: "); puts("CPU: ");
switch ((siu->jtagid & 0x000FF000) >> 12) { switch ((in_be32(&siu->jtagid) & 0x000FF000) >> 12) {
case 0x0C: case 0x0C:
id = 5485; id = 5485;
break; break;
@ -111,18 +112,18 @@ int checkcpu(void)
/* Called by macro WATCHDOG_RESET */ /* Called by macro WATCHDOG_RESET */
void hw_watchdog_reset(void) void hw_watchdog_reset(void)
{ {
volatile gptmr_t *gptmr = (gptmr_t *) (MMAP_GPTMR); gptmr_t *gptmr = (gptmr_t *) (MMAP_GPTMR);
gptmr->ocpw = 0xa5; out_8(&gptmr->ocpw, 0xa5);
} }
int watchdog_disable(void) int watchdog_disable(void)
{ {
volatile gptmr_t *gptmr = (gptmr_t *) (MMAP_GPTMR); gptmr_t *gptmr = (gptmr_t *) (MMAP_GPTMR);
/* UserManual, once the wdog is disabled, wdog cannot be re-enabled */ /* UserManual, once the wdog is disabled, wdog cannot be re-enabled */
gptmr->mode = 0; out_8(&gptmr->mode, 0);
gptmr->ctrl = 0; out_8(&gptmr->ctrl, 0);
puts("WATCHDOG:disabled\n"); puts("WATCHDOG:disabled\n");
@ -131,14 +132,13 @@ int watchdog_disable(void)
int watchdog_init(void) int watchdog_init(void)
{ {
gptmr_t *gptmr = (gptmr_t *) (MMAP_GPTMR);
volatile gptmr_t *gptmr = (gptmr_t *) (MMAP_GPTMR); out_be16(&gptmr->pre, CONFIG_WATCHDOG_TIMEOUT);
out_be16(&gptmr->cnt, CONFIG_SYS_TIMER_PRESCALER * 1000);
gptmr->pre = CONFIG_WATCHDOG_TIMEOUT; out_8(&gptmr->mode, GPT_TMS_SGPIO);
gptmr->cnt = CONFIG_SYS_TIMER_PRESCALER * 1000; out_8(&gptmr->ctrl, GPT_CTRL_CE | GPT_CTRL_WDEN);
gptmr->mode = GPT_TMS_SGPIO;
gptmr->ctrl = GPT_CTRL_CE | GPT_CTRL_WDEN;
puts("WATCHDOG:enabled\n"); puts("WATCHDOG:enabled\n");
return (0); return (0);

84
arch/m68k/cpu/mcf547x_8x/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 2007 Freescale Semiconductor, Inc. * (C) Copyright 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,6 +28,7 @@
#include <common.h> #include <common.h>
#include <MCD_dma.h> #include <MCD_dma.h>
#include <asm/immap.h> #include <asm/immap.h>
#include <asm/io.h>
#if defined(CONFIG_CMD_NET) #if defined(CONFIG_CMD_NET)
#include <config.h> #include <config.h>
@ -44,58 +45,59 @@
*/ */
void cpu_init_f(void) void cpu_init_f(void)
{ {
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 xlbarb_t *xlbarb = (volatile xlbarb_t *) MMAP_XARB; xlbarb_t *xlbarb = (xlbarb_t *) MMAP_XARB;
xlbarb->adrto = 0x2000; out_be32(&xlbarb->adrto, 0x2000);
xlbarb->datto = 0x2500; out_be32(&xlbarb->datto, 0x2500);
xlbarb->busto = 0x3000; out_be32(&xlbarb->busto, 0x3000);
xlbarb->cfg = XARB_CFG_AT | XARB_CFG_DT; out_be32(&xlbarb->cfg, XARB_CFG_AT | XARB_CFG_DT);
/* Master Priority Enable */ /* Master Priority Enable */
xlbarb->prien = 0xff; out_be32(&xlbarb->prien, 0xff);
xlbarb->pri = 0; out_be32(&xlbarb->pri, 0);
#if (defined(CONFIG_SYS_CS0_BASE) && defined(CONFIG_SYS_CS0_MASK) && defined(CONFIG_SYS_CS0_CTRL)) #if (defined(CONFIG_SYS_CS0_BASE) && defined(CONFIG_SYS_CS0_MASK) && 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
#if (defined(CONFIG_SYS_CS1_BASE) && defined(CONFIG_SYS_CS1_MASK) && defined(CONFIG_SYS_CS1_CTRL)) #if (defined(CONFIG_SYS_CS1_BASE) && defined(CONFIG_SYS_CS1_MASK) && 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) && defined(CONFIG_SYS_CS2_CTRL)) #if (defined(CONFIG_SYS_CS2_BASE) && defined(CONFIG_SYS_CS2_MASK) && 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) && defined(CONFIG_SYS_CS3_CTRL)) #if (defined(CONFIG_SYS_CS3_BASE) && defined(CONFIG_SYS_CS3_MASK) && 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) && defined(CONFIG_SYS_CS4_CTRL)) #if (defined(CONFIG_SYS_CS4_BASE) && defined(CONFIG_SYS_CS4_MASK) && 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) && defined(CONFIG_SYS_CS5_CTRL)) #if (defined(CONFIG_SYS_CS5_BASE) && defined(CONFIG_SYS_CS5_MASK) && 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_feci2cirq = GPIO_PAR_FECI2CIRQ_SCL | GPIO_PAR_FECI2CIRQ_SDA; out_be16(&gpio->par_feci2cirq,
GPIO_PAR_FECI2CIRQ_SCL | GPIO_PAR_FECI2CIRQ_SDA);
#endif #endif
icache_enable(); icache_enable();
@ -115,44 +117,44 @@ 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;
volatile u8 *pscsicr = (u8 *) (CONFIG_SYS_UART_BASE + 0x40); u8 *pscsicr = (u8 *) (CONFIG_SYS_UART_BASE + 0x40);
/* Setup Ports: */ /* Setup Ports: */
switch (port) { switch (port) {
case 0: case 0:
gpio->par_psc0 = (GPIO_PAR_PSC0_TXD0 | GPIO_PAR_PSC0_RXD0); out_8(&gpio->par_psc0, GPIO_PAR_PSC0_TXD0 | GPIO_PAR_PSC0_RXD0);
break; break;
case 1: case 1:
gpio->par_psc1 = (GPIO_PAR_PSC1_TXD1 | GPIO_PAR_PSC1_RXD1); out_8(&gpio->par_psc1, GPIO_PAR_PSC1_TXD1 | GPIO_PAR_PSC1_RXD1);
break; break;
case 2: case 2:
gpio->par_psc2 = (GPIO_PAR_PSC2_TXD2 | GPIO_PAR_PSC2_RXD2); out_8(&gpio->par_psc2, GPIO_PAR_PSC2_TXD2 | GPIO_PAR_PSC2_RXD2);
break; break;
case 3: case 3:
gpio->par_psc3 = (GPIO_PAR_PSC3_TXD3 | GPIO_PAR_PSC3_RXD3); out_8(&gpio->par_psc3, GPIO_PAR_PSC3_TXD3 | GPIO_PAR_PSC3_RXD3);
break; break;
} }
*pscsicr &= 0xF8; clrbits_8(pscsicr, 0x07);
} }
#if defined(CONFIG_CMD_NET) #if defined(CONFIG_CMD_NET)
int fecpin_setclear(struct eth_device *dev, int setclear) int fecpin_setclear(struct eth_device *dev, int setclear)
{ {
volatile gpio_t *gpio = (gpio_t *) MMAP_GPIO; gpio_t *gpio = (gpio_t *) MMAP_GPIO;
struct fec_info_dma *info = (struct fec_info_dma *)dev->priv; struct fec_info_dma *info = (struct fec_info_dma *)dev->priv;
if (setclear) { if (setclear) {
if (info->iobase == CONFIG_SYS_FEC0_IOBASE) if (info->iobase == CONFIG_SYS_FEC0_IOBASE)
gpio->par_feci2cirq |= 0xF000; setbits_be16(&gpio->par_feci2cirq, 0xf000);
else else
gpio->par_feci2cirq |= 0x0FC0; setbits_be16(&gpio->par_feci2cirq, 0x0fc0);
} else { } else {
if (info->iobase == CONFIG_SYS_FEC0_IOBASE) if (info->iobase == CONFIG_SYS_FEC0_IOBASE)
gpio->par_feci2cirq &= 0x0FFF; clrbits_be16(&gpio->par_feci2cirq, 0xf000);
else else
gpio->par_feci2cirq &= 0xF03F; clrbits_be16(&gpio->par_feci2cirq, 0x0fc0);
} }
return 0; return 0;
} }

15
arch/m68k/cpu/mcf547x_8x/interrupts.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
@ -25,14 +25,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();
@ -42,9 +43,9 @@ int interrupt_init(void)
#if defined(CONFIG_SLTTMR) #if defined(CONFIG_SLTTMR)
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

49
arch/m68k/cpu/mcf547x_8x/pci.c
View file

@ -1,5 +1,5 @@
/* /*
* 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
@ -88,53 +88,56 @@ int pci_read_cfg_dword(struct pci_controller *hose, pci_dev_t dev,
void pci_mcf547x_8x_init(struct pci_controller *hose) void pci_mcf547x_8x_init(struct pci_controller *hose)
{ {
volatile pci_t *pci = (volatile pci_t *) MMAP_PCI; pci_t *pci = (pci_t *) MMAP_PCI;
volatile gpio_t *gpio = (gpio_t *) MMAP_GPIO; gpio_t *gpio = (gpio_t *) MMAP_GPIO;
/* Port configuration */ /* Port configuration */
gpio->par_pcibg = out_be16(&gpio->par_pcibg,
GPIO_PAR_PCIBG_PCIBG0(3) | GPIO_PAR_PCIBG_PCIBG1(3) | GPIO_PAR_PCIBG_PCIBG0(3) | GPIO_PAR_PCIBG_PCIBG1(3) |
GPIO_PAR_PCIBG_PCIBG2(3) | GPIO_PAR_PCIBG_PCIBG3(3) | GPIO_PAR_PCIBG_PCIBG2(3) | GPIO_PAR_PCIBG_PCIBG3(3) |
GPIO_PAR_PCIBG_PCIBG4(3); GPIO_PAR_PCIBG_PCIBG4(3));
gpio->par_pcibr = out_be16(&gpio->par_pcibr,
GPIO_PAR_PCIBR_PCIBR0(3) | GPIO_PAR_PCIBR_PCIBR1(3) | GPIO_PAR_PCIBR_PCIBR0(3) | GPIO_PAR_PCIBR_PCIBR1(3) |
GPIO_PAR_PCIBR_PCIBR2(3) | GPIO_PAR_PCIBR_PCIBR3(3) | GPIO_PAR_PCIBR_PCIBR2(3) | GPIO_PAR_PCIBR_PCIBR3(3) |
GPIO_PAR_PCIBR_PCIBR4(3); GPIO_PAR_PCIBR_PCIBR4(3));
/* Assert reset bit */ /* Assert reset bit */
pci->gscr |= PCI_GSCR_PR; setbits_be32(&pci->gscr, PCI_GSCR_PR);
pci->tcr1 = PCI_TCR1_P; out_be32(&pci->tcr1, PCI_TCR1_P);
/* Initiator windows */ /* Initiator windows */
pci->iw0btar = CONFIG_SYS_PCI_MEM_PHYS | (CONFIG_SYS_PCI_MEM_PHYS >> 16); out_be32(&pci->iw0btar,
pci->iw1btar = CONFIG_SYS_PCI_IO_PHYS | (CONFIG_SYS_PCI_IO_PHYS >> 16); CONFIG_SYS_PCI_MEM_PHYS | (CONFIG_SYS_PCI_MEM_PHYS >> 16));
pci->iw2btar = CONFIG_SYS_PCI_CFG_PHYS | (CONFIG_SYS_PCI_CFG_PHYS >> 16); out_be32(&pci->iw1btar,
CONFIG_SYS_PCI_IO_PHYS | (CONFIG_SYS_PCI_IO_PHYS >> 16));
out_be32(&pci->iw2btar,
CONFIG_SYS_PCI_CFG_PHYS | (CONFIG_SYS_PCI_CFG_PHYS >> 16));
pci->iwcr = out_be32(&pci->iwcr,
PCI_IWCR_W0C_EN | PCI_IWCR_W1C_EN | PCI_IWCR_W1C_IO | PCI_IWCR_W0C_EN | PCI_IWCR_W1C_EN | PCI_IWCR_W1C_IO |
PCI_IWCR_W2C_EN | PCI_IWCR_W2C_IO; PCI_IWCR_W2C_EN | PCI_IWCR_W2C_IO);
pci->icr = 0; out_be32(&pci->icr, 0);
/* Enable bus master and mem access */ /* Enable bus master and mem access */
pci->scr = PCI_SCR_B | PCI_SCR_M; out_be32(&pci->scr, PCI_SCR_B | PCI_SCR_M);
/* Cache line size and master latency */ /* Cache line size and master latency */
pci->cr1 = PCI_CR1_CLS(8) | PCI_CR1_LTMR(0xF8); out_be32(&pci->cr1, PCI_CR1_CLS(8) | PCI_CR1_LTMR(0xf8));
pci->cr2 = 0; out_be32(&pci->cr2, 0);
#ifdef CONFIG_SYS_PCI_BAR0 #ifdef CONFIG_SYS_PCI_BAR0
pci->bar0 = PCI_BAR_BAR0(CONFIG_SYS_PCI_BAR0); out_be32(&pci->bar0, PCI_BAR_BAR0(CONFIG_SYS_PCI_BAR0));
pci->tbatr0a = CONFIG_SYS_PCI_TBATR0 | PCI_TBATR_EN; out_be32(&pci->tbatr0a, CONFIG_SYS_PCI_TBATR0 | PCI_TBATR_EN);
#endif #endif
#ifdef CONFIG_SYS_PCI_BAR1 #ifdef CONFIG_SYS_PCI_BAR1
pci->bar1 = PCI_BAR_BAR1(CONFIG_SYS_PCI_BAR1); out_be32(&pci->bar1, PCI_BAR_BAR1(CONFIG_SYS_PCI_BAR1));
pci->tbatr1a = CONFIG_SYS_PCI_TBATR1 | PCI_TBATR_EN; out_be32(&pci->tbatr1a, CONFIG_SYS_PCI_TBATR1 | PCI_TBATR_EN);
#endif #endif
/* Deassert reset bit */ /* Deassert reset bit */
pci->gscr &= ~PCI_GSCR_PR; clrbits_be32(&pci->gscr, PCI_GSCR_PR);
udelay(1000); udelay(1000);
/* Enable PCI bus master support */ /* Enable PCI bus master support */

38
arch/m68k/cpu/mcf547x_8x/slicetimer.c
View file

@ -1,5 +1,5 @@
/* /*
* (C) Copyright 2007 Freescale Semiconductor, Inc. * (C) Copyright 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
@ -25,6 +25,7 @@
#include <asm/timer.h> #include <asm/timer.h>
#include <asm/immap.h> #include <asm/immap.h>
#include <asm/io.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -42,31 +43,32 @@ extern void dtimer_intr_setup(void);
void __udelay(unsigned long usec) void __udelay(unsigned long usec)
{ {
volatile slt_t *timerp = (slt_t *) (CONFIG_SYS_UDELAY_BASE); slt_t *timerp = (slt_t *) (CONFIG_SYS_UDELAY_BASE);
u32 now, freq; u32 now, freq;
/* 1 us period */ /* 1 us period */
freq = CONFIG_SYS_TIMER_PRESCALER; freq = CONFIG_SYS_TIMER_PRESCALER;
timerp->cr = 0; /* Disable */ /* Disable */
timerp->tcnt = usec * freq; out_be32(&timerp->cr, 0);
timerp->cr = SLT_CR_TEN; out_be32(&timerp->tcnt, usec * freq);
out_be32(&timerp->cr, SLT_CR_TEN);
now = timerp->cnt; now = in_be32(&timerp->cnt);
while (now != 0) while (now != 0)
now = timerp->cnt; now = in_be32(&timerp->cnt);
timerp->sr |= SLT_SR_ST; setbits_be32(&timerp->sr, SLT_SR_ST);
timerp->cr = 0; out_be32(&timerp->cr, 0);
} }
void dtimer_interrupt(void *not_used) void dtimer_interrupt(void *not_used)
{ {
volatile slt_t *timerp = (slt_t *) (CONFIG_SYS_TMR_BASE); slt_t *timerp = (slt_t *) (CONFIG_SYS_TMR_BASE);
/* check for timer interrupt asserted */ /* check for timer interrupt asserted */
if ((CONFIG_SYS_TMRPND_REG & CONFIG_SYS_TMRINTR_MASK) == CONFIG_SYS_TMRINTR_PEND) { if ((CONFIG_SYS_TMRPND_REG & CONFIG_SYS_TMRINTR_MASK) == CONFIG_SYS_TMRINTR_PEND) {
timerp->sr |= SLT_SR_ST; setbits_be32(&timerp->sr, SLT_SR_ST);
timestamp++; timestamp++;
return; return;
} }
@ -74,25 +76,27 @@ void dtimer_interrupt(void *not_used)
int timer_init(void) int timer_init(void)
{ {
volatile slt_t *timerp = (slt_t *) (CONFIG_SYS_TMR_BASE); slt_t *timerp = (slt_t *) (CONFIG_SYS_TMR_BASE);
timestamp = 0; timestamp = 0;
timerp->cr = 0; /* disable timer */ /* disable timer */
timerp->tcnt = 0; out_be32(&timerp->cr, 0);
timerp->sr = SLT_SR_BE | SLT_SR_ST; /* clear status */ out_be32(&timerp->tcnt, 0);
/* clear status */
out_be32(&timerp->sr, SLT_SR_BE | SLT_SR_ST);
/* initialize and enable timer interrupt */ /* initialize and enable timer interrupt */
irq_install_handler(CONFIG_SYS_TMRINTR_NO, dtimer_interrupt, 0); irq_install_handler(CONFIG_SYS_TMRINTR_NO, dtimer_interrupt, 0);
/* Interrupt every ms */ /* Interrupt every ms */
timerp->tcnt = 1000 * CONFIG_SYS_TIMER_PRESCALER; out_be32(&timerp->tcnt, 1000 * CONFIG_SYS_TIMER_PRESCALER);
dtimer_intr_setup(); dtimer_intr_setup();
/* set a period of 1us, set timer mode to restart and /* set a period of 1us, set timer mode to restart and
enable timer and interrupt */ enable timer and interrupt */
timerp->cr = SLT_CR_RUN | SLT_CR_IEN | SLT_CR_TEN; out_be32(&timerp->cr, SLT_CR_RUN | SLT_CR_IEN | SLT_CR_TEN);
return 0; return 0;
} }

34
board/freescale/m547xevb/m547xevb.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
@ -28,6 +28,7 @@
#include <common.h> #include <common.h>
#include <pci.h> #include <pci.h>
#include <asm/immap.h> #include <asm/immap.h>
#include <asm/io.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -40,14 +41,14 @@ int checkboard(void)
phys_size_t initdram(int board_type) phys_size_t initdram(int board_type)
{ {
volatile siu_t *siu = (siu_t *) (MMAP_SIU); siu_t *siu = (siu_t *) (MMAP_SIU);
volatile sdram_t *sdram = (volatile sdram_t *)(MMAP_SDRAM); sdram_t *sdram = (sdram_t *)(MMAP_SDRAM);
u32 dramsize, i; u32 dramsize, i;
#ifdef CONFIG_SYS_DRAMSZ1 #ifdef CONFIG_SYS_DRAMSZ1
u32 temp; u32 temp;
#endif #endif
siu->drv = CONFIG_SYS_SDRAM_DRVSTRENGTH; out_be32(&siu->drv, CONFIG_SYS_SDRAM_DRVSTRENGTH);
dramsize = CONFIG_SYS_DRAMSZ * 0x100000; dramsize = CONFIG_SYS_DRAMSZ * 0x100000;
for (i = 0x13; i < 0x20; i++) { for (i = 0x13; i < 0x20; i++) {
@ -55,7 +56,7 @@ phys_size_t initdram(int board_type)
break; break;
} }
i--; i--;
siu->cs0cfg = (CONFIG_SYS_SDRAM_BASE | i); out_be32(&siu->cs0cfg, CONFIG_SYS_SDRAM_BASE | i);
#ifdef CONFIG_SYS_DRAMSZ1 #ifdef CONFIG_SYS_DRAMSZ1
temp = CONFIG_SYS_DRAMSZ1 * 0x100000; temp = CONFIG_SYS_DRAMSZ1 * 0x100000;
@ -65,31 +66,32 @@ phys_size_t initdram(int board_type)
} }
i--; i--;
dramsize += temp; dramsize += temp;
siu->cs1cfg = ((CONFIG_SYS_SDRAM_BASE + temp) | i); out_be32(&siu->cs1cfg, (CONFIG_SYS_SDRAM_BASE + temp) | i);
#endif #endif
sdram->cfg1 = CONFIG_SYS_SDRAM_CFG1; out_be32(&sdram->cfg1, CONFIG_SYS_SDRAM_CFG1);
sdram->cfg2 = CONFIG_SYS_SDRAM_CFG2; out_be32(&sdram->cfg2, CONFIG_SYS_SDRAM_CFG2);
/* Issue PALL */ /* Issue PALL */
sdram->ctrl = CONFIG_SYS_SDRAM_CTRL | 2; out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 2);
/* Issue LEMR */ /* Issue LEMR */
sdram->mode = CONFIG_SYS_SDRAM_EMOD; out_be32(&sdram->mode, CONFIG_SYS_SDRAM_EMOD);
sdram->mode = (CONFIG_SYS_SDRAM_MODE | 0x04000000); out_be32(&sdram->mode, CONFIG_SYS_SDRAM_MODE | 0x04000000);
udelay(500); udelay(500);
/* Issue PALL */ /* Issue PALL */
sdram->ctrl = (CONFIG_SYS_SDRAM_CTRL | 2); out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 2);
/* Perform two refresh cycles */ /* Perform two refresh cycles */
sdram->ctrl = CONFIG_SYS_SDRAM_CTRL | 4; out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 4);
sdram->ctrl = CONFIG_SYS_SDRAM_CTRL | 4; out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 4);
sdram->mode = CONFIG_SYS_SDRAM_MODE; out_be32(&sdram->mode, CONFIG_SYS_SDRAM_MODE);
sdram->ctrl = (CONFIG_SYS_SDRAM_CTRL & ~0x80000000) | 0x10000F00; out_be32(&sdram->ctrl,
(CONFIG_SYS_SDRAM_CTRL & ~0x80000000) | 0x10000F00);
udelay(100); udelay(100);

34
board/freescale/m548xevb/m548xevb.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
@ -28,6 +28,7 @@
#include <common.h> #include <common.h>
#include <pci.h> #include <pci.h>
#include <asm/immap.h> #include <asm/immap.h>
#include <asm/io.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -40,14 +41,14 @@ int checkboard(void)
phys_size_t initdram(int board_type) phys_size_t initdram(int board_type)
{ {
volatile siu_t *siu = (siu_t *) (MMAP_SIU); siu_t *siu = (siu_t *) (MMAP_SIU);
volatile sdram_t *sdram = (volatile sdram_t *)(MMAP_SDRAM); sdram_t *sdram = (sdram_t *)(MMAP_SDRAM);
u32 dramsize, i; u32 dramsize, i;
#ifdef CONFIG_SYS_DRAMSZ1 #ifdef CONFIG_SYS_DRAMSZ1
u32 temp; u32 temp;
#endif #endif
siu->drv = CONFIG_SYS_SDRAM_DRVSTRENGTH; out_be32(&siu->drv, CONFIG_SYS_SDRAM_DRVSTRENGTH);
dramsize = CONFIG_SYS_DRAMSZ * 0x100000; dramsize = CONFIG_SYS_DRAMSZ * 0x100000;
for (i = 0x13; i < 0x20; i++) { for (i = 0x13; i < 0x20; i++) {
@ -55,7 +56,7 @@ phys_size_t initdram(int board_type)
break; break;
} }
i--; i--;
siu->cs0cfg = (CONFIG_SYS_SDRAM_BASE | i); out_be32(&siu->cs0cfg, CONFIG_SYS_SDRAM_BASE | i);
#ifdef CONFIG_SYS_DRAMSZ1 #ifdef CONFIG_SYS_DRAMSZ1
temp = CONFIG_SYS_DRAMSZ1 * 0x100000; temp = CONFIG_SYS_DRAMSZ1 * 0x100000;
@ -65,31 +66,32 @@ phys_size_t initdram(int board_type)
} }
i--; i--;
dramsize += temp; dramsize += temp;
siu->cs1cfg = ((CONFIG_SYS_SDRAM_BASE + temp) | i); out_be32(&siu->cs1cfg, (CONFIG_SYS_SDRAM_BASE + temp) | i);
#endif #endif
sdram->cfg1 = CONFIG_SYS_SDRAM_CFG1; out_be32(&sdram->cfg1, CONFIG_SYS_SDRAM_CFG1);
sdram->cfg2 = CONFIG_SYS_SDRAM_CFG2; out_be32(&sdram->cfg2, CONFIG_SYS_SDRAM_CFG2);
/* Issue PALL */ /* Issue PALL */
sdram->ctrl = CONFIG_SYS_SDRAM_CTRL | 2; out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 2);
/* Issue LEMR */ /* Issue LEMR */
sdram->mode = CONFIG_SYS_SDRAM_EMOD; out_be32(&sdram->mode, CONFIG_SYS_SDRAM_EMOD);
sdram->mode = (CONFIG_SYS_SDRAM_MODE | 0x04000000); out_be32(&sdram->mode, CONFIG_SYS_SDRAM_MODE | 0x04000000);
udelay(500); udelay(500);
/* Issue PALL */ /* Issue PALL */
sdram->ctrl = (CONFIG_SYS_SDRAM_CTRL | 2); out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 2);
/* Perform two refresh cycles */ /* Perform two refresh cycles */
sdram->ctrl = CONFIG_SYS_SDRAM_CTRL | 4; out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 4);
sdram->ctrl = CONFIG_SYS_SDRAM_CTRL | 4; out_be32(&sdram->ctrl, CONFIG_SYS_SDRAM_CTRL | 4);
sdram->mode = CONFIG_SYS_SDRAM_MODE; out_be32(&sdram->mode, CONFIG_SYS_SDRAM_MODE);
sdram->ctrl = (CONFIG_SYS_SDRAM_CTRL & ~0x80000000) | 0x10000F00; out_be32(&sdram->ctrl,
(CONFIG_SYS_SDRAM_CTRL & ~0x80000000) | 0x10000F00);
udelay(100); udelay(100);