Commit 0d8ba1a9 authored by Kumar Gala's avatar Kumar Gala Committed by Linus Torvalds

[PATCH] cpm_uart: Fix 2nd serial port on MPC8560 ADS

The 2nd serial port on the MPC8560 ADS was not being configured correctly
and thus could not be used as a console.  Updated the defconfig for the
board to configure the proper SCC channel for the 2nd serial port.
Signed-off-by: default avatarRoy Zang <tie-fei.zang@freescale.com>
Signed-off-by: default avatarKumar Gala <kumar.gala@freescale.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2698ebcb
This diff is collapsed.
...@@ -142,12 +142,21 @@ void scc2_lineif(struct uart_cpm_port *pinfo) ...@@ -142,12 +142,21 @@ void scc2_lineif(struct uart_cpm_port *pinfo)
* be supported in a sane fashion. * be supported in a sane fashion.
*/ */
#ifndef CONFIG_STX_GP3 #ifndef CONFIG_STX_GP3
#ifdef CONFIG_MPC8560_ADS
volatile iop_cpm2_t *io = &cpm2_immr->im_ioport;
io->iop_ppard |= 0x00000018;
io->iop_psord &= ~0x00000008; /* Rx */
io->iop_psord &= ~0x00000010; /* Tx */
io->iop_pdird &= ~0x00000008; /* Rx */
io->iop_pdird |= 0x00000010; /* Tx */
#else
volatile iop_cpm2_t *io = &cpm2_immr->im_ioport; volatile iop_cpm2_t *io = &cpm2_immr->im_ioport;
io->iop_pparb |= 0x008b0000; io->iop_pparb |= 0x008b0000;
io->iop_pdirb |= 0x00880000; io->iop_pdirb |= 0x00880000;
io->iop_psorb |= 0x00880000; io->iop_psorb |= 0x00880000;
io->iop_pdirb &= ~0x00030000; io->iop_pdirb &= ~0x00030000;
io->iop_psorb &= ~0x00030000; io->iop_psorb &= ~0x00030000;
#endif
#endif #endif
cpm2_immr->im_cpmux.cmx_scr &= 0xff00ffff; cpm2_immr->im_cpmux.cmx_scr &= 0xff00ffff;
cpm2_immr->im_cpmux.cmx_scr |= 0x00090000; cpm2_immr->im_cpmux.cmx_scr |= 0x00090000;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment