Change in coreboot[master]: mb/google/hatch/var/kindred: Config GPIOs for eMMC SKUs

[David Wu (Code Review)]

David Wu has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/34795 )

Change subject: mb/google/hatch/var/kindred: Config GPIOs for eMMC SKUs
......................................................................

mb/google/hatch/var/kindred: Config GPIOs for eMMC SKUs

Config GPIOs for eMMC SKUs

BUG=b:132918661
TEST=Verify SSD is disabled when SKU ID = 2/4/21/22

Change-Id: I9f678a40555dbc841487811cc1f680b211a51a89
Signed-off-by: David Wu 
---
M src/mainboard/google/hatch/variants/kindred/gpio.c
1 file changed, 22 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/95/34795/1

diff --git a/src/mainboard/google/hatch/variants/kindred/gpio.c b/src/mainboard/google/hatch/variants/kindred/gpio.c
index 86db690..ad0dda1 100644
--- a/src/mainboard/google/hatch/variants/kindred/gpio.c
+++ b/src/mainboard/google/hatch/variants/kindred/gpio.c
@@ -81,6 +81,16 @@
    PAD_NC(GPP_F22, NONE),
 };

+/* Config GPIOs for eMMC SKUs */
+static const struct pad_config emmc_sku_gpio_table[] = {
+	/* E1  : M2_SSD_PEDET */
+	PAD_NC(GPP_E1, NONE),
+	/* E4  : M2_SSD_PE_WAKE_ODL */
+	PAD_NC(GPP_E4, NONE),
+	/* E5  : SATA_DEVSLP1 */
+	PAD_NC(GPP_E5, NONE),
+};
+
 static const struct pad_config default_sku_gpio_table[] = {
    /* F11 : EMMC_CMD ==> EMMC_CMD */
    PAD_CFG_NF(GPP_F11, NONE, DEEP, NF1),
@@ -118,13 +128,25 @@
    	board_gpio_tables = ssd_sku_gpio_table;
    	break;
    case 2:
+		*num = ARRAY_SIZE(emmc_sku_gpio_table);
+		board_gpio_tables = emmc_sku_gpio_table;
+		break;
    case 3:
    	*num = ARRAY_SIZE(ssd_sku_gpio_table);
    	board_gpio_tables = ssd_sku_gpio_table;
    	break;
    case 4:
+		*num = ARRAY_SIZE(emmc_sku_gpio_table);
+		board_gpio_tables = emmc_sku_gpio_table;
+		break;
    case 21:
+		*num = ARRAY_SIZE(emmc_sku_gpio_table);
+		board_gpio_tables = emmc_sku_gpio_table;
+		break;
    case 22:
+		*num = ARRAY_SIZE(emmc_sku_gpio_table);
+		board_gpio_tables = emmc_sku_gpio_table;
+		break;
    case 23:
    	*num = ARRAY_SIZE(ssd_sku_gpio_table);
    	board_gpio_tables = ssd_sku_gpio_table;

[David Wu (Code Review)]

Hello build bot (Jenkins),

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

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

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

Change subject: mb/google/hatch/var/kindred: Config GPIOs for eMMC SKUs
......................................................................

mb/google/hatch/var/kindred: Config GPIOs for eMMC SKUs

Config GPIOs for eMMC SKUs

BUG=b:132918661
TEST=Verify SSD is disabled when SKU ID = 2/4/21/22

Change-Id: I9f678a40555dbc841487811cc1f680b211a51a89
Signed-off-by: David Wu 
---
M src/mainboard/google/hatch/variants/kindred/gpio.c
1 file changed, 46 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/95/34795/2

[Paul Menzel (Code Review)]

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34795 )

Change subject: mb/google/hatch/var/kindred: Config GPIOs for eMMC SKUs
......................................................................

Patch Set 2: Code-Review+1

(1 comment)

https://review.coreboot.org/c/coreboot/+/34795/2//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/34795/2//COMMIT_MSG@7 
PS2, Line 7: Config
Configure

