Change in coreboot[master]: mb/google/vilboz: update GPIOs, gpio.c is unnecessary

[Peichao Li (Code Review)]

Peichao Li has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/42986 )

Change subject: mb/google/vilboz: update GPIOs, gpio.c is unnecessary
......................................................................

mb/google/vilboz: update GPIOs, gpio.c is unnecessary

Vilboz is completely new design so gpio.c is unnecessary
Delcare:
    --AGPIO6 for EN_PWR_TOUCHPAD
    --EGPIO67 for DMIC_SEL

BUG=b:157744136
BRANCH=NONE
TEST=flash the bios to vilboz DUT and test thest functions

Signed-off-by: peichao.wang 
Change-Id: I575f8b233b56185f3281ad7127bc274bda5ea801
---
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(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/86/42986/1

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;
-}

[Furquan Shaikh (Code Review)]

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42986 )

Change subject: mb/google/vilboz: update GPIOs, gpio.c is unnecessary
......................................................................

Patch Set 1: Code-Review+2

[Furquan Shaikh (Code Review)]

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42986 )

Change subject: mb/google/vilboz: update GPIOs, gpio.c is unnecessary
......................................................................

Patch Set 1:

(1 comment)

Can you

https://review.coreboot.org/c/coreboot/+/42986/1//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/42986/1//COMMIT_MSG@13 
PS1, Line 13: 
Can you please verify that this is correct as well: https://review.coreboot.org/cgit/coreboot.git/tree/src/mainboard/google/zork...

[Aaron Durbin (Code Review)]

Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42986 )

Change subject: mb/google/vilboz: update GPIOs, gpio.c is unnecessary
......................................................................

Patch Set 1: Code-Review+2

[Peichao Li (Code Review)]

Peichao Li has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42986 )

Change subject: mb/google/vilboz: update GPIOs, gpio.c is unnecessary
......................................................................

Patch Set 1:
> Patch Set 1:
>
> (1 comment)
>
> Can you

Dear Furquan, no problem, I will verify it when I get vilboz Proto board. Many thanks!

[Peichao Li (Code Review)]

Peichao Li has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42986 )

Change subject: mb/google/vilboz: update GPIOs, gpio.c is unnecessary
......................................................................

Patch Set 2: Code-Review-1

[Peichao Li (Code Review)]

Peichao Li has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42986 )

Change subject: mb/google/vilboz: update GPIOs, gpio.c is unnecessary
......................................................................

Patch Set 2:

Dear All,

We need enable wifi module since Vilboz hard design follow schematic V3.2, so we need update it.

Change in coreboot[master]: b/google/vilboz: update GPIOs, enable touchpad and wifi module

[Peichao Li (Code Review)]

Hello build bot (Jenkins), Furquan Shaikh, Patrick Georgi, Martin Roth, Aaron Durbin,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/42986

to look at the new patch set (#3).

Change subject: b/google/vilboz: update GPIOs, enable touchpad and wifi module
......................................................................

b/google/vilboz: update GPIOs, enable touchpad and wifi module

Vilboz is completely new design and follow schematic V3.2
Delcare:
    --AGPIO6 for EN_PWR_TOUCHPAD
    --EGPIO67 for DMIC_SEL
    --AGPIO29 for WIFI_AUX_RESET
    --EGPIO42 for EN_PWR_WIFI

BUG=b:157744136 b:160547115
BRANCH=NONE
TEST=flash the bios to vilboz DUT and test touchpad and wifi

Signed-off-by: peichao.wang 
Change-Id: I575f8b233b56185f3281ad7127bc274bda5ea801
---
M src/mainboard/google/zork/variants/vilboz/gpio.c
1 file changed, 26 insertions(+), 23 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/86/42986/3

Change in coreboot[master]: b/google/vilboz: update GPIOs, enable touchpad and wifi module

[Peichao Li (Code Review)]

Peichao Li has removed build bot (Jenkins) from this change.  ( https://review.coreboot.org/c/coreboot/+/42986 )

Change subject: b/google/vilboz: update GPIOs, enable touchpad and wifi module
......................................................................

Removed reviewer build bot (Jenkins).

Change in coreboot[master]: b/google/vilboz: update GPIOs, enable touchpad and wifi module

[Furquan Shaikh (Code Review)]

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42986 )

Change subject: b/google/vilboz: update GPIOs, enable touchpad and wifi module
......................................................................

Patch Set 6:

(1 comment)

https://review.coreboot.org/c/coreboot/+/42986/6/src/mainboard/google/zork/v... 
File src/mainboard/google/zork/variants/vilboz/gpio.c:

PS6: 
This entire file is not required. wifi_power_reset_configure_v3() is already implemented as part of wifi_power_reset_configure_active_high_power() in gpio_baseboard_dalboz.c:
https://review.coreboot.org/cgit/coreboot.git/tree/src/mainboard/google/zork...

You only need to ensure that the following configs are defined correctly for vilboz:
VARIANT_MIN_BOARD_ID_V3_SCHEMATICS
VARIANT_MIN_BOARD_ID_WIFI_POWER_ACTIVE_LOW

What is the board ID used for the current build of Vilboz?

Change in coreboot[master]: b/google/vilboz: update GPIOs, enable touchpad and wifi module

[Peichao Li (Code Review)]

Peichao Li has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42986 )

