Furquan Shaikh merged this change.

View Change

Approvals: build bot (Jenkins): Verified Furquan Shaikh: Looks good to me, approved Justin TerAvest: Looks good to me, approved Karthik Ramasubramanian: Looks good to me, approved
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 <Kevin.Chiu@quantatw.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/33552
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Karthik Ramasubramanian <kramasub@google.com>
Reviewed-by: Justin TerAvest <teravest@chromium.org>
---
M src/mainboard/google/octopus/variants/garg/gpio.c
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 a436240..90601ce 100644
--- a/src/mainboard/google/octopus/variants/garg/gpio.c
+++ b/src/mainboard/google/octopus/variants/garg/gpio.c
@@ -19,6 +19,12 @@
#include <gpio.h>
#include <soc/gpio.h>

+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 @@
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;
+ }
}

To view, visit change 33552. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I6ad8e5aa52f503121b10fe353e4bf4021aee2061
Gerrit-Change-Number: 33552
Gerrit-PatchSet: 5
Gerrit-Owner: Kevin Chiu <Kevin.Chiu@quantatw.com>
Gerrit-Reviewer: Aaron Durbin <adurbin@chromium.org>
Gerrit-Reviewer: Furquan Shaikh <furquan@google.com>
Gerrit-Reviewer: Justin TerAvest <teravest@chromium.org>
Gerrit-Reviewer: Justin TerAvest <teravest@google.com>
Gerrit-Reviewer: Kane Chen <kane.chen@intel.corp-partner.google.com>
Gerrit-Reviewer: Karthik Ramasubramanian <kramasub@google.com>
Gerrit-Reviewer: Keith Tzeng <keith.tzeng@quantatw.com>
Gerrit-Reviewer: Kevin Chiu <Kevin.Chiu@quantatw.com>
Gerrit-Reviewer: Kevin Chiu <kevin.chiu@quanta.corp-partner.google.com>
Gerrit-Reviewer: Marco Chen <marcochen@google.com>
Gerrit-Reviewer: Sheng-Liang Pan <sheng-liang.pan@quanta.corp-partner.google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-CC: Kane Chen <kane.chen@intel.com>
Gerrit-CC: Paul Menzel <paulepanter@users.sourceforge.net>
Gerrit-MessageType: merged