From 55804931013e4c2fd43d515ded11b201ea171f84 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 10 May 2019 08:42:31 -0600 Subject: [PATCH] Add HDA settings and disable GPU by default (temporary) --- src/mainboard/system76/cfl-h/gpio.h | 14 ++--- .../cfl-h/variants/gaze14_1650_15/hda_verb.c | 21 ++++---- .../cfl-h/variants/gaze14_1650_17/hda_verb.c | 21 ++++---- .../variants/gaze14_1660ti_15/hda_verb.c | 53 +------------------ .../variants/gaze14_1660ti_17/hda_verb.c | 53 +------------------ 5 files changed, 29 insertions(+), 133 deletions(-) diff --git a/src/mainboard/system76/cfl-h/gpio.h b/src/mainboard/system76/cfl-h/gpio.h index de60534b97..6bd96367af 100644 --- a/src/mainboard/system76/cfl-h/gpio.h +++ b/src/mainboard/system76/cfl-h/gpio.h @@ -233,9 +233,9 @@ static const struct pad_config gpio_table[] = { // UART // UART2_RXD - PAD_CFG_NF(GPP_C20, NONE, DEEP, NF1), + PAD_CFG_NC(GPP_C20), //PAD_CFG_NF(GPP_C20, NONE, DEEP, NF1), // UART2_TXD - PAD_CFG_NF(GPP_C21, NONE, DEEP, NF1), + PAD_CFG_NC(GPP_C21), //PAD_CFG_NF(GPP_C21, NONE, DEEP, NF1), // NC PAD_CFG_NC(GPP_C22), // NC @@ -396,9 +396,9 @@ static const struct pad_config gpio_table[] = { // EDP_BRIGHTNESS PAD_CFG_NF(GPP_F21, NONE, DEEP, NF1), // TODO: DGPU_RST#_PCH - PAD_CFG_GPO(GPP_F22, 1, DEEP), + PAD_CFG_GPO(GPP_F22, 0, DEEP), // TODO: DGPU_PWR_EN - PAD_CFG_GPO(GPP_F23, 1, DEEP), + PAD_CFG_GPO(GPP_F23, 0, DEEP), // GPP_G // SD @@ -408,7 +408,7 @@ static const struct pad_config gpio_table[] = { PAD_CFG_NC(GPP_G1), // TODO: TPM_DET PAD_CFG_NC(GPP_G2), - // //TODO: GPIO4_1V8_MAIN_EN_R + // TODO: GPIO4_1V8_MAIN_EN_R PAD_CFG_NC(GPP_G3), // NC PAD_CFG_NC(GPP_G4), @@ -608,9 +608,9 @@ static const struct pad_config gpio_table[] = { static const struct pad_config early_gpio_table[] = { // UART2 // UART2_RXD - PAD_CFG_NF(GPP_C20, NONE, DEEP, NF1), + PAD_CFG_NC(GPP_C20), //PAD_CFG_NF(GPP_C20, NONE, DEEP, NF1), // UART2_TXD - PAD_CFG_NF(GPP_C21, NONE, DEEP, NF1), + PAD_CFG_NC(GPP_C21), //PAD_CFG_NF(GPP_C21, NONE, DEEP, NF1), }; #endif diff --git a/src/mainboard/system76/cfl-h/variants/gaze14_1650_15/hda_verb.c b/src/mainboard/system76/cfl-h/variants/gaze14_1650_15/hda_verb.c index ce9aed8ae5..598e584495 100644 --- a/src/mainboard/system76/cfl-h/variants/gaze14_1650_15/hda_verb.c +++ b/src/mainboard/system76/cfl-h/variants/gaze14_1650_15/hda_verb.c @@ -19,22 +19,21 @@ #include const u32 cim_verb_data[] = { - /* Realtek, ALC293 */ - 0x10ec0293, /* Vendor ID */ - 0x15581325, /* Subsystem ID */ - 12, /* Number of entries */ - AZALIA_SUBVENDOR(0, 0x15581325), + /* Realtek, ALC269VC */ + 0x10ec0269, /* Vendor ID */ + 0x15588560, /* Subsystem ID */ + 11, /* Number of entries */ + AZALIA_SUBVENDOR(0, 0x15588560), AZALIA_PIN_CFG(0, 0x12, 0x90a60140), - AZALIA_PIN_CFG(0, 0x13, 0x40000000), AZALIA_PIN_CFG(0, 0x14, 0x90170110), AZALIA_PIN_CFG(0, 0x15, 0x02211020), - AZALIA_PIN_CFG(0, 0x16, 0x411111f0), - AZALIA_PIN_CFG(0, 0x18, 0x02a11050), - AZALIA_PIN_CFG(0, 0x19, 0x411111f0), + AZALIA_PIN_CFG(0, 0x17, 0x40000000), + AZALIA_PIN_CFG(0, 0x18, 0x02a11030), + AZALIA_PIN_CFG(0, 0x19, 0x02a1103f), AZALIA_PIN_CFG(0, 0x1a, 0x411111f0), AZALIA_PIN_CFG(0, 0x1b, 0x411111f0), - AZALIA_PIN_CFG(0, 0x1d, 0x41738205), - AZALIA_PIN_CFG(0, 0x1e, 0x02451130), + AZALIA_PIN_CFG(0, 0x1d, 0x40f00001), + AZALIA_PIN_CFG(0, 0x1e, 0x411111f0), /* Intel, KabylakeHDMI */ 0x8086280b, /* Vendor ID */ 0x80860101, /* Subsystem ID */ diff --git a/src/mainboard/system76/cfl-h/variants/gaze14_1650_17/hda_verb.c b/src/mainboard/system76/cfl-h/variants/gaze14_1650_17/hda_verb.c index ce9aed8ae5..23aae86098 100644 --- a/src/mainboard/system76/cfl-h/variants/gaze14_1650_17/hda_verb.c +++ b/src/mainboard/system76/cfl-h/variants/gaze14_1650_17/hda_verb.c @@ -19,22 +19,21 @@ #include const u32 cim_verb_data[] = { - /* Realtek, ALC293 */ - 0x10ec0293, /* Vendor ID */ - 0x15581325, /* Subsystem ID */ - 12, /* Number of entries */ - AZALIA_SUBVENDOR(0, 0x15581325), + /* Realtek, ALC269VC */ + 0x10ec0269, /* Vendor ID */ + 0x15588561, /* Subsystem ID */ + 11, /* Number of entries */ + AZALIA_SUBVENDOR(0, 0x15588561), AZALIA_PIN_CFG(0, 0x12, 0x90a60140), - AZALIA_PIN_CFG(0, 0x13, 0x40000000), AZALIA_PIN_CFG(0, 0x14, 0x90170110), AZALIA_PIN_CFG(0, 0x15, 0x02211020), - AZALIA_PIN_CFG(0, 0x16, 0x411111f0), - AZALIA_PIN_CFG(0, 0x18, 0x02a11050), - AZALIA_PIN_CFG(0, 0x19, 0x411111f0), + AZALIA_PIN_CFG(0, 0x17, 0x40000000), + AZALIA_PIN_CFG(0, 0x18, 0x02a11030), + AZALIA_PIN_CFG(0, 0x19, 0x02a1103f), AZALIA_PIN_CFG(0, 0x1a, 0x411111f0), AZALIA_PIN_CFG(0, 0x1b, 0x411111f0), - AZALIA_PIN_CFG(0, 0x1d, 0x41738205), - AZALIA_PIN_CFG(0, 0x1e, 0x02451130), + AZALIA_PIN_CFG(0, 0x1d, 0x40f00001), + AZALIA_PIN_CFG(0, 0x1e, 0x411111f0), /* Intel, KabylakeHDMI */ 0x8086280b, /* Vendor ID */ 0x80860101, /* Subsystem ID */ diff --git a/src/mainboard/system76/cfl-h/variants/gaze14_1660ti_15/hda_verb.c b/src/mainboard/system76/cfl-h/variants/gaze14_1660ti_15/hda_verb.c index ce9aed8ae5..8ad1dfb535 100644 --- a/src/mainboard/system76/cfl-h/variants/gaze14_1660ti_15/hda_verb.c +++ b/src/mainboard/system76/cfl-h/variants/gaze14_1660ti_15/hda_verb.c @@ -1,52 +1 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2019 System76 - * - * 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 HDA_VERB_H -#define HDA_VERB_H - -#include - -const u32 cim_verb_data[] = { - /* Realtek, ALC293 */ - 0x10ec0293, /* Vendor ID */ - 0x15581325, /* Subsystem ID */ - 12, /* Number of entries */ - AZALIA_SUBVENDOR(0, 0x15581325), - AZALIA_PIN_CFG(0, 0x12, 0x90a60140), - AZALIA_PIN_CFG(0, 0x13, 0x40000000), - AZALIA_PIN_CFG(0, 0x14, 0x90170110), - AZALIA_PIN_CFG(0, 0x15, 0x02211020), - AZALIA_PIN_CFG(0, 0x16, 0x411111f0), - AZALIA_PIN_CFG(0, 0x18, 0x02a11050), - AZALIA_PIN_CFG(0, 0x19, 0x411111f0), - AZALIA_PIN_CFG(0, 0x1a, 0x411111f0), - AZALIA_PIN_CFG(0, 0x1b, 0x411111f0), - AZALIA_PIN_CFG(0, 0x1d, 0x41738205), - AZALIA_PIN_CFG(0, 0x1e, 0x02451130), - /* Intel, KabylakeHDMI */ - 0x8086280b, /* Vendor ID */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of entries */ - AZALIA_SUBVENDOR(2, 0x80860101), - AZALIA_PIN_CFG(2, 0x05, 0x18560010), - AZALIA_PIN_CFG(2, 0x06, 0x18560010), - AZALIA_PIN_CFG(2, 0x07, 0x18560010), -}; - -const u32 pc_beep_verbs[] = {}; - -AZALIA_ARRAY_SIZES; - -#endif +//TODO diff --git a/src/mainboard/system76/cfl-h/variants/gaze14_1660ti_17/hda_verb.c b/src/mainboard/system76/cfl-h/variants/gaze14_1660ti_17/hda_verb.c index ce9aed8ae5..8ad1dfb535 100644 --- a/src/mainboard/system76/cfl-h/variants/gaze14_1660ti_17/hda_verb.c +++ b/src/mainboard/system76/cfl-h/variants/gaze14_1660ti_17/hda_verb.c @@ -1,52 +1 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2019 System76 - * - * 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 HDA_VERB_H -#define HDA_VERB_H - -#include - -const u32 cim_verb_data[] = { - /* Realtek, ALC293 */ - 0x10ec0293, /* Vendor ID */ - 0x15581325, /* Subsystem ID */ - 12, /* Number of entries */ - AZALIA_SUBVENDOR(0, 0x15581325), - AZALIA_PIN_CFG(0, 0x12, 0x90a60140), - AZALIA_PIN_CFG(0, 0x13, 0x40000000), - AZALIA_PIN_CFG(0, 0x14, 0x90170110), - AZALIA_PIN_CFG(0, 0x15, 0x02211020), - AZALIA_PIN_CFG(0, 0x16, 0x411111f0), - AZALIA_PIN_CFG(0, 0x18, 0x02a11050), - AZALIA_PIN_CFG(0, 0x19, 0x411111f0), - AZALIA_PIN_CFG(0, 0x1a, 0x411111f0), - AZALIA_PIN_CFG(0, 0x1b, 0x411111f0), - AZALIA_PIN_CFG(0, 0x1d, 0x41738205), - AZALIA_PIN_CFG(0, 0x1e, 0x02451130), - /* Intel, KabylakeHDMI */ - 0x8086280b, /* Vendor ID */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of entries */ - AZALIA_SUBVENDOR(2, 0x80860101), - AZALIA_PIN_CFG(2, 0x05, 0x18560010), - AZALIA_PIN_CFG(2, 0x06, 0x18560010), - AZALIA_PIN_CFG(2, 0x07, 0x18560010), -}; - -const u32 pc_beep_verbs[] = {}; - -AZALIA_ARRAY_SIZES; - -#endif +//TODO