From d0cc3bc5ce36c35d8d69fd4a384abc41ce385d30 Mon Sep 17 00:00:00 2001 From: Frank Wu Date: Mon, 24 Dec 2018 11:25:36 +0800 Subject: [PATCH] mb/google/poppy/variants/nami: Add sku_ids for Pantheon Sync'ing the sku_ids list in the master sku sheet for Pantheon. BUG=b:121207221 BRANCH=firmware-nami-10775.B TEST=emerge-nami coreboot chromeos-bootimage Change-Id: Ic03c3a6fe238f2692ce15c45016115087380c0ca Signed-off-by: Frank Wu Reviewed-on: https://review.coreboot.org/c/30412 Tested-by: build bot (Jenkins) Reviewed-by: Shelley Chen --- src/mainboard/google/poppy/variants/nami/gpio.c | 2 ++ src/mainboard/google/poppy/variants/nami/include/variant/sku.h | 2 ++ src/mainboard/google/poppy/variants/nami/mainboard.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/mainboard/google/poppy/variants/nami/gpio.c b/src/mainboard/google/poppy/variants/nami/gpio.c index a664271aae..cd7e0ca0b1 100644 --- a/src/mainboard/google/poppy/variants/nami/gpio.c +++ b/src/mainboard/google/poppy/variants/nami/gpio.c @@ -451,6 +451,8 @@ const struct pad_config *variant_sku_gpio_table(size_t *num) case SKU_5_SYNDRA: case SKU_6_SYNDRA: case SKU_7_SYNDRA: + case SKU_3_PANTHEON: + case SKU_4_PANTHEON: *num = ARRAY_SIZE(no_dmic1_sku_gpio_table); board_gpio_tables = no_dmic1_sku_gpio_table; break; diff --git a/src/mainboard/google/poppy/variants/nami/include/variant/sku.h b/src/mainboard/google/poppy/variants/nami/include/variant/sku.h index 5c233d107b..835864ee03 100644 --- a/src/mainboard/google/poppy/variants/nami/include/variant/sku.h +++ b/src/mainboard/google/poppy/variants/nami/include/variant/sku.h @@ -24,6 +24,8 @@ #define SKU_0_PANTHEON 0x3F63 #define SKU_1_PANTHEON 0x3F67 #define SKU_2_PANTHEON 0x3F62 +#define SKU_3_PANTHEON 0xBF63 +#define SKU_4_PANTHEON 0xBF62 #define SKU_0_SONA 0x3AE2 #define SKU_1_SONA 0x3AE3 #define SKU_0_AKALI 0x29E1 diff --git a/src/mainboard/google/poppy/variants/nami/mainboard.c b/src/mainboard/google/poppy/variants/nami/mainboard.c index 3d57e40fa4..c656954983 100644 --- a/src/mainboard/google/poppy/variants/nami/mainboard.c +++ b/src/mainboard/google/poppy/variants/nami/mainboard.c @@ -254,6 +254,8 @@ void variant_devtree_update(void) case SKU_0_PANTHEON: case SKU_1_PANTHEON: case SKU_2_PANTHEON: + case SKU_3_PANTHEON: + case SKU_4_PANTHEON: cfg->usb2_ports[5].enable = 0; break; case SKU_0_BARD: