Commit a1604f91 authored by Matt Porter's avatar Matt Porter Committed by Linus Torvalds

[PATCH] cpm_uart: Route SCC2 pins for the STx GP3 board

Adds SCC2 pin routing specific to the GP3 board.
Signed-off-by: default avatarMatt Porter <mporter@kernel.crashing.org>
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 b264c352
...@@ -134,12 +134,21 @@ void scc1_lineif(struct uart_cpm_port *pinfo) ...@@ -134,12 +134,21 @@ void scc1_lineif(struct uart_cpm_port *pinfo)
void scc2_lineif(struct uart_cpm_port *pinfo) void scc2_lineif(struct uart_cpm_port *pinfo)
{ {
/*
* STx GP3 uses the SCC2 secondary option pin assignment
* which this driver doesn't account for in the static
* pin assignments. This kind of board specific info
* really has to get out of the driver so boards can
* be supported in a sane fashion.
*/
#ifndef CONFIG_STX_GP3
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
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;
pinfo->brg = 2; pinfo->brg = 2;
......
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