Patch set updated for coreboot: 87884bb make GPIOs and misc configurable via devicetree

[Florian Zumbiehl]

Florian Zumbiehl just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/387

-gerrit

commit 87884bb73ee2f3a1928db84e57abb44ce23dc55a
Author: Florian Zumbiehl 
Date:   Tue Nov 1 20:19:37 2011 +0100

make GPIOs and misc configurable via devicetree

Change-Id: I9f70da76b5ea451f28a1ad9252c5d879fc4fe315
    Signed-off-by: Florian Zumbiehl 
---
 src/southbridge/via/vt8237r/chip.h |    5 +++++
 src/southbridge/via/vt8237r/lpc.c  |   30 +++++++++++++++++++++++++++---
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/southbridge/via/vt8237r/chip.h b/src/southbridge/via/vt8237r/chip.h
index be5e7fc..64b8e8e 100644
--- a/src/southbridge/via/vt8237r/chip.h
+++ b/src/southbridge/via/vt8237r/chip.h
@@ -71,6 +71,11 @@ struct southbridge_via_vt8237r_config {
    u8 usb2_dpll_delay;

u8 no_int_efgh;
+	u8 enable_gpo3;
+	u8 disable_gpo26_gpo27;
+	u8 enable_aol_2_smb_slave;
+	u8 enable_gpo5;
+	u8 gpio15_12_dir_output;
 };

#endif /* SOUTHBRIDGE_VIA_VT8237R_CHIP_H */
diff --git a/src/southbridge/via/vt8237r/lpc.c b/src/southbridge/via/vt8237r/lpc.c
index d4f7820..7d7326c 100644
--- a/src/southbridge/via/vt8237r/lpc.c
+++ b/src/southbridge/via/vt8237r/lpc.c
@@ -159,6 +159,10 @@ static void pci_routing_fixup(struct device *dev)
 static void setup_pm(device_t dev)
 {
    u16 tmp;
+	struct southbridge_via_vt8237r_config *cfg;
+
+	cfg = dev->chip_info;
+
    /* Debounce LID and PWRBTN# Inputs for 16ms. */
    pci_write_config8(dev, 0x80, 0x20);

@@ -187,7 +191,10 @@ static void setup_pm(device_t dev)
     * 5 = Internal PLL reset from susp disabled
     * 2 = GPO2 is SUSA#
     */
-	pci_write_config8(dev, 0x94, 0xa0);
+	tmp = 0xa0;
+	if (cfg && cfg->enable_gpo3)
+		tmp |= 0x10;
+	pci_write_config8(dev, 0x94, tmp);

/*
     * 7 = stp to sust delay 1msec
@@ -203,7 +210,14 @@ static void setup_pm(device_t dev)
 #if CONFIG_EPIA_VT8237R_INIT
    pci_write_config8(dev, 0x95, 0xc2);
 #else
-	pci_write_config8(dev, 0x95, 0xcc);
+	tmp = 0xcc;
+	if (cfg) {
+		if (cfg->disable_gpo26_gpo27)
+			tmp &= ~0x08;
+		if (cfg->enable_aol_2_smb_slave)
+			tmp &= ~0x04;
+	}
+	pci_write_config8(dev, 0x95, tmp);
 #endif

/* Disable GP3 timer. */
@@ -255,6 +269,9 @@ static void setup_pm(device_t dev)
 static void vt8237r_init(struct device *dev)
 {
    u8 enables;
+	struct southbridge_via_vt8237r_config *cfg;
+
+	cfg = dev->chip_info;

#if CONFIG_EPIA_VT8237R_INIT
    printk(BIOS_SPEW, "Entering vt8237r_init, for EPIA.\n");
@@ -290,8 +307,15 @@ static void vt8237r_init(struct device *dev)
     */
    pci_write_config8(dev, 0xe5, 0x09);

+	enables = 0x4;
+	if (cfg) {
+		if (cfg->enable_gpo5)
+			enables |= 0x01;
+		if (cfg->gpio15_12_dir_output)
+			enables |= 0x10;
+	}
    /* REQ5 as PCI request input - should be together with INTE-INTH. */
-	pci_write_config8(dev, 0xe4, 0x4);
+	pci_write_config8(dev, 0xe4, enables);
 #endif

/* Set bit 3 of 0x4f (use INIT# as CPU reset). */