[coreboot-gerrit] Patch set updated for coreboot: sb/intel/common/gpio: Support ICH9M and prior

[Patrick Rudolph (siro@das-labor.org)]

Patrick Rudolph (siro at das-labor.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18012

-gerrit

commit 1a942f182fa2e6c5eb6e04979ab4b3b45fd2268c
Author: Patrick Rudolph <siro at das-labor.org>
Date:   Mon Jan 2 18:41:37 2017 +0100

    sb/intel/common/gpio: Support ICH9M and prior
    
    Reorder the commands executed to support ICH9M and prior where
    GPIO level and direction are only set on pins configured as GPIO.
    Required to set correct GPIO layout on T500.
    
    Tested on T500.
    
    Change-Id: I691e672c7cb52ca51a80fd29657ada7488db0d41
    Signed-off-by: Patrick Rudolph <siro at das-labor.org>
---
 src/southbridge/intel/common/gpio.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/southbridge/intel/common/gpio.c b/src/southbridge/intel/common/gpio.c
index aadd519..d861383 100644
--- a/src/southbridge/intel/common/gpio.c
+++ b/src/southbridge/intel/common/gpio.c
@@ -37,6 +37,13 @@ void setup_pch_gpios(const struct pch_gpio_map *gpio)
 {
 	u16 gpiobase = get_gpio_base();
 
+	/* The order of these calls does matter on ICH9M and prior.
+	 * The level has to be set on pins configured as gpio,
+	 * but on newer platforms we want to change the level first
+	 * to make sure there are no glitches on the lines !
+	 * Write the gpio level twice to satisfy both requirements.
+	 */
+
 	/* GPIO Set 1 */
 	if (gpio->set1.level)
 		outl(*((u32 *)gpio->set1.level), gpiobase + GP_LVL);
@@ -44,6 +51,8 @@ void setup_pch_gpios(const struct pch_gpio_map *gpio)
 		outl(*((u32 *)gpio->set1.mode), gpiobase + GPIO_USE_SEL);
 	if (gpio->set1.direction)
 		outl(*((u32 *)gpio->set1.direction), gpiobase + GP_IO_SEL);
+	if (gpio->set1.level)
+		outl(*((u32 *)gpio->set1.level), gpiobase + GP_LVL);
 	if (gpio->set1.reset)
 		outl(*((u32 *)gpio->set1.reset), gpiobase + GP_RST_SEL1);
 	if (gpio->set1.invert)
@@ -58,6 +67,8 @@ void setup_pch_gpios(const struct pch_gpio_map *gpio)
 		outl(*((u32 *)gpio->set2.mode), gpiobase + GPIO_USE_SEL2);
 	if (gpio->set2.direction)
 		outl(*((u32 *)gpio->set2.direction), gpiobase + GP_IO_SEL2);
+	if (gpio->set2.level)
+		outl(*((u32 *)gpio->set2.level), gpiobase + GP_LVL2);
 	if (gpio->set2.reset)
 		outl(*((u32 *)gpio->set2.reset), gpiobase + GP_RST_SEL2);
 
@@ -68,6 +79,8 @@ void setup_pch_gpios(const struct pch_gpio_map *gpio)
 		outl(*((u32 *)gpio->set3.mode), gpiobase + GPIO_USE_SEL3);
 	if (gpio->set3.direction)
 		outl(*((u32 *)gpio->set3.direction), gpiobase + GP_IO_SEL3);
+	if (gpio->set3.level)
+		outl(*((u32 *)gpio->set3.level), gpiobase + GP_LVL3);
 	if (gpio->set3.reset)
 		outl(*((u32 *)gpio->set3.reset), gpiobase + GP_RST_SEL3);
 }