Timothy Pearson (tpearson@raptorengineering.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14960
-gerrit
commit d7be0164ab55f773b5e13dc1dd774d131599da23 Author: Timothy Pearson tpearson@raptorengineering.com Date: Tue May 24 15:48:50 2016 -0500
sio/winbond/common: Add function to configure pin mux
Certain mainboards require SuperIO pinmux configuration before peripherals will become operational. Allow each mainboard to configure the pinmux(es) of Winbond chips if needed.
Change-Id: Ice19f8d8514b66b15920a5b893700d636ed75cec Signed-off-by: Timothy Pearson tpearson@raptorengineering.com --- src/superio/winbond/common/early_serial.c | 13 +++++++++++++ src/superio/winbond/common/winbond.h | 9 ++++++++- 2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/src/superio/winbond/common/early_serial.c b/src/superio/winbond/common/early_serial.c index 6482a94..ee31ae5 100644 --- a/src/superio/winbond/common/early_serial.c +++ b/src/superio/winbond/common/early_serial.c @@ -66,3 +66,16 @@ void winbond_enable_serial(pnp_devfn_t dev, u16 iobase) pnp_set_enable(dev, 1); pnp_exit_conf_state(dev); } + +void winbond_set_pinmux(pnp_devfn_t dev, uint16_t iobase, uint8_t offset, uint8_t mask, uint8_t state) +{ + uint8_t byte; + + /* Configure pin mux */ + pnp_enter_conf_state(dev); + byte = pnp_read_config(dev, offset); + byte &= ~mask; + byte |= state; + pnp_write_config(dev, offset, byte); + pnp_exit_conf_state(dev); +} diff --git a/src/superio/winbond/common/winbond.h b/src/superio/winbond/common/winbond.h index 1f7e7b1..48dd120 100644 --- a/src/superio/winbond/common/winbond.h +++ b/src/superio/winbond/common/winbond.h @@ -20,7 +20,14 @@ #include <arch/io.h> #include <stdint.h>
-void winbond_enable_serial(pnp_devfn_t dev, u16 iobase); +#define W83667HG_SPI_PINMUX_OFFSET 0x2a + +#define W83667HG_SPI_PINMUX_GPIO4_SERIAL_B_MASK (1 << 2) +#define W83667HG_SPI_PINMUX_GPIO4 (0 << 2) +#define W83667HG_SPI_PINMUX_SERIAL_B (1 << 2) + +void winbond_enable_serial(pnp_devfn_t dev, uint16_t iobase); +void winbond_set_pinmux(pnp_devfn_t dev, uint8_t offset, uint8_t mask, uint8_t state);
void pnp_enter_conf_state(pnp_devfn_t dev); void pnp_exit_conf_state(pnp_devfn_t dev);
-
Timothy Pearson