summaryrefslogtreecommitdiff
path: root/src/superio
diff options
context:
space:
mode:
Diffstat (limited to 'src/superio')
-rw-r--r--src/superio/smsc/Kconfig2
-rw-r--r--src/superio/smsc/Makefile.inc1
-rw-r--r--src/superio/smsc/lpc47m15x/Makefile.inc2
-rw-r--r--src/superio/smsc/lpc47m15x/superio.c3
4 files changed, 6 insertions, 2 deletions
diff --git a/src/superio/smsc/Kconfig b/src/superio/smsc/Kconfig
index ac7b0dabc1..3c2ba07932 100644
--- a/src/superio/smsc/Kconfig
+++ b/src/superio/smsc/Kconfig
@@ -6,6 +6,8 @@ config SUPERIO_SMSC_LPC47B397
bool
config SUPERIO_SMSC_LPC47M10X
bool
+config SUPERIO_SMSC_LPC47M15X
+ bool
config SUPERIO_SMSC_LPC47N217
bool
config SUPERIO_SMSC_SMSCSUPERIO
diff --git a/src/superio/smsc/Makefile.inc b/src/superio/smsc/Makefile.inc
index db59651c1d..98b87aa1ee 100644
--- a/src/superio/smsc/Makefile.inc
+++ b/src/superio/smsc/Makefile.inc
@@ -2,5 +2,6 @@ subdirs-y += fdc37m60x
subdirs-y += lpc47b272
subdirs-y += lpc47b397
subdirs-y += lpc47m10x
+subdirs-y += lpc47m15x
subdirs-y += lpc47n217
subdirs-y += smscsuperio
diff --git a/src/superio/smsc/lpc47m15x/Makefile.inc b/src/superio/smsc/lpc47m15x/Makefile.inc
new file mode 100644
index 0000000000..25967e4013
--- /dev/null
+++ b/src/superio/smsc/lpc47m15x/Makefile.inc
@@ -0,0 +1,2 @@
+#config chip.h
+obj-$(CONFIG_SUPERIO_SMSC_LPC47M15X) += superio.o
diff --git a/src/superio/smsc/lpc47m15x/superio.c b/src/superio/smsc/lpc47m15x/superio.c
index 1d360d9259..80ee5c7e55 100644
--- a/src/superio/smsc/lpc47m15x/superio.c
+++ b/src/superio/smsc/lpc47m15x/superio.c
@@ -35,7 +35,6 @@
// Forward declarations
static void enable_dev(device_t dev);
void lpc47m15x_pnp_set_resources(device_t dev);
-void lpc47m15x_pnp_set_resources(device_t dev);
void lpc47m15x_pnp_enable_resources(device_t dev);
void lpc47m15x_pnp_enable(device_t dev);
static void lpc47m15x_init(device_t dev);
@@ -121,7 +120,7 @@ static void lpc47m15x_init(device_t dev)
case LPC47M15X_KBC:
res0 = find_resource(dev, PNP_IDX_IO0);
res1 = find_resource(dev, PNP_IDX_IO1);
- pc_keyboard_init(&conf->keyboard);
+ init_pc_keyboard(0x60, 0x64, &conf->keyboard);
break;
}
}