X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-arm%2Farch-iop3xx%2Fserial.h;h=61192f98c066c3910d0e64178e005991788be275;hb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;hp=8217c12b812e05cd4094fb08b31b6731d55b48d9;hpb=a2c21200f1c81b08cb55e417b68150bba439b646;p=linux-2.6.git

diff --git a/include/asm-arm/arch-iop3xx/serial.h b/include/asm-arm/arch-iop3xx/serial.h
index 8217c12b8..61192f98c 100644
--- a/include/asm-arm/arch-iop3xx/serial.h
+++ b/include/asm-arm/arch-iop3xx/serial.h
@@ -15,26 +15,61 @@
 /* Standard COM flags */
 #define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST)
 
-#ifdef CONFIG_ARCH_IQ80310
+#ifdef CONFIG_ARCH_IQ80321
+
+#define IRQ_UART1	IRQ_IQ80321_UART
 
-#define IRQ_UART1	IRQ_IQ80310_UART1
-#define IRQ_UART2	IRQ_IQ80310_UART2
+#define RS_TABLE_SIZE 1
 
 #define STD_SERIAL_PORT_DEFNS			\
        /* UART CLK      PORT        IRQ        FLAGS        */			\
-	{ 0, BASE_BAUD, IQ80310_UART2, IRQ_UART2, STD_COM_FLAGS },  /* ttyS0 */	\
-	{ 0, BASE_BAUD, IQ80310_UART1, IRQ_UART1, STD_COM_FLAGS }  /* ttyS1 */
+	{ 0, BASE_BAUD, 0xfe800000, IRQ_UART1, STD_COM_FLAGS },  /* ttyS0 */
+#endif // CONFIG_ARCH_IQ80321
 
-#endif // CONFIG_ARCH_IQ80310
+#ifdef CONFIG_ARCH_IQ31244
 
-#ifdef CONFIG_ARCH_IQ80321
+#define IRQ_UART1	IRQ_IQ31244_UART
 
-#define IRQ_UART1	IRQ_IQ80321_UART
+#define RS_TABLE_SIZE 1
 
 #define STD_SERIAL_PORT_DEFNS			\
        /* UART CLK      PORT        IRQ        FLAGS        */			\
 	{ 0, BASE_BAUD, 0xfe800000, IRQ_UART1, STD_COM_FLAGS },  /* ttyS0 */
-#endif // CONFIG_ARCH_IQ80321
+#endif // CONFIG_ARCH_IQ31244
+
+#ifdef CONFIG_ARCH_IQ80331
+
+#undef BASE_BAUD
+
+#define BASE_BAUD ( 33334000 / 16 )
+
+#define IRQ_UART0	IRQ_IQ80331_UART0
+#define IRQ_UART1	IRQ_IQ80331_UART1
+
+#define RS_TABLE_SIZE 2
+
+#define STD_SERIAL_PORT_DEFNS				\
+	{						\
+	  /*type: PORT_XSCALE,*/			\
+	  /*xmit_fifo_size: 32,*/			\
+	  baud_base: BASE_BAUD,				\
+	  irq: IRQ_UART0,			  	\
+	  flags: STD_COM_FLAGS,				\
+	  iomem_base: IQ80331_UART0_VIRT,		\
+	  io_type: SERIAL_IO_MEM,			\
+	  iomem_reg_shift: 2				\
+	}, /* ttyS0 */					\
+	{						\
+	  /*type: PORT_XSCALE,*/			\
+	  /*xmit_fifo_size: 32,*/			\
+	  baud_base: BASE_BAUD,				\
+	  irq: IRQ_UART1,			  	\
+	  flags: STD_COM_FLAGS,				\
+	  iomem_base: IQ80331_UART1_VIRT,		\
+	  io_type: SERIAL_IO_MEM,			\
+	  iomem_reg_shift: 2				\
+	} /* ttyS1 */
+#endif // CONFIG_ARCH_IQ80331
 
 
 #define EXTRA_SERIAL_PORT_DEFNS