diff options
| author | Amanda Huang <amanda_hwang@compal.corp-partner.google.com> | 2018-06-06 14:50:29 +0800 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2018-06-07 16:36:58 +0000 |
| commit | cd27b8d511ade334d4e271becc32a1dce380d155 (patch) | |
| tree | b2735d9801d3e451747e5946672c4ecaf790829b /src/mainboard/google/poppy/variants/nami | |
| parent | b892f1ac5d099c9e64f9c030fe7a83e65ed3b0b8 (diff) | |
mb/google/poppy/variants/nami: Disable rear camera/DMIC for Pantheon
Since there are two cameras on Nami and only one camera on Pantheon.
We need to disable rear camera/DMIC on all Pantheon sku.
BUG=b:109720689
BRANCH=master
TEST=Verify if only front camera/DMIC shown on Pantheon
Change-Id: Ibe48a945dc57f2c05344479253040ad1945d92fd
Signed-off-by: Amanda Huang <amanda_hwang@compal.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/26875
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Diffstat (limited to 'src/mainboard/google/poppy/variants/nami')
| -rw-r--r-- | src/mainboard/google/poppy/variants/nami/gpio.c | 9 | ||||
| -rw-r--r-- | src/mainboard/google/poppy/variants/nami/include/variant/sku.h | 1 | ||||
| -rw-r--r-- | src/mainboard/google/poppy/variants/nami/mainboard.c | 3 |
3 files changed, 10 insertions, 3 deletions
diff --git a/src/mainboard/google/poppy/variants/nami/gpio.c b/src/mainboard/google/poppy/variants/nami/gpio.c index 0e6b1b71c4..45a77f1d5b 100644 --- a/src/mainboard/google/poppy/variants/nami/gpio.c +++ b/src/mainboard/google/poppy/variants/nami/gpio.c @@ -391,7 +391,7 @@ static const struct pad_config nami_default_sku_gpio_table[] = { PAD_CFG_NF(GPP_D17, NONE, DEEP, NF1), }; -static const struct pad_config vayne_sku_gpio_table[] = { +static const struct pad_config no_dmic1_sku_gpio_table[] = { /* D17 : DMIC_CLK1 ==> NC */ PAD_CFG_NC(GPP_D17), }; @@ -404,8 +404,11 @@ const struct pad_config *variant_sku_gpio_table(size_t *num) case SKU_0_VAYNE: case SKU_1_VAYNE: case SKU_2_VAYNE: - *num = ARRAY_SIZE(vayne_sku_gpio_table); - board_gpio_tables = vayne_sku_gpio_table; + case SKU_0_PANTHEON: + case SKU_1_PANTHEON: + case SKU_2_PANTHEON: + *num = ARRAY_SIZE(no_dmic1_sku_gpio_table); + board_gpio_tables = no_dmic1_sku_gpio_table; break; default: *num = ARRAY_SIZE(nami_default_sku_gpio_table); 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 9dfffe15ae..a2c9c490d8 100644 --- a/src/mainboard/google/poppy/variants/nami/include/variant/sku.h +++ b/src/mainboard/google/poppy/variants/nami/include/variant/sku.h @@ -23,5 +23,6 @@ #define SKU_2_VAYNE 0x3A7F #define SKU_0_PANTHEON 0x3F63 #define SKU_1_PANTHEON 0x3F67 +#define SKU_2_PANTHEON 0x3F62 #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 957762331c..f8671ec175 100644 --- a/src/mainboard/google/poppy/variants/nami/mainboard.c +++ b/src/mainboard/google/poppy/variants/nami/mainboard.c @@ -68,6 +68,9 @@ void variant_devtree_update(void) case SKU_0_VAYNE: case SKU_1_VAYNE: case SKU_2_VAYNE: + case SKU_0_PANTHEON: + case SKU_1_PANTHEON: + case SKU_2_PANTHEON: /* Disable unused port USB port */ cfg->usb2_ports[5].enable = 0; break; |