Change subject: b/google/vilboz: update GPIOs, enable touchpad and wifi module
......................................................................

Patch Set 6:

(1 comment)

https://review.coreboot.org/c/coreboot/+/42986/6/src/mainboard/google/zork/v... 
File src/mainboard/google/zork/variants/vilboz/gpio.c:

PS6:
> This entire file is not required. […]

board version is 1.

Change in coreboot[master]: b/google/vilboz: update GPIOs, enable touchpad and wifi module

[Furquan Shaikh (Code Review)]

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42986 )

Change subject: b/google/vilboz: update GPIOs, enable touchpad and wifi module
......................................................................

Patch Set 6:

(1 comment)

https://review.coreboot.org/c/coreboot/+/42986/6/src/mainboard/google/zork/v... 
File src/mainboard/google/zork/variants/vilboz/gpio.c:

PS6:
> board version is 1.

In that case, VARIANT_MIN_BOARD_ID_V3_SCHEMATICS needs to be set as 1 for Vilboz and VARIANT_MIN_BOARD_ID_WIFI_POWER_ACTIVE_LOW needs to be set as 2 (I think current version of hardware does not have active low wifi power enable).

Basically, something like this should work:
```
diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig
index e24f78a48a5..19225d73024 100644
--- a/src/mainboard/google/zork/Kconfig
+++ b/src/mainboard/google/zork/Kconfig
@@ -142,13 +142,13 @@ config VARIANT_MIN_BOARD_ID_V3_SCHEMATICS
        default 3 if BOARD_GOOGLE_MORPHIUS
        default 2 if BOARD_GOOGLE_BERKNIP
        default 3 if BOARD_GOOGLE_DALBOZ
-       default 2 if BOARD_GOOGLE_VILBOZ
+       default 1 if BOARD_GOOGLE_VILBOZ
        default 256

config VARIANT_MIN_BOARD_ID_WIFI_POWER_ACTIVE_LOW
        int
        default 3 if BOARD_GOOGLE_BERKNIP
-       default 3 if BOARD_GOOGLE_VILBOZ
+       default 2 if BOARD_GOOGLE_VILBOZ
        default VARIANT_MIN_BOARD_ID_V3_SCHEMATICS

endif # BOARD_GOOGLE_BASEBOARD_TREMBYLE || BOARD_GOOGLE_BASEBOARD_DALBOZ
```

Change in coreboot[master]: b/google/vilboz: update GPIOs since Vilboz hardware design follow sch...

[Peichao Li (Code Review)]

Hello build bot (Jenkins), Furquan Shaikh, Patrick Georgi, Martin Roth, Aaron Durbin,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/42986

to look at the new patch set (#7).

Change subject: b/google/vilboz: update GPIOs since Vilboz hardware design follow schematic V3.2 so gpio.c is unnecessary.
......................................................................

b/google/vilboz: update GPIOs since Vilboz hardware design
follow schematic V3.2 so gpio.c is unnecessary.

Delcare:
    --AGPIO6 for EN_PWR_TOUCHPAD
    --EGPIO67 for DMIC_SEL

BUG=b:157744136
BRANCH=NONE
TEST=flash the bios to vilboz DUT and test touchpad function

Signed-off-by: peichao.wang 
Change-Id: I575f8b233b56185f3281ad7127bc274bda5ea801
---
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(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/86/42986/7

Change in coreboot[master]: b/google/vilboz: update GPIOs since Vilboz hardware design follow sch...

[Furquan Shaikh (Code Review)]

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42986 )

Change subject: b/google/vilboz: update GPIOs since Vilboz hardware design follow schematic V3.2 so gpio.c is unnecessary.
......................................................................

Patch Set 8:

Can you please rebase this change on top of https://review.coreboot.org/c/coreboot/+/43161?

Change in coreboot[master]: b/google/vilboz: update GPIOs since Vilboz hardware design follow sch...

[Peichao Li (Code Review)]

Peichao Li has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42986 )

