mb/google/nissa/var/quandiso: Tune P-sensor

Update proximity sensor tuning value from dedede/kracko tuning.
Remove GPIO override to use the configuration from nissa baseboard:
- GPP_B5  ==>   SOC_I2C_SUB_SDA
- GPP_B6  ==>	SOC_I2C_SUB_SCL

BUG=b:310050220
BRANCH=firmware-nissa-15217.B
TEST=emerge-nissa coreboot

Change-Id: I7c687677a797415d80be4c420484d3346a8455f6
Signed-off-by: Robert Chen <robert.chen@quanta.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/79247
Reviewed-by: Sumeet R Pawnikar <sumeet.r.pawnikar@intel.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Eric Lai <ericllai@google.com>

3 files changed, 16 insertions, 48 deletions

diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig
index c6a4987d36..fb62880295 100644
--- a/src/mainboard/google/brya/Kconfig
+++ b/src/mainboard/google/brya/Kconfig
@@ -358,7 +358,6 @@ config BOARD_GOOGLE_QUANDISO
 	select DRIVERS_GENESYSLOGIC_GL9750
 	select DRIVERS_GENERIC_GPIO_KEYS
 	select DRIVERS_I2C_SX9324
-	select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER
 	select HAVE_WWAN_POWER_SEQUENCE
 	select INTEL_GMA_HAVE_VBT
 
diff --git a/src/mainboard/google/brya/variants/quandiso/gpio.c b/src/mainboard/google/brya/variants/quandiso/gpio.c
index 2e2a6f5f62..55b2905e31 100644
--- a/src/mainboard/google/brya/variants/quandiso/gpio.c
+++ b/src/mainboard/google/brya/variants/quandiso/gpio.c
@@ -16,11 +16,6 @@ static const struct pad_config override_gpio_table[] = {
 	/* A22 : GPP_A22 ==> USB_C1_AUX_DC_N */
 	PAD_CFG_GPO(GPP_A22, 1, DEEP),
 
-	/* B5  : I2C2_SDA ==> I2C_P_SENSOR_SDA */
-	PAD_CFG_NF(GPP_B5, NONE, DEEP, NF2),
-	/* B6  : I2C2_SCL ==> I2C_P_SENSOR_SCL */
-	PAD_CFG_NF(GPP_B6, NONE, DEEP, NF2),
-
 	/* C1  : SMBDATA ==> USI_RST_L */
 	PAD_CFG_GPO(GPP_C1, 1, DEEP),
 
diff --git a/src/mainboard/google/brya/variants/quandiso/overridetree.cb b/src/mainboard/google/brya/variants/quandiso/overridetree.cb
index 205fd2bc3b..de48f2d586 100644
--- a/src/mainboard/google/brya/variants/quandiso/overridetree.cb
+++ b/src/mainboard/google/brya/variants/quandiso/overridetree.cb
@@ -290,48 +290,22 @@ chip soc/intel/alderlake
 				register "desc" = ""SAR Proximity Sensor""
 				register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_H19_IRQ)"
 				register "speed" = "I2C_SPEED_FAST"
-				register "uid" = "1"
-				register "reg_gnrl_ctrl0" = "0x16"
-				register "reg_gnrl_ctrl1" = "0x21"
-				register "reg_afe_ctrl0" = "0x00"
-				register "reg_afe_ctrl1" = "0x10"
-				register "reg_afe_ctrl2" = "0x00"
-				register "reg_afe_ctrl3" = "0x00"
-				register "reg_afe_ctrl4" = "0x07"
-				register "reg_afe_ctrl5" = "0x00"
-				register "reg_afe_ctrl6" = "0x00"
-				register "reg_afe_ctrl7" = "0x07"
-				register "reg_afe_ctrl8" = "0x12"
-				register "reg_afe_ctrl9" = "0x0f"
-				register "reg_prox_ctrl0" = "0x12"
-				register "reg_prox_ctrl1" = "0x12"
-				register "reg_prox_ctrl2" = "0x90"
-				register "reg_prox_ctrl3" = "0x60"
-				register "reg_prox_ctrl4" = "0x0c"
-				register "reg_prox_ctrl5" = "0x12"
-				register "reg_prox_ctrl6" = "0x3c"
-				register "reg_prox_ctrl7" = "0x58"
-				register "reg_adv_ctrl0" = "0x00"
-				register "reg_adv_ctrl1" = "0x00"
-				register "reg_adv_ctrl2" = "0x00"
-				register "reg_adv_ctrl3" = "0x00"
-				register "reg_adv_ctrl4" = "0x00"
-				register "reg_adv_ctrl5" = "0x05"
-				register "reg_adv_ctrl6" = "0x00"
-				register "reg_adv_ctrl7" = "0x00"
-				register "reg_adv_ctrl8" = "0x00"
-				register "reg_adv_ctrl9" = "0x00"
-				register "reg_adv_ctrl10" = "0x5c"
-				register "reg_adv_ctrl11" = "0x52"
-				register "reg_adv_ctrl12" = "0xb5"
-				register "reg_adv_ctrl13" = "0x00"
-				register "reg_adv_ctrl14" = "0x80"
-				register "reg_adv_ctrl15" = "0x0c"
-				register "reg_adv_ctrl16" = "0x38"
-				register "reg_adv_ctrl17" = "0x56"
-				register "reg_adv_ctrl18" = "0x33"
-				register "reg_adv_ctrl19" = "0xf0"
-				register "reg_adv_ctrl20" = "0xf0"
+				register "uid" = "2"
+
+				register "ph0_pin" = "{3, 1, 3}"
+				register "ph1_pin" = "{1, 2, 2}"
+				register "ph2_pin" = "{3, 3, 1}"
+				register "ph3_pin" = "{1, 3, 3}"
+				register "ph01_resolution" = "1024"
+				register "ph23_resolution" = "1024"
+				register "startup_sensor" = "1"
+				register "ph01_proxraw_strength" = "3"
+				register "ph23_proxraw_strength" = "3"
+				register "avg_pos_strength" = "256"
+				register "cs_idle_sleep" = ""gnd""
+				register "int_comp_resistor" = ""lowest""
+				register "input_precharge_resistor_ohms" = "4000"
+				register "input_analog_gain" = "3"
 				device i2c 28 on
 					probe DB_USB DB_LTE
 					probe DB_USB DB_1C_LTE