Change in coreboot[master]: mb/lenovo/x200/dock.c: Use common southbridge gpio code

[Arthur Heymans (Code Review)]

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36127 )

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

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

Change-Id: I5b527a23aa0b0038936bb4b77176331fdfd6d914
Signed-off-by: Arthur Heymans 
---
M src/mainboard/lenovo/x200/dock.c
1 file changed, 5 insertions(+), 14 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/27/36127/1

diff --git a/src/mainboard/lenovo/x200/dock.c b/src/mainboard/lenovo/x200/dock.c
index d5f774b..abdea5d 100644
--- a/src/mainboard/lenovo/x200/dock.c
+++ b/src/mainboard/lenovo/x200/dock.c
@@ -15,21 +15,15 @@
  * GNU General Public License for more details.
  */

-#define __SIMPLE_DEVICE__
-
 #include <console/console.h>
-#include <arch/io.h>
-#include <device/pci_ops.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/acpi/ec.h>

#include "dock.h"

-#define LPC_DEV PCI_DEV(0, 0x1f, 0)
-
 void h8_mainboard_init_dock (void)
 {
    if (dock_present()) {
@@ -41,22 +35,19 @@

void dock_connect(void)
 {
-	u16 gpiobase = pci_read_config16(LPC_DEV, D31F0_GPIO_BASE) & 0xfffc;
    ec_set_bit(0x02, 0);
-	outl(inl(gpiobase + 0x0c) | (1 << 28), gpiobase + 0x0c);
+	set_gpio(28, GPIO_LEVEL_HIGH);
 }

void dock_disconnect(void)
 {
-	u16 gpiobase = pci_read_config16(LPC_DEV, D31F0_GPIO_BASE) & 0xfffc;
    ec_clr_bit(0x02, 0);
-	outl(inl(gpiobase + 0x0c) & ~(1 << 28), gpiobase + 0x0c);
+	set_gpio(28, GPIO_LEVEL_LOW);
 }

int dock_present(void)
 {
-	u16 gpiobase = pci_read_config16(LPC_DEV, D31F0_GPIO_BASE) & 0xfffc;
-	u8 st = inb(gpiobase + 0x0c);
+	const int dock_id_gpio[] = { 2, 3, 4, -1};

-	return ((st >> 2) & 7) != 7;
+	return get_gpios(dock_id_gpio) != 7;
 }

[Arthur Heymans (Code Review)]

Hello Alexander Couzens, Patrick Rudolph, build bot (Jenkins),

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/36127

to look at the new patch set (#2).

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

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

Change-Id: I5b527a23aa0b0038936bb4b77176331fdfd6d914
Signed-off-by: Arthur Heymans 
---
M src/mainboard/lenovo/x200/dock.c
1 file changed, 5 insertions(+), 15 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/27/36127/2

[Patrick Rudolph (Code Review)]

Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36127 )

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

Patch Set 2: Code-Review+2

[Nico Huber (Code Review)]

Nico Huber has submitted this change. ( https://review.coreboot.org/c/coreboot/+/36127 )

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

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

Change-Id: I5b527a23aa0b0038936bb4b77176331fdfd6d914
Signed-off-by: Arthur Heymans 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36127
Tested-by: build bot (Jenkins) 
Reviewed-by: Patrick Rudolph 
---
M src/mainboard/lenovo/x200/dock.c
1 file changed, 5 insertions(+), 15 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Patrick Rudolph: Looks good to me, approved

diff --git a/src/mainboard/lenovo/x200/dock.c b/src/mainboard/lenovo/x200/dock.c
index d5f774b..233b134 100644
--- a/src/mainboard/lenovo/x200/dock.c
+++ b/src/mainboard/lenovo/x200/dock.c
@@ -15,21 +15,14 @@
  * GNU General Public License for more details.
  */

-#define __SIMPLE_DEVICE__
-
 #include <console/console.h>
-#include <arch/io.h>
-#include <device/pci_ops.h>
 #include <device/device.h>
-#include <device/pci.h>
-#include <southbridge/intel/i82801ix/i82801ix.h>
+#include <southbridge/intel/common/gpio.h>
 #include <ec/lenovo/h8/h8.h>
 #include <ec/acpi/ec.h>

#include "dock.h"

-#define LPC_DEV PCI_DEV(0, 0x1f, 0)
-
 void h8_mainboard_init_dock (void)
 {
    if (dock_present()) {
@@ -41,22 +34,19 @@

void dock_connect(void)
 {
-	u16 gpiobase = pci_read_config16(LPC_DEV, D31F0_GPIO_BASE) & 0xfffc;
    ec_set_bit(0x02, 0);
-	outl(inl(gpiobase + 0x0c) | (1 << 28), gpiobase + 0x0c);
+	set_gpio(28, GPIO_LEVEL_HIGH);
 }

void dock_disconnect(void)
 {
-	u16 gpiobase = pci_read_config16(LPC_DEV, D31F0_GPIO_BASE) & 0xfffc;
    ec_clr_bit(0x02, 0);
-	outl(inl(gpiobase + 0x0c) & ~(1 << 28), gpiobase + 0x0c);
+	set_gpio(28, GPIO_LEVEL_LOW);
 }

int dock_present(void)
 {
-	u16 gpiobase = pci_read_config16(LPC_DEV, D31F0_GPIO_BASE) & 0xfffc;
-	u8 st = inb(gpiobase + 0x0c);
+	const int dock_id_gpio[] = { 2, 3, 4, -1};

-	return ((st >> 2) & 7) != 7;
+	return get_gpios(dock_id_gpio) != 7;
 }