Change in coreboot[master]: mb/google/hatch/var/kindred: Configure GPIOs for eMMC SKUs

[David Wu (Code Review)]

Hello Paul Menzel, build bot (Jenkins),

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

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

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

Change subject: mb/google/hatch/var/kindred: Configure GPIOs for eMMC SKUs
......................................................................

mb/google/hatch/var/kindred: Configure GPIOs for eMMC SKUs

Configure GPIOs for eMMC SKUs

BUG=b:132918661
TEST=Verify SSD is disabled when SKU ID = 2/4/21/22

Change-Id: I9f678a40555dbc841487811cc1f680b211a51a89
Signed-off-by: David Wu 
---
M src/mainboard/google/hatch/variants/kindred/gpio.c
1 file changed, 46 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/95/34795/3

Change in coreboot[master]: mb/google/hatch/var/kindred: Configure GPIOs for eMMC SKUs

[build bot (Jenkins) (Code Review)]

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34795 )

Change subject: mb/google/hatch/var/kindred: Configure GPIOs for eMMC SKUs
......................................................................

Patch Set 3:

(1 comment)

https://review.coreboot.org/c/coreboot/+/34795/3/src/mainboard/google/hatch/... 
File src/mainboard/google/hatch/variants/kindred/gpio.c:

https://review.coreboot.org/c/coreboot/+/34795/3/src/mainboard/google/hatch/... 
PS3, Line 141: 	if (sku_id == 2 || sku_id == 4 || sku_id == 21 || sku_id == 23) {
suspect code indent for conditional statements (8, 8)

Change in coreboot[master]: mb/google/hatch/var/kindred: Configure GPIOs for eMMC SKUs

[David Wu (Code Review)]

Hello Paul Fagerburg, Tim Wawrzynczak, Paul Menzel, build bot (Jenkins), Furquan Shaikh,

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

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

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

Change subject: mb/google/hatch/var/kindred: Configure GPIOs for eMMC SKUs
......................................................................

mb/google/hatch/var/kindred: Configure GPIOs for eMMC SKUs

Configure GPIOs for eMMC SKUs

BUG=b:132918661
TEST=Verify SSD is disabled when SKU ID = 2/4/21/22

Change-Id: I9f678a40555dbc841487811cc1f680b211a51a89
Signed-off-by: David Wu 
---
M src/mainboard/google/hatch/variants/kindred/gpio.c
1 file changed, 46 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/95/34795/4

Change in coreboot[master]: mb/google/hatch/var/kindred: Configure GPIOs for eMMC SKUs

[build bot (Jenkins) (Code Review)]

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34795 )

Change subject: mb/google/hatch/var/kindred: Configure GPIOs for eMMC SKUs
......................................................................

Patch Set 4:

(1 comment)

https://review.coreboot.org/c/coreboot/+/34795/4/src/mainboard/google/hatch/... 
File src/mainboard/google/hatch/variants/kindred/gpio.c:

https://review.coreboot.org/c/coreboot/+/34795/4/src/mainboard/google/hatch/... 
PS4, Line 141: 	if (sku_id == 2 || sku_id == 4 || sku_id == 21 || sku_id == 22) {
suspect code indent for conditional statements (8, 8)

Change in coreboot[master]: mb/google/hatch/var/kindred: Configure GPIOs for eMMC SKUs

[David Wu (Code Review)]

Hello Paul Fagerburg, Tim Wawrzynczak, Paul Menzel, build bot (Jenkins), Furquan Shaikh,

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

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

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

Change subject: mb/google/hatch/var/kindred: Configure GPIOs for eMMC SKUs
......................................................................

mb/google/hatch/var/kindred: Configure GPIOs for eMMC SKUs

Configure GPIOs for eMMC SKUs

BUG=b:132918661
TEST=Verify SSD is disabled when SKU ID = 2/4/21/22

Change-Id: I9f678a40555dbc841487811cc1f680b211a51a89
Signed-off-by: David Wu 
---
M src/mainboard/google/hatch/variants/kindred/gpio.c
1 file changed, 46 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/95/34795/5

Change in coreboot[master]: mb/google/hatch/var/kindred: Configure GPIOs for eMMC SKUs

[David Wu (Code Review)]

David Wu has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34795 )

