From 1f7a11699a40b03162816ab2acd766c21aa24e8d Mon Sep 17 00:00:00 2001 From: Kevin Chiu Date: Tue, 24 Dec 2019 13:12:59 +0800 Subject: [PATCH] mb/google/octopus/variants/garg: update new SKU add new SKU ID below: 19 - Garg PVT (HDMI DB, Touch) 20 - Garg PVT (2A2C DB, Touch) 38 - Garg360 EVT (2A2C DB, touch, no stylues, rear camera) BUG=b:146260545 BRANCH=octopus TEST=emerge-octopus coreboot chromeos-bootimage Change-Id: Ic74ce14db7060f3124c1a277eb3625ce0ff0b9f0 Signed-off-by: Kevin Chiu Reviewed-on: https://review.coreboot.org/c/coreboot/+/37923 Tested-by: build bot (Jenkins) Reviewed-by: Marco Chen --- .../google/octopus/variants/garg/gpio.c | 10 ++----- .../variants/garg/include/variant/sku.h | 30 +++++++++++++++++++ .../google/octopus/variants/garg/variant.c | 10 ++----- 3 files changed, 34 insertions(+), 16 deletions(-) create mode 100644 src/mainboard/google/octopus/variants/garg/include/variant/sku.h diff --git a/src/mainboard/google/octopus/variants/garg/gpio.c b/src/mainboard/google/octopus/variants/garg/gpio.c index bcabac5001..eeeb4662e3 100644 --- a/src/mainboard/google/octopus/variants/garg/gpio.c +++ b/src/mainboard/google/octopus/variants/garg/gpio.c @@ -18,14 +18,7 @@ #include #include #include - -enum { - SKU_1_2A2C = 1, - SKU_9_HDMI = 9, - SKU_17_LTE = 17, - SKU_18_LTE_TS = 18, - SKU_37_2A2C_360 = 37, -}; +#include static const struct pad_config default_override_table[] = { PAD_NC(GPIO_104, UP_20K), @@ -83,6 +76,7 @@ const struct pad_config *variant_override_gpio_table(size_t *num) switch (sku_id) { case SKU_9_HDMI: + case SKU_19_HDMI_TS: *num = ARRAY_SIZE(hdmi_override_table); return hdmi_override_table; case SKU_17_LTE: diff --git a/src/mainboard/google/octopus/variants/garg/include/variant/sku.h b/src/mainboard/google/octopus/variants/garg/include/variant/sku.h new file mode 100644 index 0000000000..432f3c54cd --- /dev/null +++ b/src/mainboard/google/octopus/variants/garg/include/variant/sku.h @@ -0,0 +1,30 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2019 Google LLC + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __MAINBOARD_SKU_H__ +#define __MAINBOARD_SKU_H__ + +enum { + SKU_1_2A2C = 1, + SKU_9_HDMI = 9, + SKU_17_LTE = 17, + SKU_18_LTE_TS = 18, + SKU_19_HDMI_TS = 19, + SKU_20_2A2C_TS = 20, + SKU_37_2A2C_360 = 37, + SKU_38_2A2C_360_TS_NO_STYLUES = 38, +}; + +#endif /* __MAINBOARD_SKU_H__ */ diff --git a/src/mainboard/google/octopus/variants/garg/variant.c b/src/mainboard/google/octopus/variants/garg/variant.c index 942ea5f3b4..f5f350a8f0 100644 --- a/src/mainboard/google/octopus/variants/garg/variant.c +++ b/src/mainboard/google/octopus/variants/garg/variant.c @@ -20,14 +20,7 @@ #include #include #include - -enum { - SKU_1_2A2C = 1, - SKU_9_HDMI = 9, - SKU_17_LTE = 17, - SKU_18_LTE_TS = 18, - SKU_37_2A2C_360 = 37, -}; +#include struct gpio_with_delay { gpio_t gpio; @@ -65,6 +58,7 @@ const char *mainboard_vbt_filename(void) switch (sku_id) { case SKU_9_HDMI: + case SKU_19_HDMI_TS: return "vbt_garg_hdmi.bin"; default: return "vbt.bin";