From a0a83e1a6c526d5877c83122a1682704c6ec178d Mon Sep 17 00:00:00 2001 From: Wisley Chen Date: Tue, 23 Jul 2019 14:33:04 +0800 Subject: mb/google/octopus: Override DDI1 DDC SDA/SCL for HDMI The device Dorp uses the variant Meep, and supports HDMI. -sku33 (HDMI) -sku34 (HDMI + keyboard backlight) -sku35 (HDMI + Touchscreen) -sku36 (HDMI + keyboard backlight + Touchscreen) BUG=b:136522841 BRANCH=octopus TEST=emerge-octopus coreboot Change-Id: I59ba2e56cf2f83ca9d533454570bcdd39c0a2e7c Signed-off-by: Wisley Chen Reviewed-on: https://review.coreboot.org/c/coreboot/+/34509 Reviewed-by: Marco Chen Reviewed-by: Justin TerAvest Tested-by: build bot (Jenkins) --- src/mainboard/google/octopus/variants/meep/gpio.c | 31 ++++++++++++++++++++-- .../octopus/variants/meep/include/variant/sku.h | 27 +++++++++++++++++++ 2 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 src/mainboard/google/octopus/variants/meep/include/variant/sku.h diff --git a/src/mainboard/google/octopus/variants/meep/gpio.c b/src/mainboard/google/octopus/variants/meep/gpio.c index 7b47bf1217..44d9fff129 100644 --- a/src/mainboard/google/octopus/variants/meep/gpio.c +++ b/src/mainboard/google/octopus/variants/meep/gpio.c @@ -17,6 +17,7 @@ #include #include #include +#include static const struct pad_config default_override_table[] = { PAD_NC(GPIO_104, UP_20K), @@ -26,8 +27,34 @@ static const struct pad_config default_override_table[] = { DISPUPD), }; +static const struct pad_config hdmi_sku_override_table[] = { + PAD_NC(GPIO_104, UP_20K), + + /* HV_DDI1_DDC_SDA */ + PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_126, NONE, DEEP, NF1, HIZCRx1, + DISPUPD), + /* HV_DDI1_DDC_SCL */ + PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_127, NONE, DEEP, NF1, HIZCRx1, + DISPUPD), + /* EN_PP3300_TOUCHSCREEN */ + PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_146, 0, DEEP, NONE, Tx0RxDCRx0, + DISPUPD), +}; + const struct pad_config *variant_override_gpio_table(size_t *num) { - *num = ARRAY_SIZE(default_override_table); - return default_override_table; + uint32_t sku_id; + sku_id = get_board_sku(); + + switch (sku_id) { + case SKU_33_DORP: + case SKU_34_DORP: + case SKU_35_DORP: + case SKU_36_DORP: + *num = ARRAY_SIZE(hdmi_sku_override_table); + return hdmi_sku_override_table; + default: + *num = ARRAY_SIZE(default_override_table); + return default_override_table; + } } diff --git a/src/mainboard/google/octopus/variants/meep/include/variant/sku.h b/src/mainboard/google/octopus/variants/meep/include/variant/sku.h new file mode 100644 index 0000000000..1fd17efdd1 --- /dev/null +++ b/src/mainboard/google/octopus/variants/meep/include/variant/sku.h @@ -0,0 +1,27 @@ +/* + * 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_33_DORP = 33, /* HDMI */ + SKU_34_DORP = 34, /* HDMI+Kblight */ + SKU_35_DORP = 35, /* HDMI+TS */ + SKU_36_DORP = 36, /* HDMI+TS+KBlight */ +}; + +#endif /* __MAINBOARD_SKU_H__ */ -- cgit v1.2.3