Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/51154 )
Change subject: soc/intel: Retype `CnviBtAudioOffload` devicetree option ......................................................................
soc/intel: Retype `CnviBtAudioOffload` devicetree option
The `FORCE_ENABLE` and `FORCE_DISABLE` names do not match what FSP UPDs say, and can be confused with the `PchHdaTestPowerClockGating` UPD.
Replace the enum with a bool, and drop the confusing names. Note that the enum for Ice Lake was incorrect, but no mainboards used the option.
Change-Id: I2c9b4c6a2f210ffca946ca196299fa672a06ccc7 Signed-off-by: Angel Pons th3fanbus@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/51154 Reviewed-by: Furquan Shaikh furquan@google.com Reviewed-by: Tim Wawrzynczak twawrzynczak@chromium.org Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/mainboard/google/volteer/variants/baseboard/devicetree.cb M src/soc/intel/alderlake/chip.h M src/soc/intel/elkhartlake/chip.h M src/soc/intel/icelake/chip.h M src/soc/intel/jasperlake/chip.h M src/soc/intel/tigerlake/chip.h 6 files changed, 6 insertions(+), 22 deletions(-)
Approvals: build bot (Jenkins): Verified Furquan Shaikh: Looks good to me, approved Tim Wawrzynczak: Looks good to me, approved
diff --git a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb index 6a826c0..825005e 100644 --- a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb @@ -289,7 +289,7 @@
register "tcc_offset" = "10" # TCC of 90
- register "CnviBtAudioOffload" = "FORCE_ENABLE" + register "CnviBtAudioOffload" = "true"
# Intel Common SoC Config #+-------------------+---------------------------+ diff --git a/src/soc/intel/alderlake/chip.h b/src/soc/intel/alderlake/chip.h index 13e77cf..fa9fce2 100644 --- a/src/soc/intel/alderlake/chip.h +++ b/src/soc/intel/alderlake/chip.h @@ -207,10 +207,7 @@ uint8_t pch_isclk;
/* CNVi BT Audio Offload: Enable/Disable BT Audio Offload. */ - enum { - FORCE_DISABLE, - FORCE_ENABLE, - } CnviBtAudioOffload; + bool CnviBtAudioOffload;
/* * IOM Port Config diff --git a/src/soc/intel/elkhartlake/chip.h b/src/soc/intel/elkhartlake/chip.h index 1d97b36..c3a7ac1 100644 --- a/src/soc/intel/elkhartlake/chip.h +++ b/src/soc/intel/elkhartlake/chip.h @@ -196,10 +196,7 @@ unsigned int sdcard_cd_gpio;
/* CNVi BT Audio Offload: Enable/Disable BT Audio Offload. */ - enum { - FORCE_DISABLE, - FORCE_ENABLE, - } CnviBtAudioOffload; + bool CnviBtAudioOffload;
/* Tcss */ uint8_t TcssXhciEn; diff --git a/src/soc/intel/icelake/chip.h b/src/soc/intel/icelake/chip.h index 64bc70b..b878fd6 100644 --- a/src/soc/intel/icelake/chip.h +++ b/src/soc/intel/icelake/chip.h @@ -184,11 +184,7 @@ uint8_t pch_isclk;
/* CNVi BT Audio Offload: Enable/Disable BT Audio Offload. */ - enum { - PLATFORM_POR, - FORCE_ENABLE, - FORCE_DISABLE, - } CnviBtAudioOffload; + bool CnviBtAudioOffload;
/* * Override GPIO PM configuration: diff --git a/src/soc/intel/jasperlake/chip.h b/src/soc/intel/jasperlake/chip.h index 6e52efd..c25ccbf 100644 --- a/src/soc/intel/jasperlake/chip.h +++ b/src/soc/intel/jasperlake/chip.h @@ -199,10 +199,7 @@ uint8_t pch_isclk;
/* CNVi BT Audio Offload: Enable/Disable BT Audio Offload. */ - enum { - FORCE_DISABLE, - FORCE_ENABLE, - } CnviBtAudioOffload; + bool CnviBtAudioOffload;
/* Tcss */ uint8_t TcssXhciEn; diff --git a/src/soc/intel/tigerlake/chip.h b/src/soc/intel/tigerlake/chip.h index cccf804..76a2480 100644 --- a/src/soc/intel/tigerlake/chip.h +++ b/src/soc/intel/tigerlake/chip.h @@ -317,10 +317,7 @@ } debug_interface_flag;
/* CNVi BT Audio Offload: Enable/Disable BT Audio Offload. */ - enum { - FORCE_DISABLE, - FORCE_ENABLE, - } CnviBtAudioOffload; + bool CnviBtAudioOffload;
/* TCSS USB */ uint8_t TcssXhciEn;