lenovo: Move pc_keyboard_init to h8 init.
PS/2 emulation is part of H8, so should be inited in relevant files. Change-Id: Ie873ea7f6f88f68f622351799462d0b000d17585 Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com> Reviewed-on: http://review.coreboot.org/10348 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Edward O'Callaghan <edward.ocallaghan@koparo.com> Reviewed-by: Alexander Couzens <lynxis@fe80.eu>
This commit is contained in:
parent
faa46e0cb6
commit
852014cf00
|
@ -27,6 +27,7 @@
|
|||
#include <string.h>
|
||||
#include <smbios.h>
|
||||
#include <pc80/mc146818rtc.h>
|
||||
#include <pc80/keyboard.h>
|
||||
|
||||
#include "h8.h"
|
||||
#include "chip.h"
|
||||
|
@ -176,8 +177,14 @@ static void h8_smbios_strings(struct device *dev, struct smbios_type11 *t)
|
|||
t->count = smbios_add_string(t->eos, tpec);
|
||||
}
|
||||
|
||||
static void h8_init(device_t dev)
|
||||
{
|
||||
pc_keyboard_init();
|
||||
}
|
||||
|
||||
struct device_operations h8_dev_ops = {
|
||||
.get_smbios_strings = h8_smbios_strings
|
||||
.get_smbios_strings = h8_smbios_strings,
|
||||
.init = h8_init,
|
||||
};
|
||||
|
||||
static void h8_enable(struct device *dev)
|
||||
|
|
|
@ -45,8 +45,6 @@ static void mainboard_init(device_t dev)
|
|||
RCBA32(0x38c8) = 0x00002005;
|
||||
RCBA32(0x38c4) = 0x00802005;
|
||||
RCBA32(0x38c0) = 0x00000007;
|
||||
|
||||
pc_keyboard_init();
|
||||
}
|
||||
|
||||
static void mainboard_enable(device_t dev)
|
||||
|
|
|
@ -45,8 +45,6 @@ static void mainboard_init(device_t dev)
|
|||
RCBA32(0x38c8) = 0x00002005;
|
||||
RCBA32(0x38c4) = 0x00802005;
|
||||
RCBA32(0x38c0) = 0x00000007;
|
||||
|
||||
pc_keyboard_init();
|
||||
}
|
||||
|
||||
static void mainboard_enable(device_t dev)
|
||||
|
|
|
@ -49,8 +49,6 @@ static void mainboard_init(device_t dev)
|
|||
RCBA32(0x38c8) = 0x00002005;
|
||||
RCBA32(0x38c4) = 0x00802005;
|
||||
RCBA32(0x38c0) = 0x00000007;
|
||||
|
||||
pc_keyboard_init();
|
||||
}
|
||||
|
||||
/* mainboard_enable is executed as first thing after
|
||||
|
|
|
@ -49,11 +49,6 @@ static void mainboard_init(device_t dev)
|
|||
RCBA32(0x38c8) = 0x00002005;
|
||||
RCBA32(0x38c4) = 0x00802005;
|
||||
RCBA32(0x38c0) = 0x00000007;
|
||||
|
||||
/* This sneaked in here, because X201 SuperIO chip isn't really
|
||||
connected to anything and hence we don't init it.
|
||||
*/
|
||||
pc_keyboard_init();
|
||||
}
|
||||
|
||||
// mainboard_enable is executed as first thing after
|
||||
|
|
|
@ -37,19 +37,10 @@ static void fill_ssdt(void)
|
|||
drivers_lenovo_serial_ports_ssdt_generate("\\_SB.PCI0.LPCB", 0);
|
||||
}
|
||||
|
||||
static void mainboard_init(device_t dev)
|
||||
{
|
||||
/* This sneaked in here, because X200 SuperIO chip isn't really
|
||||
connected to anything and hence we don't init it.
|
||||
*/
|
||||
pc_keyboard_init();
|
||||
}
|
||||
|
||||
static void mainboard_enable(device_t dev)
|
||||
{
|
||||
install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS, GMA_INT15_PANEL_FIT_CENTERING, GMA_INT15_BOOT_DISPLAY_DEFAULT, 2);
|
||||
|
||||
dev->ops->init = mainboard_init;
|
||||
dev->ops->acpi_fill_ssdt_generator = fill_ssdt;
|
||||
}
|
||||
|
||||
|
|
|
@ -85,10 +85,6 @@ static void mainboard_init(device_t dev)
|
|||
RCBA32(0x3804) = 0x3f04e008;
|
||||
|
||||
printk(BIOS_SPEW, "SPI configured\n");
|
||||
/* This sneaked in here, because X201 SuperIO chip isn't really
|
||||
connected to anything and hence we don't init it.
|
||||
*/
|
||||
pc_keyboard_init();
|
||||
}
|
||||
|
||||
static void fill_ssdt(void)
|
||||
|
|
|
@ -44,11 +44,6 @@ static void mainboard_init(device_t dev)
|
|||
RCBA32(0x38c8) = 0x00002005;
|
||||
RCBA32(0x38c4) = 0x00802005;
|
||||
RCBA32(0x38c0) = 0x00000007;
|
||||
|
||||
/* This sneaked in here, because X201 SuperIO chip isn't really
|
||||
connected to anything and hence we don't init it.
|
||||
*/
|
||||
pc_keyboard_init();
|
||||
}
|
||||
|
||||
// mainboard_enable is executed as first thing after
|
||||
|
|
|
@ -45,11 +45,6 @@ static void mainboard_init(device_t dev)
|
|||
RCBA32(0x38c8) = 0x00002005;
|
||||
RCBA32(0x38c4) = 0x00802005;
|
||||
RCBA32(0x38c0) = 0x00000007;
|
||||
|
||||
/* This sneaked in here, because X201 SuperIO chip isn't really
|
||||
connected to anything and hence we don't init it.
|
||||
*/
|
||||
pc_keyboard_init();
|
||||
}
|
||||
|
||||
// mainboard_enable is executed as first thing after
|
||||
|
|
Loading…
Reference in New Issue