mb/intel/adlrvp: Add 5G WWAN ACPI support for ADL-P RVP
Add FM350GL 5G WWAN support using drivers/wwan/fm and additional PM
features from RTD3.
PCIe root port: 6 (1 based)
clock source & request: 5 (0 based)
GPIOs:
WWAN_PERST_N: GPPC_C5
WWAN_RST_N: GPPC_F14
WWAN_FCP_OFF_N: GPPC_F15
WWAN_WAKE_N: GPPC_D18
WWAN_PWREN: GPPC_F21
WWAN_DISABLE_N: GPPC_D15
CLKREQ5_WWAN_N: GPPC_H23
TEST=Check SSDT table to see if the PXSX device and PowerResource RTD3
are generated under the root port.
BRANCH=firmware-brya-14505.B
Signed-off-by: Cliff Huang <cliff.huang@intel.com>
Change-Id: I10902245e3a5e05cd2af9030394933e936c25396
Reviewed-on: https://review.coreboot.org/c/coreboot/+/63941
Reviewed-by: Jeremy Compostella <jeremy.compostella@intel.corp-partner.google.com>
Reviewed-by: Anil Kumar K <anil.kumar.k@intel.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Bora Guvendik <bora.guvendik@intel.com>
diff --git a/src/mainboard/intel/adlrvp/Kconfig b/src/mainboard/intel/adlrvp/Kconfig
index 3b59d03..c970145 100644
--- a/src/mainboard/intel/adlrvp/Kconfig
+++ b/src/mainboard/intel/adlrvp/Kconfig
@@ -31,6 +31,7 @@
select INTEL_LPSS_UART_FOR_CONSOLE
select SOC_INTEL_ALDERLAKE_PCH_P
select GEN3_EXTERNAL_CLOCK_BUFFER
+ select DRIVERS_WWAN_FM350GL
config BOARD_INTEL_ADLRVP_RPL_EXT_EC
select SOC_INTEL_RAPTORLAKE
diff --git a/src/mainboard/intel/adlrvp/early_gpio.c b/src/mainboard/intel/adlrvp/early_gpio.c
index af933eb..932f2d4 100644
--- a/src/mainboard/intel/adlrvp/early_gpio.c
+++ b/src/mainboard/intel/adlrvp/early_gpio.c
@@ -6,8 +6,12 @@
/* Early pad configuration in bootblock */
static const struct pad_config early_gpio_table[] = {
- /* WWAN_RST# */
- PAD_CFG_GPO(GPP_F14, 0, PLTRST),
+ /* WWAN_RST# (updated in ramstage) */
+ PAD_CFG_GPO(GPP_F14, 0, DEEP),
+ /* WWAN_PERST_L (updated in ramstage) */
+ PAD_CFG_GPO(GPP_C5, 0, DEEP),
+ /* WWAN_FCPO_L (updated in romstage) */
+ PAD_CFG_GPO(GPP_F15, 0, DEEP),
/* WWAN_PWR_EN */
PAD_CFG_GPO(GPP_F21, 1, DEEP),
/* SMB_CLK */
diff --git a/src/mainboard/intel/adlrvp/gpio.c b/src/mainboard/intel/adlrvp/gpio.c
index e4483d2..d7cc6bd 100644
--- a/src/mainboard/intel/adlrvp/gpio.c
+++ b/src/mainboard/intel/adlrvp/gpio.c
@@ -48,13 +48,15 @@
/* WWAN WAKE N*/
PAD_CFG_GPI_IRQ_WAKE(GPP_D18, NONE, DEEP, LEVEL, INVERT),
/* WWAN_DISABLE_N */
- PAD_CFG_GPO(GPP_D15, 1, PLTRST),
+ PAD_CFG_GPO(GPP_D15, 1, DEEP),
/* WWAN_RST# */
- PAD_CFG_GPO(GPP_F14, 1, PLTRST),
+ PAD_CFG_GPO(GPP_F14, 1, DEEP),
+ /* WWAN_FCP_OFF_N */
+ PAD_CFG_GPO(GPP_F15, 1, DEEP),
/* WWAN_PWR_EN */
PAD_CFG_GPO(GPP_F21, 1, DEEP),
/* WWAN_PERST# */
- PAD_CFG_GPO(GPP_C5, 1, PLTRST),
+ PAD_CFG_GPO(GPP_C5, 1, DEEP),
/* PEG_SLOT_WAKE_N */
PAD_CFG_GPI(GPP_A20, NONE, PLTRST),
/* CAM CONN1 CLKEN */
@@ -257,7 +259,8 @@
PAD_CFG_NF(GPP_H20, NONE, DEEP, NF1),
PAD_CFG_NF(GPP_H21, NONE, DEEP, NF1),
PAD_CFG_NF(GPP_H22, NONE, DEEP, NF1),
- PAD_NC(GPP_H23, NONE),
+ /* H23 : CLKREQ5_WWAN_N */
+ PAD_CFG_NF(GPP_H23, NONE, DEEP, NF1),
/* A21 : HDMI CRLS CTRLCLK */
PAD_CFG_NF(GPP_A21, NONE, DEEP, NF1),
diff --git a/src/mainboard/intel/adlrvp/variants/adlrvp_p_ext_ec/overridetree.cb b/src/mainboard/intel/adlrvp/variants/adlrvp_p_ext_ec/overridetree.cb
index de5471c..2eea1e4 100644
--- a/src/mainboard/intel/adlrvp/variants/adlrvp_p_ext_ec/overridetree.cb
+++ b/src/mainboard/intel/adlrvp/variants/adlrvp_p_ext_ec/overridetree.cb
@@ -57,5 +57,32 @@
end
end
end
+ device ref pcie_rp6 on
+ # Enable WWAN PCIE 6 using clk 5
+ register "pch_pcie_rp[PCH_RP(6)]" = "{
+ .clk_src = 5,
+ .clk_req = 5,
+ .flags = PCIE_RP_LTR | PCIE_RP_AER,
+ }"
+ chip soc/intel/common/block/pcie/rtd3
+ register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_C5)"
+ register "reset_off_delay_ms" = "20"
+ register "srcclk_pin" = "5"
+ register "ext_pm_support" = "ACPI_PCIE_RP_EMIT_ALL"
+ register "skip_on_off_support" = "true"
+ device generic 0 alias rp6_rtd3 on
+ end
+ end
+ chip drivers/wwan/fm
+ register "fcpo_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_F15)"
+ register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_F14)"
+ register "perst_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_C5)"
+ register "wake_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_D18)"
+ register "add_acpi_dma_property" = "true"
+ use rp6_rtd3 as rtd3dev
+ device generic 0 on
+ end
+ end
+ end
end
end