diff options
| author | Peichao Wang <peichao.wang@bitland.corp-partner.google.com> | 2020-07-07 11:56:57 +0800 |
|---|---|---|
| committer | Furquan Shaikh <furquan@google.com> | 2020-07-07 17:26:19 +0000 |
| commit | c130687e1e177adcd4b58e5050328ebd577eff28 (patch) | |
| tree | ce80553380eb9e18fb6ff797e58bd158f0332d0c /src/mainboard/google/zork | |
| parent | 1114b208a0966a4133c00fd071e727f1defc8e47 (diff) | |
mb/google/vilboz: Drop gpio.c from variants/vilboz
Update GPIOs since Vilboz hardware design
follow schematic V3.2, so gpio.c is unnecessary.
BUG=b:157744136
BRANCH=NONE
TEST=flash the bios to vilboz DUT and test touchpad function
Signed-off-by: peichao.wang <peichao.wang@bitland.corp-partner.google.com>
Change-Id: I575f8b233b56185f3281ad7127bc274bda5ea801
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42986
Reviewed-by: Kangheui Won <khwon@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard/google/zork')
| -rw-r--r-- | src/mainboard/google/zork/variants/vilboz/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/mainboard/google/zork/variants/vilboz/gpio.c | 37 |
2 files changed, 0 insertions, 38 deletions
diff --git a/src/mainboard/google/zork/variants/vilboz/Makefile.inc b/src/mainboard/google/zork/variants/vilboz/Makefile.inc index af38c8828d..dc1e4117f9 100644 --- a/src/mainboard/google/zork/variants/vilboz/Makefile.inc +++ b/src/mainboard/google/zork/variants/vilboz/Makefile.inc @@ -3,4 +3,3 @@ subdirs-y += ./spd ramstage-y += variant.c -ramstage-y += gpio.c diff --git a/src/mainboard/google/zork/variants/vilboz/gpio.c b/src/mainboard/google/zork/variants/vilboz/gpio.c deleted file mode 100644 index 44d3f89059..0000000000 --- a/src/mainboard/google/zork/variants/vilboz/gpio.c +++ /dev/null @@ -1,37 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include <baseboard/gpio.h> -#include <baseboard/variants.h> -#include <boardid.h> -#include <gpio.h> -#include <soc/gpio.h> -#include <ec/google/chromeec/ec.h> - -/* This table is used by dalboz variant with board version < 2. */ -static const struct soc_amd_gpio bid_1_gpio_set_stage_ram[] = { - /* DMIC_SEL */ - PAD_GPO(GPIO_6, LOW), // Select Camera 1 DMIC - /* EN_PWR_TOUCHPAD_PS2 */ - PAD_GPO(GPIO_67, HIGH), -}; - -const struct soc_amd_gpio *variant_override_gpio_table(size_t *size) -{ - uint32_t board_version; - - /* - * If board version cannot be read, assume that this is an older revision of the board - * and so apply overrides. If board version is provided by the EC, then apply overrides - * if version < 2. - */ - if (google_chromeec_cbi_get_board_version(&board_version)) - board_version = 1; - - if (board_version < 2) { - *size = ARRAY_SIZE(bid_1_gpio_set_stage_ram); - return bid_1_gpio_set_stage_ram; - } - - *size = 0; - return NULL; -} |