From f7b57d0b78e0ecb031e91f9603b4ceb8f3dcf3ec Mon Sep 17 00:00:00 2001 From: Amanda Huang Date: Thu, 11 Oct 2018 11:39:37 +0800 Subject: mb/google/poppy/variants/nami: Disable rear camera/DMIC for Syndra Since there are two cameras on Nami and only one camera on Syndra. We need to disable rear camera/DMIC on all Syndra sku. BUG=b:112876867 Change-Id: I92fb43ec84387c268ffdb6d0d34a5e5b13bcf50a Signed-off-by: Amanda Huang Reviewed-on: https://review.coreboot.org/29022 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh --- src/mainboard/google/poppy/variants/nami/gpio.c | 4 ++++ src/mainboard/google/poppy/variants/nami/include/variant/sku.h | 4 ++++ src/mainboard/google/poppy/variants/nami/mainboard.c | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/src/mainboard/google/poppy/variants/nami/gpio.c b/src/mainboard/google/poppy/variants/nami/gpio.c index 2d0fea4955..1a03c05f7d 100644 --- a/src/mainboard/google/poppy/variants/nami/gpio.c +++ b/src/mainboard/google/poppy/variants/nami/gpio.c @@ -415,6 +415,10 @@ const struct pad_config *variant_sku_gpio_table(size_t *num) case SKU_2_VAYNE: case SKU_0_SONA: case SKU_1_SONA: + case SKU_0_SYNDRA: + case SKU_1_SYNDRA: + case SKU_2_SYNDRA: + case SKU_3_SYNDRA: *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 d75eb10d35..e27709a3f3 100644 --- a/src/mainboard/google/poppy/variants/nami/include/variant/sku.h +++ b/src/mainboard/google/poppy/variants/nami/include/variant/sku.h @@ -30,5 +30,9 @@ #define SKU_1_AKALI 0x2861 #define SKU_0_AKALI360 0x2BE7 #define SKU_1_AKALI360 0x2A67 +#define SKU_0_SYNDRA 0x2BC63 +#define SKU_1_SYNDRA 0x2BC62 +#define SKU_2_SYNDRA 0x2BC61 +#define SKU_3_SYNDRA 0X2BC60 #endif /* __MAINBOARD_SKU_H__ */ diff --git a/src/mainboard/google/poppy/variants/nami/mainboard.c b/src/mainboard/google/poppy/variants/nami/mainboard.c index 28fa327ab7..7362ba6340 100644 --- a/src/mainboard/google/poppy/variants/nami/mainboard.c +++ b/src/mainboard/google/poppy/variants/nami/mainboard.c @@ -234,6 +234,10 @@ void variant_devtree_update(void) case SKU_2_PANTHEON: case SKU_0_SONA: case SKU_1_SONA: + case SKU_0_SYNDRA: + case SKU_1_SYNDRA: + case SKU_2_SYNDRA: + case SKU_3_SYNDRA: /* Disable unused port USB port */ cfg->usb2_ports[5].enable = 0; break; -- cgit v1.2.3