Eric Lee / smarc-uboot | Embedian Git Server

Commit c78dfb4fd2cc8dbcd0baa3d180aeef1a06b1f062

Authored by Bin Meng 2015-08-21 15:18:51 +0800

Committed by Simon Glass 2015-08-26 22:54:12 +0800

Exists in v2017.01-smarct4x and in 30 other branches

x86: superio: Add keyboard controller support to smsc_lpc47m driver

Add an api to enable and configure the integrated keyboard controller
on SMSC LPC47m superio chipset. It also adds several macros to help
future extension.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>

Showing 3 changed files with 40 additions and 5 deletions Inline Diff

arch/x86/include/asm/ibmpc.h
drivers/misc/smsc_lpc47m.c
include/smsc_lpc47m.h

arch/x86/include/asm/ibmpc.h

Diff comments View file @ c78dfb4

 /*
  * (C) Copyright 2002
  * Daniel Engström, Omicron Ceti AB, daniel@omicron.se
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 #ifndef __ASM_IBMPC_H_
 #define __ASM_IBMPC_H_ 1
 /* misc ports in an ibm compatible pc */
 #define MASTER_PIC      0x20
 #define PIT_BASE	0x40
 #define KBDDATA         0x60
 #define SYSCTLB         0x62
 #define KBDCMD          0x64
 #define SYSCTLA         0x92
 #define SLAVE_PIC       0xa0
 #define UART0_BASE	0x3f8
 #define UART1_BASE	0x2f8
 #define UART0_IRQ	4
 #define UART1_IRQ	3
+#define KBD_IRQ		1
+#define MSE_IRQ		12
 #endif

drivers/misc/smsc_lpc47m.c

Diff comments View file @ c78dfb4

 /*
  * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 #include <common.h>
 #include <asm/io.h>
 #include <asm/pnp_def.h>
 static void pnp_enter_conf_state(u16 dev)
 {
 	u16 port = dev >> 8;
 	outb(0x55, port);
 }
 static void pnp_exit_conf_state(u16 dev)
 {
 	u16 port = dev >> 8;
 	outb(0xaa, port);
 }
-void lpc47m_enable_serial(u16 dev, u16 iobase, u8 irq)
+void lpc47m_enable_serial(uint dev, uint iobase, uint 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);
+}
+void lpc47m_enable_kbc(uint dev, uint irq0, uint irq1)
+{
+	pnp_enter_conf_state(dev);
+	pnp_set_logical_device(dev);
+	pnp_set_enable(dev, 0);
+	pnp_set_irq(dev, PNP_IDX_IRQ0, irq0);
+	pnp_set_irq(dev, PNP_IDX_IRQ1, irq1);
 	pnp_set_enable(dev, 1);
 	pnp_exit_conf_state(dev);
 }

include/smsc_lpc47m.h

Diff comments View file @ c78dfb4

 /*
  * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 #ifndef _SMSC_LPC47M_H_
 #define _SMSC_LPC47M_H_
+/* I/O address of LPC47M */
+#define LPC47M_IO_PORT	0x2e
+/* Logical device number */
+#define LPC47M_FDC	0	/* Floppy */
+#define LPC47M_SP2	2	/* Serial Port 2 */
+#define LPC47M_PP	3	/* Parallel Port */
+#define LPC47M_SP1	4	/* Serial Port 1 */
+#define LPC47M_KBC	7	/* Keyboard & Mouse */
+#define LPC47M_PME	10	/* Power Control */
 /**
  * Configure the base I/O port of the specified serial device and enable the
  * serial device.
  *
- * @dev: High 8 bits = Super I/O port, low 8 bits = logical device number.
+ * @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.
+ * @iobase: processor I/O port address to assign to this serial device
- * @irq: Processor IRQ number to assign to this serial device.
+ * @irq: processor IRQ number to assign to this serial device
  */
-void lpc47m_enable_serial(u16 dev, u16 iobase, u8 irq);
+void lpc47m_enable_serial(uint dev, uint iobase, uint irq);
+/**
+ * Configure the specified keyboard controller device and enable the keyboard
+ * controller device.
+ *
+ * @dev: high 8 bits = Super I/O port, low 8 bits = logical device number
+ * @irq0: processor IRQ number to assign to keyboard
+ * @irq1: processor IRQ number to assign to mouse
+ */
+void lpc47m_enable_kbc(uint dev, uint irq0, uint irq1);
 #endif /* _SMSC_LPC47M_H_ */