From 07a803db77eb8cab5177650a2df50c7400f2f8d1 Mon Sep 17 00:00:00 2001 From: Amanda Huang Date: Wed, 6 Jun 2018 14:57:25 +0800 Subject: [PATCH] mb/google/poppy/variants/nami: Disable rear camera/DMIC for Sona Since there are two cameras on Nami and only one camera on Sona. We need to disable rear camera/DMIC on all Sona sku. BUG=b:109710674 BRANCH=master TEST=Verify if only front camera/DMIC shown on Sona Change-Id: Id84ee22c9ffc15db78be3bbad148af5cd7dc866e Signed-off-by: Amanda Huang Reviewed-on: https://review.coreboot.org/26876 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh --- 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 45a77f1d5b..3c82c2b7d1 100644 --- a/src/mainboard/google/poppy/variants/nami/gpio.c +++ b/src/mainboard/google/poppy/variants/nami/gpio.c @@ -407,6 +407,8 @@ const struct pad_config *variant_sku_gpio_table(size_t *num) case SKU_0_PANTHEON: case SKU_1_PANTHEON: case SKU_2_PANTHEON: + case SKU_0_SONA: + case SKU_1_SONA: *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 a2c9c490d8..15fbcee62c 100644 --- a/src/mainboard/google/poppy/variants/nami/include/variant/sku.h +++ b/src/mainboard/google/poppy/variants/nami/include/variant/sku.h @@ -24,5 +24,7 @@ #define SKU_0_PANTHEON 0x3F63 #define SKU_1_PANTHEON 0x3F67 #define SKU_2_PANTHEON 0x3F62 +#define SKU_0_SONA 0x3AE2 +#define SKU_1_SONA 0x3AE3 #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 f8671ec175..1d5a0b2ec5 100644 --- a/src/mainboard/google/poppy/variants/nami/mainboard.c +++ b/src/mainboard/google/poppy/variants/nami/mainboard.c @@ -71,6 +71,8 @@ void variant_devtree_update(void) case SKU_0_PANTHEON: case SKU_1_PANTHEON: case SKU_2_PANTHEON: + case SKU_0_SONA: + case SKU_1_SONA: /* Disable unused port USB port */ cfg->usb2_ports[5].enable = 0; break;