GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mb/google/rex: add support for UWB 

UWB on Rex will have 2 options to connect to the SoC:
1. Through GSPI1 (muxed with FP)
2. bit-bang over GPP

This CL adds GSPI1 option. BB may be added later.

BUG=b:263413448, b:263499898
TEST=UWB ranging works on Rex with this CL

Change-Id: I93b3bcef84d775866df43d00c934f013e9f85c47
Signed-off-by: Eran Mitrani <mitrani@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/76665
Reviewed-by: Subrata Banik <subratabanik@google.com>
Reviewed-by: Kapil Porwal <kapilporwal@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
This commit is contained in:
Eran Mitrani 2023-07-21 12:02:33 -07:00 committed by Felix Held
parent 66d846f64a
commit b4f9c8d86a
3 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/mainboard/google/rex/Kconfig
View File

@ -53,6 +53,7 @@ config BOARD_GOOGLE_MODEL_REX
select DRIVERS_GENESYSLOGIC_GL9755 select DRIVERS_GENESYSLOGIC_GL9755
select DRIVERS_INTEL_ISH select DRIVERS_INTEL_ISH
select DRIVERS_INTEL_SOUNDWIRE select DRIVERS_INTEL_SOUNDWIRE
select DRIVERS_NXP_UWB_SR1XX
select DRIVERS_SOUNDWIRE_CS42L42 select DRIVERS_SOUNDWIRE_CS42L42
select DRIVERS_SOUNDWIRE_MAX98363 select DRIVERS_SOUNDWIRE_MAX98363

23
src/mainboard/google/rex/variants/rex0/fw_config.c
View File

@ -116,6 +116,20 @@ static const struct pad_config touchscreen_spi_int_pads[] = {
PAD_CFG_GPI_APIC(GPP_C07, NONE, PLTRST, EDGE_SINGLE, INVERT), PAD_CFG_GPI_APIC(GPP_C07, NONE, PLTRST, EDGE_SINGLE, INVERT),
}; };
static const struct pad_config uwb_gspi1_enable_pads[] = {
PAD_CFG_GPO_LOCK(GPP_D07, 0, LOCK_CONFIG), /* FPMCU_UWB_MUX_SEL */
PAD_CFG_GPO(GPP_E06, 0, DEEP), /* UWB_SOC_SYNC */
PAD_CFG_GPO(GPP_F19, 0, DEEP), /* EN_PP1800_UWB */
PAD_CFG_GPI_INT(GPP_F20, NONE, PLTRST, LEVEL), /* UWB_SOC_INT */
};
static const struct pad_config uwb_gspi1_disable_pads[] = {
PAD_CFG_GPO_LOCK(GPP_D07, 1, LOCK_CONFIG), /* FPMCU_UWB_MUX_SEL */
PAD_NC(GPP_E06, NONE),
PAD_NC(GPP_F19, NONE),
PAD_NC(GPP_F20, NONE),
};
void fw_config_gpio_padbased_override(struct pad_config *padbased_table) void fw_config_gpio_padbased_override(struct pad_config *padbased_table)
{ {
if (!fw_config_is_provisioned()) { if (!fw_config_is_provisioned()) {
@ -161,4 +175,13 @@ void fw_config_gpio_padbased_override(struct pad_config *padbased_table)
printk(BIOS_INFO, "Configure Touchscreen Interrupt for SPI.\n"); printk(BIOS_INFO, "Configure Touchscreen Interrupt for SPI.\n");
GPIO_PADBASED_OVERRIDE(padbased_table, touchscreen_spi_int_pads); GPIO_PADBASED_OVERRIDE(padbased_table, touchscreen_spi_int_pads);
} }
if (fw_config_probe(FW_CONFIG(UWB, UWB_GSPI1)) &&
fw_config_probe(FW_CONFIG(FP, FP_ABSENT))) {
printk(BIOS_INFO, "Configure GPIOs for UWB over GSPI1.\n");
GPIO_PADBASED_OVERRIDE(padbased_table, uwb_gspi1_enable_pads);
} else {
printk(BIOS_INFO, "Disabling UWB (absent or misconfigured)\n");
GPIO_PADBASED_OVERRIDE(padbased_table, uwb_gspi1_disable_pads);
}
} }

15
src/mainboard/google/rex/variants/rex0/overridetree.cb
View File

@ -776,8 +776,21 @@ chip soc/intel/meteorlake
register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_C23)" register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_C23)"
register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_B11)" register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_B11)"
register "enable_delay_ms" = "3" register "enable_delay_ms" = "3"
device spi 0 on end device spi 0 on
probe FP FP_PRESENT
end
end # FPMCU end # FPMCU
chip drivers/nxp/uwb
register "name" = ""UWB0""
register "desc" = ""NXP UWB Module""
register "speed" = "1000000" # 1 MHZ
register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_HIGH(GPP_F20)"
register "ce_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_F19)"
register "ri_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_E06)"
device spi 0 on
probe UWB UWB_GSPI1
end
end # UWB
end end
device ref soc_espi on device ref soc_espi on
chip ec/google/chromeec chip ec/google/chromeec