mb/lenovo/x200/dock.c: Use common southbridge gpio code

Change-Id: I5b527a23aa0b0038936bb4b77176331fdfd6d914
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36127
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
This commit is contained in:
Arthur Heymans 2019-10-18 14:02:57 +02:00 committed by Nico Huber
parent 4cb888e946
commit bf6b6afa9e
1 changed files with 5 additions and 15 deletions

View File

@ -15,21 +15,14 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#define __SIMPLE_DEVICE__
#include <console/console.h> #include <console/console.h>
#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/device.h> #include <device/device.h>
#include <device/pci.h> #include <southbridge/intel/common/gpio.h>
#include <southbridge/intel/i82801ix/i82801ix.h>
#include <ec/lenovo/h8/h8.h> #include <ec/lenovo/h8/h8.h>
#include <ec/acpi/ec.h> #include <ec/acpi/ec.h>
#include "dock.h" #include "dock.h"
#define LPC_DEV PCI_DEV(0, 0x1f, 0)
void h8_mainboard_init_dock (void) void h8_mainboard_init_dock (void)
{ {
if (dock_present()) { if (dock_present()) {
@ -41,22 +34,19 @@ void h8_mainboard_init_dock (void)
void dock_connect(void) void dock_connect(void)
{ {
u16 gpiobase = pci_read_config16(LPC_DEV, D31F0_GPIO_BASE) & 0xfffc;
ec_set_bit(0x02, 0); ec_set_bit(0x02, 0);
outl(inl(gpiobase + 0x0c) | (1 << 28), gpiobase + 0x0c); set_gpio(28, GPIO_LEVEL_HIGH);
} }
void dock_disconnect(void) void dock_disconnect(void)
{ {
u16 gpiobase = pci_read_config16(LPC_DEV, D31F0_GPIO_BASE) & 0xfffc;
ec_clr_bit(0x02, 0); ec_clr_bit(0x02, 0);
outl(inl(gpiobase + 0x0c) & ~(1 << 28), gpiobase + 0x0c); set_gpio(28, GPIO_LEVEL_LOW);
} }
int dock_present(void) int dock_present(void)
{ {
u16 gpiobase = pci_read_config16(LPC_DEV, D31F0_GPIO_BASE) & 0xfffc; const int dock_id_gpio[] = { 2, 3, 4, -1};
u8 st = inb(gpiobase + 0x0c);
return ((st >> 2) & 7) != 7; return get_gpios(dock_id_gpio) != 7;
} }