From 68d9b42b26b213f85f090309fdd3b27ad0e1c9a2 Mon Sep 17 00:00:00 2001 From: Tim Crawford Date: Mon, 27 Jun 2022 12:28:50 -0600 Subject: [PATCH] mb/system76/adl-p: Fix booting FSP debug build Fix assertions for SATA and I2C1 devices GPIOs. TODO: Test on darp8. Change-Id: I89dbd212a7dbd55c84d8ebbb7420b960da8175af Signed-off-by: Tim Crawford --- src/mainboard/system76/adl-p/devicetree.cb | 1 + src/mainboard/system76/adl-p/ramstage.c | 7 ++++++- src/mainboard/system76/adl-p/variants/darp8/gpio.c | 2 +- src/mainboard/system76/adl-p/variants/lemp11/gpio.c | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/mainboard/system76/adl-p/devicetree.cb b/src/mainboard/system76/adl-p/devicetree.cb index d74a1f92fa..99eb48d5e8 100644 --- a/src/mainboard/system76/adl-p/devicetree.cb +++ b/src/mainboard/system76/adl-p/devicetree.cb @@ -69,6 +69,7 @@ chip soc/intel/alderlake device ref heci1 on end device ref sata on + register "sata_salp_support" = "1" register "sata_ports_enable[1]" = "1" # SSD1 register "sata_ports_dev_slp[1]" = "1" # GPP_H12 (SATA1_DEVSLP1) end diff --git a/src/mainboard/system76/adl-p/ramstage.c b/src/mainboard/system76/adl-p/ramstage.c index cf1aaa0a29..c767f2dfe6 100644 --- a/src/mainboard/system76/adl-p/ramstage.c +++ b/src/mainboard/system76/adl-p/ramstage.c @@ -8,10 +8,15 @@ void mainboard_silicon_init_params(FSP_S_CONFIG *params) params->CnviRfResetPinMux = 0x194CE404; // GPP_F4 params->CnviClkreqPinMux = 0x394CE605; // GPP_F5 - params->PchSerialIoI2cSclPinMux[0] = 0x1947a405; // GPP_H5 params->PchSerialIoI2cSdaPinMux[0] = 0x1947c404; // GPP_H4 + params->PchSerialIoI2cSclPinMux[0] = 0x1947a405; // GPP_H5 + params->PchSerialIoI2cSdaPinMux[1] = 0x1947c606; // GPP_H6 + params->PchSerialIoI2cSclPinMux[1] = 0x1947a607; // GPP_H7 params->SataPortDevSlpPinMux[0] = 0x59673e0c; // GPP_H12 + params->SataPortDevSlpPinMux[1] = 0x5967400d; // GPP_H13 + + params->SataPortsSolidStateDrive[1] = 1; } static void mainboard_init(void *chip_info) diff --git a/src/mainboard/system76/adl-p/variants/darp8/gpio.c b/src/mainboard/system76/adl-p/variants/darp8/gpio.c index 271d49c4f5..2e8b0161b4 100644 --- a/src/mainboard/system76/adl-p/variants/darp8/gpio.c +++ b/src/mainboard/system76/adl-p/variants/darp8/gpio.c @@ -183,7 +183,7 @@ static const struct pad_config gpio_table[] = { PAD_CFG_NF(GPP_H9, NONE, DEEP, NF2), // CNVI_MFUART2_TXD //PAD_CFG_NF(GPP_H10, NONE, DEEP, NF1), // UART0_RX //PAD_CFG_NF(GPP_H11, NONE, DEEP, NF1), // UART0_TX - _PAD_CFG_STRUCT(GPP_H12, 0x44001500, 0x0000), // SATA1_DEVSLP1 + PAD_CFG_NF(GPP_H12, NONE, DEEP, NF1), // SATA1_DEVSLP1 PAD_NC(GPP_H13, NONE), //PAD_CFG_GPI(GPP_H14, NONE, DEEP), PAD_CFG_NF(GPP_H15, NONE, DEEP, NF1), // HDMI_CTRLCLK diff --git a/src/mainboard/system76/adl-p/variants/lemp11/gpio.c b/src/mainboard/system76/adl-p/variants/lemp11/gpio.c index fb49ac76d8..cda39b78af 100644 --- a/src/mainboard/system76/adl-p/variants/lemp11/gpio.c +++ b/src/mainboard/system76/adl-p/variants/lemp11/gpio.c @@ -183,7 +183,7 @@ static const struct pad_config gpio_table[] = { PAD_CFG_NF(GPP_H9, NONE, DEEP, NF2), // CNVI_MFUART2_TXD //PAD_CFG_NF(GPP_H10, NONE, DEEP, NF1), // UART0_RX //PAD_CFG_NF(GPP_H11, NONE, DEEP, NF1), // UART0_TX - _PAD_CFG_STRUCT(GPP_H12, 0x44001500, 0x0000), // SATA1_DEVSLP1 + PAD_CFG_NF(GPP_H12, NONE, DEEP, NF1), // SATA1_DEVSLP1 PAD_NC(GPP_H13, NONE), //PAD_NC(GPP_H14, NONE), PAD_CFG_NF(GPP_H15, NONE, DEEP, NF1), // HDMI_CTRLCLK