Change subject: mb/google/hatch/var/kindred: Configure GPIOs for eMMC SKUs
......................................................................

Patch Set 5:

(1 comment)

https://review.coreboot.org/c/coreboot/+/34795/4/src/mainboard/google/hatch/... 
File src/mainboard/google/hatch/variants/kindred/gpio.c:

https://review.coreboot.org/c/coreboot/+/34795/4/src/mainboard/google/hatch/... 
PS4, Line 141: 	if (sku_id == 2 || sku_id == 4 || sku_id == 21 || sku_id == 22) {
> suspect code indent for conditional statements (8, 8)

Done

Change in coreboot[master]: mb/google/hatch/var/kindred: Configure GPIOs for eMMC SKUs

[Tim Wawrzynczak (Code Review)]

Tim Wawrzynczak has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34795 )

Change subject: mb/google/hatch/var/kindred: Configure GPIOs for eMMC SKUs
......................................................................

Patch Set 5: Code-Review+2

Change in coreboot[master]: mb/google/hatch/var/kindred: Configure GPIOs for eMMC SKUs

[Paul Fagerburg (Code Review)]

Paul Fagerburg has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34795 )

Change subject: mb/google/hatch/var/kindred: Configure GPIOs for eMMC SKUs
......................................................................

Patch Set 5: Code-Review+2

Change in coreboot[master]: mb/google/hatch/var/kindred: Configure GPIOs for eMMC SKUs

[David Wu (Code Review)]

David Wu has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34795 )

Change subject: mb/google/hatch/var/kindred: Configure GPIOs for eMMC SKUs
......................................................................

Patch Set 5:

(2 comments)

https://review.coreboot.org/c/coreboot/+/34795/2//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/34795/2//COMMIT_MSG@7 
PS2, Line 7: Config
> Configure

Done

https://review.coreboot.org/c/coreboot/+/34795/3/src/mainboard/google/hatch/... 
File src/mainboard/google/hatch/variants/kindred/gpio.c:

https://review.coreboot.org/c/coreboot/+/34795/3/src/mainboard/google/hatch/... 
PS3, Line 141: 	if (sku_id == 2 || sku_id == 4 || sku_id == 21 || sku_id == 23) {
> suspect code indent for conditional statements (8, 8)

Done

Change in coreboot[master]: mb/google/hatch/var/kindred: Configure GPIOs for eMMC SKUs

[Furquan Shaikh (Code Review)]

Furquan Shaikh has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/34795 )

Change subject: mb/google/hatch/var/kindred: Configure GPIOs for eMMC SKUs
......................................................................

mb/google/hatch/var/kindred: Configure GPIOs for eMMC SKUs

Configure GPIOs for eMMC SKUs

BUG=b:132918661
TEST=Verify SSD is disabled when SKU ID = 2/4/21/22

Change-Id: I9f678a40555dbc841487811cc1f680b211a51a89
Signed-off-by: David Wu 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34795
Tested-by: build bot (Jenkins) 
Reviewed-by: Tim Wawrzynczak 
Reviewed-by: Paul Fagerburg 
---
M src/mainboard/google/hatch/variants/kindred/gpio.c
1 file changed, 46 insertions(+), 0 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Tim Wawrzynczak: Looks good to me, approved
  Paul Fagerburg: Looks good to me, approved

