From: Matt Porter Adds SCC2 pin routing specific to the GP3 board. Signed-off-by: Matt Porter Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton --- drivers/serial/cpm_uart/cpm_uart_cpm2.c | 9 +++++++++ 1 files changed, 9 insertions(+) diff -puN drivers/serial/cpm_uart/cpm_uart_cpm2.c~cpm_uart-route-scc2-pins-for-the-stx-gp3-board drivers/serial/cpm_uart/cpm_uart_cpm2.c --- 25/drivers/serial/cpm_uart/cpm_uart_cpm2.c~cpm_uart-route-scc2-pins-for-the-stx-gp3-board Thu Jun 2 15:32:29 2005 +++ 25-akpm/drivers/serial/cpm_uart/cpm_uart_cpm2.c Thu Jun 2 15:32:29 2005 @@ -134,12 +134,21 @@ void scc1_lineif(struct uart_cpm_port *p 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; io->iop_pparb |= 0x008b0000; io->iop_pdirb |= 0x00880000; io->iop_psorb |= 0x00880000; io->iop_pdirb &= ~0x00030000; io->iop_psorb &= ~0x00030000; +#endif cpm2_immr->im_cpmux.cmx_scr &= 0xff00ffff; cpm2_immr->im_cpmux.cmx_scr |= 0x00090000; pinfo->brg = 2; _