]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] cpm_uart: Route SCC2 pins for the STx GP3 board
authorMatt Porter <mporter@kernel.crashing.org>
Wed, 22 Jun 2005 00:15:22 +0000 (17:15 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 22 Jun 2005 01:46:23 +0000 (18:46 -0700)
Adds SCC2 pin routing specific to the GP3 board.

Signed-off-by: Matt Porter <mporter@kernel.crashing.org>
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/serial/cpm_uart/cpm_uart_cpm2.c

index b422c3abfba612830df57630e7cbb3c4682279ce..c4c8f4b44f53820a8a4ae3d3431f7c3da984b1ee 100644 (file)
@@ -134,12 +134,21 @@ void scc1_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;
        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;