From 19476c34b0ce20c966d0461ec4d4bb689fce8f35 Mon Sep 17 00:00:00 2001 From: Kevin Chiu Date: Mon, 17 Jun 2019 16:18:27 +0800 Subject: [PATCH] mb/google/octopus: Override DDI1 DDC SDA/SCL for Garg HDMI garg 2A2C DB: SKU ID - 1 garg HDMI DB: SKU ID - 9 garg LTE DB: SKU ID - 17 For HDMI SKU9, GPIO needs to be overriden to enable DDI1 DDC SDA/SCL. BUG=b:134912735 BRANCH=octopus TEST=emerge-octopus coreboot chromeos-bootimage Change-Id: I6ad8e5aa52f503121b10fe353e4bf4021aee2061 Signed-off-by: Kevin Chiu Reviewed-on: https://review.coreboot.org/c/coreboot/+/33552 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh Reviewed-by: Karthik Ramasubramanian Reviewed-by: Justin TerAvest --- .../google/octopus/variants/garg/gpio.c | 35 +++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/src/mainboard/google/octopus/variants/garg/gpio.c b/src/mainboard/google/octopus/variants/garg/gpio.c index a4362409b5..90601ce850 100644 --- a/src/mainboard/google/octopus/variants/garg/gpio.c +++ b/src/mainboard/google/octopus/variants/garg/gpio.c @@ -19,6 +19,12 @@ #include #include +enum { + SKU_1_2A2C = 1, + SKU_9_HDMI = 9, + SKU_17_LTE = 17, +}; + static const struct pad_config default_override_table[] = { PAD_NC(GPIO_104, UP_20K), @@ -29,9 +35,34 @@ static const struct pad_config default_override_table[] = { PAD_NC(GPIO_213, DN_20K), }; +static const struct pad_config hdmi_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), + + PAD_NC(GPIO_213, DN_20K), +}; + const struct pad_config *variant_override_gpio_table(size_t *num) { - *num = ARRAY_SIZE(default_override_table); + uint32_t sku_id; + sku_id = get_board_sku(); - return default_override_table; + switch (sku_id) { + case SKU_9_HDMI: + *num = ARRAY_SIZE(hdmi_override_table); + return hdmi_override_table; + default: + *num = ARRAY_SIZE(default_override_table); + return default_override_table; + } }