Sean Rhodes has submitted this change. ( https://review.coreboot.org/c/coreboot/+/85692?usp=email )
Change subject: mb/starlabs/*: Unify WiFi driver settings ......................................................................
mb/starlabs/*: Unify WiFi driver settings
Adjust ACPI so they are consistant across all boards.
Change-Id: If0fd6b3dd67583842e4520679b7a9c3ab9f433c4 Signed-off-by: Sean Rhodes sean@starlabs.systems Reviewed-on: https://review.coreboot.org/c/coreboot/+/85692 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Matt DeVillier matt.devillier@gmail.com --- M src/mainboard/starlabs/byte_adl/variants/mk_ii/devicetree.cb M src/mainboard/starlabs/lite/variants/glk/devicetree.cb M src/mainboard/starlabs/lite/variants/glkr/devicetree.cb M src/mainboard/starlabs/starbook/variants/adl/devicetree.cb M src/mainboard/starlabs/starbook/variants/cml/devicetree.cb M src/mainboard/starlabs/starbook/variants/kbl/devicetree.cb M src/mainboard/starlabs/starbook/variants/rpl/devicetree.cb M src/mainboard/starlabs/starbook/variants/tgl/devicetree.cb M src/mainboard/starlabs/starfighter/variants/rpl/devicetree.cb M src/mainboard/starlabs/starlite_adl/variants/mk_v/devicetree.cb 10 files changed, 23 insertions(+), 13 deletions(-)
Approvals: Matt DeVillier: Looks good to me, approved build bot (Jenkins): Verified
diff --git a/src/mainboard/starlabs/byte_adl/variants/mk_ii/devicetree.cb b/src/mainboard/starlabs/byte_adl/variants/mk_ii/devicetree.cb index 3753b46..5236ba5 100644 --- a/src/mainboard/starlabs/byte_adl/variants/mk_ii/devicetree.cb +++ b/src/mainboard/starlabs/byte_adl/variants/mk_ii/devicetree.cb @@ -132,7 +132,13 @@ end end device ref shared_sram on end - device ref cnvi_wifi on end + device ref cnvi_wifi on + chip drivers/wifi/generic + register "add_acpi_dma_property" = "true" + register "enable_cnvi_ddr_rfim" = "true" + device generic 0 on end + end + end device ref sata on register "sata_salp_support" = "1" register "sata_ports_enable[0]" = "1" diff --git a/src/mainboard/starlabs/lite/variants/glk/devicetree.cb b/src/mainboard/starlabs/lite/variants/glk/devicetree.cb index b93d566..629668e 100644 --- a/src/mainboard/starlabs/lite/variants/glk/devicetree.cb +++ b/src/mainboard/starlabs/lite/variants/glk/devicetree.cb @@ -60,7 +60,8 @@ end device ref cnvi on chip drivers/wifi/generic - register "wake" = "GPE0A_CNVI_PME_STS" + register "add_acpi_dma_property" = "true" + register "enable_cnvi_ddr_rfim" = "true" device generic 0 on end end end diff --git a/src/mainboard/starlabs/lite/variants/glkr/devicetree.cb b/src/mainboard/starlabs/lite/variants/glkr/devicetree.cb index 65ac609..549c022 100644 --- a/src/mainboard/starlabs/lite/variants/glkr/devicetree.cb +++ b/src/mainboard/starlabs/lite/variants/glkr/devicetree.cb @@ -60,7 +60,8 @@ end device ref cnvi on chip drivers/wifi/generic - register "wake" = "GPE0A_CNVI_PME_STS" + register "add_acpi_dma_property" = "true" + register "enable_cnvi_ddr_rfim" = "true" device generic 0 on end end end diff --git a/src/mainboard/starlabs/starbook/variants/adl/devicetree.cb b/src/mainboard/starlabs/starbook/variants/adl/devicetree.cb index 330e440..3d17a19 100644 --- a/src/mainboard/starlabs/starbook/variants/adl/devicetree.cb +++ b/src/mainboard/starlabs/starbook/variants/adl/devicetree.cb @@ -145,7 +145,7 @@ end device ref pcie_rp5 on # WiFi chip drivers/wifi/generic - register "wake" = "GPE0_PME_B0" + register "enable_cnvi_ddr_rfim" = "true" device generic 0 on end end register "pch_pcie_rp[PCH_RP(5)]" = "{ @@ -163,7 +163,7 @@ register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D13)" register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_H2)" register "srcclk_pin" = "2" - register "add_acpi_dma_property" = "1" + register "add_acpi_dma_property" = "true" register "skip_on_off_support" = "1" register "ext_pm_support" = "ACPI_PCIE_RP_EMIT_ALL" register "use_rp_mutex" = "1" diff --git a/src/mainboard/starlabs/starbook/variants/cml/devicetree.cb b/src/mainboard/starlabs/starbook/variants/cml/devicetree.cb index 6569b04..d390a88 100644 --- a/src/mainboard/starlabs/starbook/variants/cml/devicetree.cb +++ b/src/mainboard/starlabs/starbook/variants/cml/devicetree.cb @@ -132,7 +132,8 @@ device ref shared_sram on end device ref cnvi_wifi on chip drivers/wifi/generic - register "wake" = "GPE0_PME_B0" + register "add_acpi_dma_property" = "true" + register "enable_cnvi_ddr_rfim" = "true" device generic 0 on end end end diff --git a/src/mainboard/starlabs/starbook/variants/kbl/devicetree.cb b/src/mainboard/starlabs/starbook/variants/kbl/devicetree.cb index a594f7a..f50e35d 100644 --- a/src/mainboard/starlabs/starbook/variants/kbl/devicetree.cb +++ b/src/mainboard/starlabs/starbook/variants/kbl/devicetree.cb @@ -90,6 +90,8 @@ register "PcieRpClkSrcNumber[5]" = "4" register "PcieRpLtrEnable[5]" = "1" chip drivers/wifi/generic + register "add_acpi_dma_property" = "true" + register "enable_cnvi_ddr_rfim" = "true" device generic 0 on end end end diff --git a/src/mainboard/starlabs/starbook/variants/rpl/devicetree.cb b/src/mainboard/starlabs/starbook/variants/rpl/devicetree.cb index dc27e4e..c54a9b4 100644 --- a/src/mainboard/starlabs/starbook/variants/rpl/devicetree.cb +++ b/src/mainboard/starlabs/starbook/variants/rpl/devicetree.cb @@ -182,7 +182,7 @@ device ref shared_sram on end device ref pcie_rp5 on # WiFi chip drivers/wifi/generic - register "wake" = "GPE0_PME_B0" + register "enable_cnvi_ddr_rfim" = "true" device generic 0 on end end register "pch_pcie_rp[PCH_RP(5)]" = "{ @@ -200,8 +200,8 @@ register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D13)" register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_H2)" register "srcclk_pin" = "2" - register "add_acpi_dma_property" = "1" register "skip_on_off_support" = "1" + register "add_acpi_dma_property" = "true" register "ext_pm_support" = "ACPI_PCIE_RP_EMIT_ALL" register "use_rp_mutex" = "1" device generic 0 on end diff --git a/src/mainboard/starlabs/starbook/variants/tgl/devicetree.cb b/src/mainboard/starlabs/starbook/variants/tgl/devicetree.cb index b7b93d5..8dfece7 100644 --- a/src/mainboard/starlabs/starbook/variants/tgl/devicetree.cb +++ b/src/mainboard/starlabs/starbook/variants/tgl/devicetree.cb @@ -164,7 +164,8 @@ device ref shared_ram on end device ref cnvi_wifi on chip drivers/wifi/generic - register "wake" = "GPE0_PME_B0" + register "add_acpi_dma_property" = "true" + register "enable_cnvi_ddr_rfim" = "true" device generic 0 on end end end diff --git a/src/mainboard/starlabs/starfighter/variants/rpl/devicetree.cb b/src/mainboard/starlabs/starfighter/variants/rpl/devicetree.cb index c3b9792..1f5bf5e 100644 --- a/src/mainboard/starlabs/starfighter/variants/rpl/devicetree.cb +++ b/src/mainboard/starlabs/starfighter/variants/rpl/devicetree.cb @@ -189,7 +189,7 @@ end device ref pcie_rp5 on # WiFi chip drivers/wifi/generic - register "wake" = "GPE0_PME_B0" + register "enable_cnvi_ddr_rfim" = "true" device generic 0 on end end register "pch_pcie_rp[PCH_RP(5)]" = "{ @@ -207,7 +207,7 @@ register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D13)" register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_H2)" register "srcclk_pin" = "2" - register "add_acpi_dma_property" = "1" + register "add_acpi_dma_property" = "true" register "skip_on_off_support" = "1" register "ext_pm_support" = "ACPI_PCIE_RP_EMIT_ALL" register "use_rp_mutex" = "1" diff --git a/src/mainboard/starlabs/starlite_adl/variants/mk_v/devicetree.cb b/src/mainboard/starlabs/starlite_adl/variants/mk_v/devicetree.cb index b127716..43e5bc9 100644 --- a/src/mainboard/starlabs/starlite_adl/variants/mk_v/devicetree.cb +++ b/src/mainboard/starlabs/starlite_adl/variants/mk_v/devicetree.cb @@ -125,10 +125,8 @@ device ref shared_sram on end device ref cnvi_wifi on chip drivers/wifi/generic - register "wake" = "GPE0_PME_B0" register "add_acpi_dma_property" = "true" register "enable_cnvi_ddr_rfim" = "true" - use usb2_port10 as bluetooth_companion device generic 0 on end end end