Furquan Shaikh has submitted this change. ( https://review.coreboot.org/c/coreboot/+/42986 )
Change subject: mb/google/vilboz: Drop gpio.c from variants/vilboz ......................................................................
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 --- M src/mainboard/google/zork/variants/vilboz/Makefile.inc D src/mainboard/google/zork/variants/vilboz/gpio.c 2 files changed, 0 insertions(+), 38 deletions(-)
Approvals: build bot (Jenkins): Verified Furquan Shaikh: Looks good to me, approved Kangheui Won: Looks good to me, but someone else must approve
diff --git a/src/mainboard/google/zork/variants/vilboz/Makefile.inc b/src/mainboard/google/zork/variants/vilboz/Makefile.inc index af38c88..dc1e411 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 44d3f89..0000000 --- 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; -}