Change subject: b/google/vilboz: update GPIOs since Vilboz hardware design follow schematic V3.2 so gpio.c is unnecessary.
......................................................................

Patch Set 9:
> Patch Set 8:
>
> Can you please rebase this change on top of https://review.coreboot.org/c/coreboot/+/43161?

Done

Change in coreboot[master]: b/google/vilboz: update GPIOs since Vilboz hardware design follow sch...

[Furquan Shaikh (Code Review)]

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42986 )

Change subject: b/google/vilboz: update GPIOs since Vilboz hardware design follow schematic V3.2 so gpio.c is unnecessary.
......................................................................

Patch Set 9: Code-Review+2

(3 comments)

https://review.coreboot.org/c/coreboot/+/42986/8//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/42986/8//COMMIT_MSG@7 
PS8, Line 7: b
mb

https://review.coreboot.org/c/coreboot/+/42986/8//COMMIT_MSG@7 
PS8, Line 7: update GPIOs since Vilboz hardware design
           : follow schematic V3.2 so gpio.c is unnecessary.
Drop gpio.c from variants/vilboz and this explanation can be moved down to the body of the commit message.

https://review.coreboot.org/c/coreboot/+/42986/8//COMMIT_MSG@10 
PS8, Line 10: Delcare
Declare?

Change in coreboot[master]: mb/google/vilboz: Drop gpio.c from variants/vilboz

[Peichao Li (Code Review)]

Hello build bot (Jenkins), Furquan Shaikh, Patrick Georgi, Martin Roth, Aaron Durbin,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/42986

to look at the new patch set (#10).

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 
Change-Id: I575f8b233b56185f3281ad7127bc274bda5ea801
---
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(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/86/42986/10

Change in coreboot[master]: mb/google/vilboz: Drop gpio.c from variants/vilboz

[Peichao Li (Code Review)]

Peichao Li has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42986 )

Change subject: mb/google/vilboz: Drop gpio.c from variants/vilboz
......................................................................

Patch Set 10:

(3 comments)

https://review.coreboot.org/c/coreboot/+/42986/8//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/42986/8//COMMIT_MSG@7 
PS8, Line 7: b
> mb

Done

https://review.coreboot.org/c/coreboot/+/42986/8//COMMIT_MSG@7 
PS8, Line 7: update GPIOs since Vilboz hardware design
           : follow schematic V3.2 so gpio.c is unnecessary.
> Drop gpio. […]

Done

https://review.coreboot.org/c/coreboot/+/42986/8//COMMIT_MSG@10 
PS8, Line 10: Delcare
> Declare?

Done

Change in coreboot[master]: mb/google/vilboz: Drop gpio.c from variants/vilboz

[Peichao Li (Code Review)]

Peichao Li has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42986 )

Change subject: mb/google/vilboz: Drop gpio.c from variants/vilboz
......................................................................

Patch Set 10:

(2 comments)

https://review.coreboot.org/c/coreboot/+/42986/1//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/42986/1//COMMIT_MSG@13 
PS1, Line 13:
> Can you please verify that this is correct as well: https://review.coreboot.org/cgit/coreboot. […]

Done

https://review.coreboot.org/c/coreboot/+/42986/6/src/mainboard/google/zork/v... 
File src/mainboard/google/zork/variants/vilboz/gpio.c:

PS6:
> In that case, VARIANT_MIN_BOARD_ID_V3_SCHEMATICS needs to be set as 1 for Vilboz and VARIANT_MIN_BOA […]

Done

Change in coreboot[master]: mb/google/vilboz: Drop gpio.c from variants/vilboz

[Kangheui Won (Code Review)]

Kangheui Won has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42986 )

Change subject: mb/google/vilboz: Drop gpio.c from variants/vilboz
......................................................................

Patch Set 11: Code-Review+1

Change in coreboot[master]: mb/google/vilboz: Drop gpio.c from variants/vilboz

[Furquan Shaikh (Code Review)]

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 
Change-Id: I575f8b233b56185f3281ad7127bc274bda5ea801
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42986
Reviewed-by: Kangheui Won 
Reviewed-by: Furquan Shaikh 
Tested-by: build bot (Jenkins) 
---
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;
-}