x86: Set serial port IRQ for SMSC LPC47M

For starting a Linux console on the superio serial port under interrupt mode, the IRQ number must be configured. Signed-off-by: Jian Luo <[email protected]> Signed-off-by: Bin Meng <[email protected]> Acked-by: Simon Glass <[email protected]>
gameltb · Apr 30, 2015 · 1926883 · 1926883
1 parent d21d05f
commit 1926883
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/arch/x86/include/asm/ibmpc.h b/arch/x86/include/asm/ibmpc.h
@@ -21,4 +21,7 @@
 #define UART0_BASE	0x3f8
 #define UART1_BASE	0x2f8
 
+#define UART0_IRQ	4
+#define UART1_IRQ	3
+
 #endif
diff --git a/board/intel/crownbay/crownbay.c b/board/intel/crownbay/crownbay.c
@@ -16,7 +16,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 int board_early_init_f(void)
 {
-	lpc47m_enable_serial(SERIAL_DEV, UART0_BASE);
+	lpc47m_enable_serial(SERIAL_DEV, UART0_BASE, UART0_IRQ);
 
 	return 0;
 }

diff --git a/board/intel/minnowmax/minnowmax.c b/board/intel/minnowmax/minnowmax.c
@@ -16,7 +16,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 int board_early_init_f(void)
 {
-	lpc47m_enable_serial(SERIAL_DEV, UART0_BASE);
+	lpc47m_enable_serial(SERIAL_DEV, UART0_BASE, UART0_IRQ);
 
 	return 0;
 }

diff --git a/drivers/misc/smsc_lpc47m.c b/drivers/misc/smsc_lpc47m.c
@@ -22,12 +22,13 @@ static void pnp_exit_conf_state(u16 dev)
 	outb(0xaa, port);
 }
 
-void lpc47m_enable_serial(u16 dev, u16 iobase)
+void lpc47m_enable_serial(u16 dev, u16 iobase, u8 irq)
 {
 	pnp_enter_conf_state(dev);
 	pnp_set_logical_device(dev);
 	pnp_set_enable(dev, 0);
 	pnp_set_iobase(dev, PNP_IDX_IO0, iobase);
+	pnp_set_irq(dev, PNP_IDX_IRQ0, irq);
 	pnp_set_enable(dev, 1);
 	pnp_exit_conf_state(dev);
 }
diff --git a/include/smsc_lpc47m.h b/include/smsc_lpc47m.h
@@ -13,7 +13,8 @@
  *
  * @dev: High 8 bits = Super I/O port, low 8 bits = logical device number.
  * @iobase: Processor I/O port address to assign to this serial device.
+ * @irq: Processor IRQ number to assign to this serial device.
  */
-void lpc47m_enable_serial(u16 dev, u16 iobase);
+void lpc47m_enable_serial(u16 dev, u16 iobase, u8 irq);
 
 #endif /* _SMSC_LPC47M_H_ */