Merge branch 'master' of git://git.denx.de/u-boot-arm

[oweals/u-boot.git] / cpu / mpc8xx / serial.c

diff --git a/cpu/mpc8xx/serial.c b/cpu/mpc8xx/serial.c
index fa0405f198da8e69165cc24323e4fcde22f35c74..bd90dcd3b0f46abe510f04ba9378502b338bfa28 100644 (file)
--- a/cpu/mpc8xx/serial.c
+++ b/cpu/mpc8xx/serial.c
@@ -27,6 +27,8 @@
 #include <serial.h>
 #include <watchdog.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 #if !defined(CONFIG_8xx_CONS_NONE)     /* No Console at all */
 
 #if defined(CONFIG_8xx_CONS_SMC1)      /* Console on SMC1 */
@@ -65,16 +67,15 @@
 
 static void serial_setdivisor(volatile cpm8xx_t *cp)
 {
-       DECLARE_GLOBAL_DATA_PTR;
        int divisor=(gd->cpu_clk + 8*gd->baudrate)/16/gd->baudrate;
 
        if(divisor/16>0x1000) {
-               /* bad divisor, assume 50Mhz clock and 9600 baud */
+               /* bad divisor, assume 50MHz clock and 9600 baud */
                divisor=(50*1000*1000 + 8*9600)/16/9600;
        }
 
-#ifdef CFG_BRGCLK_PRESCALE
-       divisor /= CFG_BRGCLK_PRESCALE;
+#ifdef CONFIG_SYS_BRGCLK_PRESCALE
+       divisor /= CONFIG_SYS_BRGCLK_PRESCALE;
 #endif
 
        if(divisor<=0x1000) {
@@ -93,7 +94,7 @@ static void serial_setdivisor(volatile cpm8xx_t *cp)
 
 static void smc_setbrg (void)
 {
-       volatile immap_t *im = (immap_t *)CFG_IMMR;
+       volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR;
        volatile cpm8xx_t *cp = &(im->im_cpm);
 
        /* Set up the baud rate generator.
@@ -109,7 +110,7 @@ static void smc_setbrg (void)
 
 static int smc_init (void)
 {
-       volatile immap_t *im = (immap_t *)CFG_IMMR;
+       volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR;
        volatile smc_t *sp;
        volatile smc_uart_t *up;
        volatile cbd_t *tbdf, *rbdf;
@@ -123,6 +124,12 @@ static int smc_init (void)
 
        sp = (smc_t *) &(cp->cp_smc[SMC_INDEX]);
        up = (smc_uart_t *) &cp->cp_dparam[PROFF_SMC];
+#ifdef CONFIG_SYS_SMC_UCODE_PATCH
+       up = (smc_uart_t *) &cp->cp_dpmem[up->smc_rpbase];
+#else
+       /* Disable relocation */
+       up->smc_rpbase = 0;
+#endif
 
        /* Disable transmitter/receiver.
        */
@@ -133,15 +140,15 @@ static int smc_init (void)
        im->im_siu_conf.sc_sdcr = 1;
 
        /* clear error conditions */
-#ifdef CFG_SDSR
-       im->im_sdma.sdma_sdsr = CFG_SDSR;
+#ifdef CONFIG_SYS_SDSR
+       im->im_sdma.sdma_sdsr = CONFIG_SYS_SDSR;
 #else
        im->im_sdma.sdma_sdsr = 0x83;
 #endif
 
        /* clear SDMA interrupt mask */
-#ifdef CFG_SDMR
-       im->im_sdma.sdma_sdmr = CFG_SDMR;
+#ifdef CONFIG_SYS_SDMR
+       im->im_sdma.sdma_sdmr = CONFIG_SYS_SDMR;
 #else
        im->im_sdma.sdma_sdmr = 0x00;
 #endif
@@ -186,7 +193,7 @@ static int smc_init (void)
         * the buffer descriptors.
         */
 
-#ifdef CFG_ALLOC_DPRAM
+#ifdef CONFIG_SYS_ALLOC_DPRAM
        dpaddr = dpram_alloc_align (sizeof(cbd_t)*2 + 2, 8) ;
 #else
        dpaddr = CPM_SERIAL_BASE ;
@@ -211,6 +218,12 @@ static int smc_init (void)
        up->smc_tbase = dpaddr+sizeof(cbd_t);
        up->smc_rfcr = SMC_EB;
        up->smc_tfcr = SMC_EB;
+#if defined (CONFIG_SYS_SMC_UCODE_PATCH)
+       up->smc_rbptr = up->smc_rbase;
+       up->smc_tbptr = up->smc_tbase;
+       up->smc_rstate = 0;
+       up->smc_tstate = 0;
+#endif
 
 #if defined(CONFIG_MBX)
        board_serial_init();
@@ -226,9 +239,20 @@ static int smc_init (void)
        sp->smc_smcm = 0;
        sp->smc_smce = 0xff;
 
-       /* Set up the baud rate generator.
-       */
+#ifdef CONFIG_SYS_SPC1920_SMC1_CLK4
+       /* clock source is PLD */
+
+       /* set freq to 19200 Baud */
+       *((volatile uchar *) CONFIG_SYS_SPC1920_PLD_BASE+6) = 0x3;
+       /* configure clk4 as input */
+       im->im_ioport.iop_pdpar |= 0x800;
+       im->im_ioport.iop_pddir &= ~0x800;
+
+       cp->cp_simode = ((cp->cp_simode & ~0xf000) | 0x7000);
+#else
+       /* Set up the baud rate generator */
        smc_setbrg ();
+#endif
 
        /* Make the first buffer the only buffer.
        */
@@ -264,12 +288,10 @@ smc_putc(const char c)
        volatile cbd_t          *tbdf;
        volatile char           *buf;
        volatile smc_uart_t     *up;
-       volatile immap_t        *im = (immap_t *)CFG_IMMR;
+       volatile immap_t        *im = (immap_t *)CONFIG_SYS_IMMR;
        volatile cpm8xx_t       *cpmp = &(im->im_cpm);
 
 #ifdef CONFIG_MODEM_SUPPORT
-       DECLARE_GLOBAL_DATA_PTR;
-
        if (gd->be_quiet)
                return;
 #endif
@@ -278,6 +300,9 @@ smc_putc(const char c)
                smc_putc ('\r');
 
        up = (smc_uart_t *)&cpmp->cp_dparam[PROFF_SMC];
+#ifdef CONFIG_SYS_SMC_UCODE_PATCH
+       up = (smc_uart_t *) &cpmp->cp_dpmem[up->smc_rpbase];
+#endif
 
        tbdf = (cbd_t *)&cpmp->cp_dpmem[up->smc_tbase];
 
@@ -311,11 +336,14 @@ smc_getc(void)
        volatile cbd_t          *rbdf;
        volatile unsigned char  *buf;
        volatile smc_uart_t     *up;
-       volatile immap_t        *im = (immap_t *)CFG_IMMR;
+       volatile immap_t        *im = (immap_t *)CONFIG_SYS_IMMR;
        volatile cpm8xx_t       *cpmp = &(im->im_cpm);
        unsigned char           c;
 
        up = (smc_uart_t *)&cpmp->cp_dparam[PROFF_SMC];
+#ifdef CONFIG_SYS_SMC_UCODE_PATCH
+       up = (smc_uart_t *) &cpmp->cp_dpmem[up->smc_rpbase];
+#endif
 
        rbdf = (cbd_t *)&cpmp->cp_dpmem[up->smc_rbase];
 
@@ -337,10 +365,13 @@ smc_tstc(void)
 {
        volatile cbd_t          *rbdf;
        volatile smc_uart_t     *up;
-       volatile immap_t        *im = (immap_t *)CFG_IMMR;
+       volatile immap_t        *im = (immap_t *)CONFIG_SYS_IMMR;
        volatile cpm8xx_t       *cpmp = &(im->im_cpm);
 
        up = (smc_uart_t *)&cpmp->cp_dparam[PROFF_SMC];
+#ifdef CONFIG_SYS_SMC_UCODE_PATCH
+       up = (smc_uart_t *) &cpmp->cp_dpmem[up->smc_rpbase];
+#endif
 
        rbdf = (cbd_t *)&cpmp->cp_dpmem[up->smc_rbase];
 
@@ -367,7 +398,7 @@ struct serial_device serial_smc_device =
 static void
 scc_setbrg (void)
 {
-       volatile immap_t *im = (immap_t *)CFG_IMMR;
+       volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR;
        volatile cpm8xx_t *cp = &(im->im_cpm);
 
        /* Set up the baud rate generator.
@@ -383,7 +414,7 @@ scc_setbrg (void)
 
 static int scc_init (void)
 {
-       volatile immap_t *im = (immap_t *)CFG_IMMR;
+       volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR;
        volatile scc_t *sp;
        volatile scc_uart_t *up;
        volatile cbd_t *tbdf, *rbdf;
@@ -443,7 +474,7 @@ static int scc_init (void)
        /* Allocate space for two buffer descriptors in the DP ram.
         */
 
-#ifdef CFG_ALLOC_DPRAM
+#ifdef CONFIG_SYS_ALLOC_DPRAM
        dpaddr = dpram_alloc_align (sizeof(cbd_t)*2 + 2, 8) ;
 #else
        dpaddr = CPM_SERIAL2_BASE ;
@@ -549,12 +580,10 @@ scc_putc(const char c)
        volatile cbd_t          *tbdf;
        volatile char           *buf;
        volatile scc_uart_t     *up;
-       volatile immap_t        *im = (immap_t *)CFG_IMMR;
+       volatile immap_t        *im = (immap_t *)CONFIG_SYS_IMMR;
        volatile cpm8xx_t       *cpmp = &(im->im_cpm);
 
 #ifdef CONFIG_MODEM_SUPPORT
-       DECLARE_GLOBAL_DATA_PTR;
-
        if (gd->be_quiet)
                return;
 #endif
@@ -596,7 +625,7 @@ scc_getc(void)
        volatile cbd_t          *rbdf;
        volatile unsigned char  *buf;
        volatile scc_uart_t     *up;
-       volatile immap_t        *im = (immap_t *)CFG_IMMR;
+       volatile immap_t        *im = (immap_t *)CONFIG_SYS_IMMR;
        volatile cpm8xx_t       *cpmp = &(im->im_cpm);
        unsigned char           c;
 
@@ -622,7 +651,7 @@ scc_tstc(void)
 {
        volatile cbd_t          *rbdf;
        volatile scc_uart_t     *up;
-       volatile immap_t        *im = (immap_t *)CFG_IMMR;
+       volatile immap_t        *im = (immap_t *)CONFIG_SYS_IMMR;
        volatile cpm8xx_t       *cpmp = &(im->im_cpm);
 
        up = (scc_uart_t *)&cpmp->cp_dparam[PROFF_SCC];
@@ -649,18 +678,16 @@ struct serial_device serial_scc_device =
 #ifdef CONFIG_MODEM_SUPPORT
 void disable_putc(void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
        gd->be_quiet = 1;
 }
 
 void enable_putc(void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
        gd->be_quiet = 0;
 }
 #endif
 
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 
 void
 kgdb_serial_init(void)
@@ -717,6 +744,6 @@ kgdb_interruptible (int yes)
 {
        return;
 }
-#endif /* CFG_CMD_KGDB */
+#endif
 
 #endif /* CONFIG_8xx_CONS_NONE */