diff options
| author | Nick Vaccaro <nvaccaro@google.com> | 2017-10-05 14:06:53 -0700 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2017-10-06 18:11:24 +0000 |
| commit | 687b023d970327e2d4994e5fb170edf9a1e7180f (patch) | |
| tree | 4eebd9439b6b80be2c454d71e93baf53ee1029bc /src/mainboard/google/zoombini/variants/baseboard | |
| parent | c6a005019874fed9a9f663953a850b76a5fbf96c (diff) | |
google/zoombini: adapt to schematic changes
Adapt code to latest schematic changes, revision 1.1.
Configure GPD2 for EC_PCH_WAKE_ODL,
GPP_D5 for EC_I2C_SENSOR_SDA,
GPP_D6 for EC_I2C_SENSOR_SCL,
GPP_D7 for WWAN_SAR_INT_ODL,
GPP_D9 for touchscreen power enable,
GPP_D10 for wifi power enable,
GPP_D11 for wwan power enable,
GPP_D13 change to "No Connect" (was VOL_UP_ODL),
GPP_D14 change to "No Connect" (was VOL_DOWN_ODL).
BUG=b:66265441
BRANCH=None
TEST=None
Change-Id: Ic9e76ed3e958c1f96deb6356d6480c6ba7cfe699
Signed-off-by: Nick Vaccaro <nvaccaro@google.com>
Reviewed-on: https://review.coreboot.org/21900
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/mainboard/google/zoombini/variants/baseboard')
| -rw-r--r-- | src/mainboard/google/zoombini/variants/baseboard/gpio.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/mainboard/google/zoombini/variants/baseboard/gpio.c b/src/mainboard/google/zoombini/variants/baseboard/gpio.c index 03365b9dcc..1626c38403 100644 --- a/src/mainboard/google/zoombini/variants/baseboard/gpio.c +++ b/src/mainboard/google/zoombini/variants/baseboard/gpio.c @@ -107,16 +107,19 @@ static const struct pad_config gpio_table[] = { /* SPI1_MISO */ PAD_NC(GPP_D2, NONE), /* SPI1_MOSI */ PAD_CFG_GPI(GPP_D3, NONE, DEEP), /* PCH_MEM_STRAP0 */ /* FASHTRIG */ -/* ISH_I2C0_SDA */ PAD_NC(GPP_D5, NONE), /* TP57 */ -/* ISH_I2C0_SCL */ PAD_NC(GPP_D6, NONE), /* TP58 */ -/* ISH_I2C1_SDA */ PAD_NC(GPP_D7, NONE), /* TP59 */ +/* ISH_I2C0_SDA */ PAD_CFG_NF(GPP_D5, NONE, DEEP, NF1), + /* EC_I2C_SENSOR_SDA */ +/* ISH_I2C0_SCL */ PAD_CFG_NF(GPP_D6, NONE, DEEP, NF1), + /* EC_I2C_SENSOR_SCL */ +/* ISH_I2C1_SDA */ PAD_CFG_GPI(GPP_D7, NONE, DEEP), /* WWAN_SAR_INT_ODL */ /* ISH_I2C1_SCL */ PAD_NC(GPP_D8, NONE), -/* ISH_SPI_CS# */ PAD_NC(GPP_D9, NONE), -/* ISH_SPI_CLK */ PAD_NC(GPP_D10, NONE), -/* ISH_SPI_MISO */ PAD_NC(GPP_D11, NONE), +/* ISH_SPI_CS# */ PAD_CFG_GPO(GPP_D9, 0, DEEP), + /* EN_PP3300_TOUCHSCREEN */ +/* ISH_SPI_CLK */ PAD_CFG_GPO(GPP_D10, 0, DEEP), /* EN_PP3300_WLAN */ +/* ISH_SPI_MISO */ PAD_CFG_GPO(GPP_D11, 0, DEEP), /* EN_PP3300_WWAN */ /* ISH_SPI_MOSI */ PAD_CFG_GPI(GPP_D12, NONE, DEEP), /* GPP_D12_STRAP */ -/* ISH_UART0_RXD */ PAD_CFG_GPI(GPP_D13, UP_20K, DEEP), /* VOL_UP_ODL */ -/* ISH_UART0_TXD */ PAD_CFG_GPI(GPP_D14, UP_20K, DEEP), /* VOL_DOWN_ODL */ +/* ISH_UART0_RXD */ PAD_NC(GPP_D13, NONE), /* ISH_UART_RX */ +/* ISH_UART0_TXD */ PAD_NC(GPP_D14, NONE), /* ISH_UART_TX */ /* ISH_UART0_RTS# */ PAD_CFG_GPO(GPP_D15, 0, DEEP), /* TOUCHSCREEN_RST_ODL */ /* ISH_UART0_CTS# */ PAD_CFG_GPO(GPP_D16, 0, DEEP), /* SPK_PA_EN */ @@ -216,7 +219,7 @@ static const struct pad_config gpio_table[] = { /* BATLOW# */ /* ACPRESENT */ PAD_NC(GPD1, NONE), -/* LAN_WAKE# */ PAD_NC(GPD2, NONE), /* LAN_WAKE_L - TP71 */ +/* LAN_WAKE# */ PAD_CFG_NF(GPD2, NONE, DEEP, NF1), /* EC_PCH_WAKE_ODL */ /* PWRBTN# */ /* SLP_S3# */ /* SLP_S4# */ |