[S] Change in coreboot[master]: mb/google/brya/variants/volmar: Add firmware config field for FPMCU

[Eric Lai (Code Review)]

Eric Lai has submitted this change. ( https://review.coreboot.org/c/coreboot/+/68917 )

(

3 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
 )Change subject: mb/google/brya/variants/volmar: Add firmware config field for FPMCU
......................................................................

mb/google/brya/variants/volmar: Add firmware config field for FPMCU

The fingerprint(FP) feature is only for volmar,and it's not for zavala.
Add FPMCU_MASK field in fw_config to disable the FP function for
zavala, and reserve FP function for shipped volmar.
Define the value as following:

field FPMCU_MASK 10
    	option FPMCU_ENABLED		0
    	option FPMCU_DISABLED		1
    end

BUG=b:250807253
TEST=build firmware and verify the fp function in volmar DUT.
     write `disable=1` and 'enable=0' in FPCMU_MASK field.
     check the fp function and run `ectool --name cros_fp version`
     It works as expected.

Signed-off-by: Ren Kuo 
Change-Id: I867771904811459697056662d5e29c545a1a9474
Reviewed-on: https://review.coreboot.org/c/coreboot/+/68917
Reviewed-by: David Wu 
Reviewed-by: Eric Lai 
Reviewed-by: Tarun Tuli 
Reviewed-by: Nick Vaccaro 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/google/brya/variants/volmar/overridetree.cb
M src/mainboard/google/brya/variants/volmar/variant.c
2 files changed, 43 insertions(+), 1 deletion(-)

Approvals:
  build bot (Jenkins): Verified
  Nick Vaccaro: Looks good to me, approved
  David Wu: Looks good to me, but someone else must approve
  Ren Kuo: Looks good to me, but someone else must approve
  Eric Lai: Looks good to me, approved
  Tarun Tuli: Looks good to me, approved

diff --git a/src/mainboard/google/brya/variants/volmar/overridetree.cb b/src/mainboard/google/brya/variants/volmar/overridetree.cb
index ce5cbda..056467c 100644
--- a/src/mainboard/google/brya/variants/volmar/overridetree.cb
+++ b/src/mainboard/google/brya/variants/volmar/overridetree.cb
@@ -19,6 +19,10 @@
    	option BOOT_EMMC_DISABLED		0
    	option BOOT_EMMC_ENABLED		1
    end
+	field FPMCU_MASK 10
+		option FPMCU_ENABLED		0
+		option FPMCU_DISABLED		1
+	end
 end
 chip soc/intel/alderlake
    register "sagv" = "SaGv_Enabled"
@@ -321,7 +325,9 @@
    			register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_D1)"
    			register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D2)"
    			register "enable_delay_ms" = "3"
-				device spi 0 on end
+				device spi 0 on
+					probe FPMCU_MASK FPMCU_ENABLED
+				end
    		end # FPMCU
    	end
    	device ref pch_espi on
diff --git a/src/mainboard/google/brya/variants/volmar/variant.c b/src/mainboard/google/brya/variants/volmar/variant.c
index 86c65c7..d1ef1fa 100644
--- a/src/mainboard/google/brya/variants/volmar/variant.c
+++ b/src/mainboard/google/brya/variants/volmar/variant.c
@@ -14,4 +14,8 @@
 {
    config->cnvi_bt_audio_offload = fw_config_probe(FW_CONFIG(AUDIO,
    						MAX98373_NAU88L25B_I2S));
+
+	if (fw_config_probe(FW_CONFIG(FPMCU_MASK, FPMCU_DISABLED)))
+		config->serial_io_gspi_mode[PchSerialIoIndexGSPI1] = PchSerialIoDisabled;
+
 }