From fd15c99f4eb80eb93c56c5141804c4bd55a45709 Mon Sep 17 00:00:00 2001
From: Peichao Wang <peichao.wang@bitland.corp-partner.google.com>
Date: Wed, 11 Sep 2019 13:31:47 +0800
Subject: mb/google/hatch: Merge emmc_sku_gpio_table and gpio_table to one
table
BUG=b:140008849, b:140573677
TEST=verify eMMC SKU and SSD SKU will bring up normally.
Signed-off-by: Peichao Wang <peichao.wang@bitland.corp-partner.google.com>
Change-Id: I0c0adf569cc92e8b44ab72379420f2b190fa31f5
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35344
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marco Chen <marcochen@google.com>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Justin TerAvest <teravest@chromium.org>
---
src/mainboard/google/hatch/variants/akemi/gpio.c | 76 ------------------------
1 file changed, 76 deletions(-)
(limited to 'src')
diff --git a/src/mainboard/google/hatch/variants/akemi/gpio.c b/src/mainboard/google/hatch/variants/akemi/gpio.c
index 27b49e5fe5..1ba9d3523d 100644
--- a/src/mainboard/google/hatch/variants/akemi/gpio.c
+++ b/src/mainboard/google/hatch/variants/akemi/gpio.c
@@ -90,77 +90,6 @@ static const struct pad_config ssd_sku_gpio_table[] = {
PAD_CFG_GPI(GPP_H22, NONE, PLTRST),
};
-static const struct pad_config emmc_sku_gpio_table[] = {
- /* A0 : NC */
- PAD_NC(GPP_A0, NONE),
- /* A6 : NC */
- PAD_NC(GPP_A6, NONE),
- /* A8 : NC */
- PAD_NC(GPP_A8, NONE),
- /* A10 : NC */
- PAD_NC(GPP_A10, NONE),
- /* A11 : NC */
- PAD_NC(GPP_A11, NONE),
- /* A12 : NC */
- PAD_NC(GPP_A12, NONE),
- /* A18 : NC */
- PAD_NC(GPP_A18, NONE),
- /* A19 : NC */
- PAD_NC(GPP_A19, NONE),
- /* A22 : NC */
- PAD_NC(GPP_A22, NONE),
- /* A23 : NC */
- PAD_NC(GPP_A23, NONE),
- /* B20 : NC */
- PAD_NC(GPP_B20, NONE),
- /* B21 : NC */
- PAD_NC(GPP_B21, NONE),
- /* B22 : NC */
- PAD_NC(GPP_B22, NONE),
- /* C11 : NC */
- PAD_NC(GPP_C11, NONE),
- /* C15 : NC */
- PAD_NC(GPP_C15, NONE),
- /* F1 : NC */
- PAD_NC(GPP_F1, 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),
- /* H6 : NC */
- PAD_NC(GPP_H6, NONE),
- /* H7 : NC */
- PAD_NC(GPP_H7, NONE),
- /* 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[] = {
/* A0 : NC */
PAD_NC(GPP_A0, NONE),
@@ -240,11 +169,6 @@ const struct pad_config *override_gpio_table(size_t *num)
*num = ARRAY_SIZE(ssd_sku_gpio_table);
return ssd_sku_gpio_table;
}
- /* For eMMC SKU */
- if (sku_id == 1) {
- *num = ARRAY_SIZE(emmc_sku_gpio_table);
- return emmc_sku_gpio_table;
- }
*num = ARRAY_SIZE(gpio_table);
return gpio_table;
}
--
cgit v1.2.3