diff --git a/src/mainboard/google/hatch/variants/kindred/gpio.c b/src/mainboard/google/hatch/variants/kindred/gpio.c
index 92b6ec9..827ee0b 100644
--- a/src/mainboard/google/hatch/variants/kindred/gpio.c
+++ b/src/mainboard/google/hatch/variants/kindred/gpio.c
@@ -53,6 +53,47 @@
    PAD_CFG_GPI(GPP_H22, NONE, PLTRST),
 };

+static const struct pad_config emmc_sku_gpio_table[] = {
+	/* E1  : M2_SSD_PEDET ==> NC */
+	PAD_NC(GPP_E1, NONE),
+	/* E4  : M2_SSD_PE_WAKE_ODL ==> NC */
+	PAD_NC(GPP_E4, NONE),
+	/* E5  : SATA_DEVSLP1 ==> NC */
+	PAD_NC(GPP_E5, NONE),
+	/* F3  : MEM_STRAP_3 */
+	PAD_CFG_GPI(GPP_F3, NONE, PLTRST),
+	/* F10 : MEM_STRAP_2 */
+	PAD_CFG_GPI(GPP_F10, NONE, PLTRST),
+	/* F11 : EMMC_CMD ==> EMMC_CMD */
+	PAD_CFG_NF(GPP_F11, NONE, DEEP, NF1),
+	/* F12 : EMMC_DATA0 ==> EMMC_DAT0 */
+	PAD_CFG_NF(GPP_F12, NONE, DEEP, NF1),
+	/* F13 : EMMC_DATA1 ==> EMMC_DAT1 */
+	PAD_CFG_NF(GPP_F13, NONE, DEEP, NF1),
+	/* F14 : EMMC_DATA2 ==> EMMC_DAT2 */
+	PAD_CFG_NF(GPP_F14, NONE, DEEP, NF1),
+	/* F15 : EMMC_DATA3 ==> EMMC_DAT3 */
+	PAD_CFG_NF(GPP_F15, NONE, DEEP, NF1),
+	/* F16 : EMMC_DATA4 ==> EMMC_DAT4 */
+	PAD_CFG_NF(GPP_F16, NONE, DEEP, NF1),
+	/* F17 : EMMC_DATA5 ==> EMMC_DAT5 */
+	PAD_CFG_NF(GPP_F17, NONE, DEEP, NF1),
+	/* F18 : EMMC_DATA6 ==> EMMC_DAT6 */
+	PAD_CFG_NF(GPP_F18, NONE, DEEP, NF1),
+	/* F19 : EMMC_DATA7 ==> EMMC_DAT7 */
+	PAD_CFG_NF(GPP_F19, NONE, DEEP, NF1),
+	/* F20 : EMMC_RCLK ==> EMMC_RCLK */
+	PAD_CFG_NF(GPP_F20, NONE, DEEP, NF1),
+	/* F21 : EMMC_CLK ==> EMMC_CLK */
+	PAD_CFG_NF(GPP_F21, NONE, DEEP, NF1),
+	/* F22 : EMMC_RESET# ==> EMMC_RST_L */
+	PAD_CFG_NF(GPP_F22, NONE, DEEP, NF1),
+	/* H19 : MEM_STRAP_0 */
+	PAD_CFG_GPI(GPP_H19, NONE, PLTRST),
+	/* H22 : MEM_STRAP_1 */
+	PAD_CFG_GPI(GPP_H22, NONE, PLTRST),
+};
+
 static const struct pad_config gpio_table[] = {
    /* F3  : MEM_STRAP_3 */
    PAD_CFG_GPI(GPP_F3, NONE, PLTRST),
@@ -96,6 +137,11 @@
    	*num = ARRAY_SIZE(ssd_sku_gpio_table);
    	return ssd_sku_gpio_table;
    }
+	/* For eMMC SKU */
+	if (sku_id == 2 || sku_id == 4 || sku_id == 21 || sku_id == 22) {
+		*num = ARRAY_SIZE(emmc_sku_gpio_table);
+		return emmc_sku_gpio_table;
+	}
    *num = ARRAY_SIZE(gpio_table);
    return gpio_table;
 }