From 00f227a21616f6b771b896ac117dcc9b341651c8 Mon Sep 17 00:00:00 2001 From: Victor Ding Date: Thu, 3 Nov 2022 02:16:13 +0000 Subject: [PATCH] mb/google: Probe p-sensor only for selected variants Only a subset of variants has proximity sensors. This patch by itself does not introduce functional changes to any board. It is mainly to ease migrating SX9324 from the legacy driver to the linux one - allowing gradual migration variant by variant. BUG=b:242662878 TEST=Dump ACPI SSDT then verify they are identical w/ and w/o this patch Change-Id: Ic00e0d9eafcef2c9eaf32571fecf6190777cec36 Signed-off-by: Victor Ding Reviewed-on: https://review.coreboot.org/c/coreboot/+/69191 Reviewed-by: Reka Norman Tested-by: build bot (Jenkins) --- src/mainboard/google/brya/Kconfig | 1 - src/mainboard/google/brya/Kconfig.name | 5 +++++ src/mainboard/google/dedede/Kconfig | 2 -- src/mainboard/google/dedede/Kconfig.name | 6 ++++++ src/mainboard/google/zork/Kconfig | 1 - src/mainboard/google/zork/Kconfig.name | 1 + 6 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig index 68c2780c19..a114860a3c 100644 --- a/src/mainboard/google/brya/Kconfig +++ b/src/mainboard/google/brya/Kconfig @@ -6,7 +6,6 @@ config BOARD_GOOGLE_BRYA_COMMON select DRIVERS_I2C_GENERIC select DRIVERS_I2C_HID select DRIVERS_I2C_NAU8825 - select DRIVERS_I2C_SX9324 select DRIVERS_INTEL_DPTF select DRIVERS_INTEL_DPTF_SUPPORTS_TPCH select DRIVERS_INTEL_PMC diff --git a/src/mainboard/google/brya/Kconfig.name b/src/mainboard/google/brya/Kconfig.name index fc912054dd..4ead1f99e0 100644 --- a/src/mainboard/google/brya/Kconfig.name +++ b/src/mainboard/google/brya/Kconfig.name @@ -39,6 +39,7 @@ config BOARD_GOOGLE_BRYA0 select BOARD_GOOGLE_BASEBOARD_BRYA select SOC_INTEL_RAPTORLAKE select DRIVERS_GENESYSLOGIC_GL9755 + select DRIVERS_I2C_SX9324 select DRIVERS_INTEL_MIPI_CAMERA select SOC_INTEL_COMMON_BLOCK_IPU select SOC_INTEL_CRASHLOG @@ -83,6 +84,7 @@ config BOARD_GOOGLE_NIVVIKS select BOARD_ROMSIZE_KB_32768 select DRIVERS_GENERIC_GPIO_KEYS select DRIVERS_GENESYSLOGIC_GL9750 + select DRIVERS_I2C_SX9324 select DRIVERS_INTEL_MIPI_CAMERA select HAVE_WWAN_POWER_SEQUENCE @@ -136,6 +138,7 @@ config BOARD_GOOGLE_SKOLAS select BOARD_GOOGLE_BASEBOARD_SKOLAS select DRIVERS_GENESYSLOGIC_GL9755 select DRIVERS_INTEL_MIPI_CAMERA + select DRIVERS_I2C_SX9324 select SOC_INTEL_COMMON_BLOCK_IPU config BOARD_GOOGLE_SKOLAS4ES @@ -143,6 +146,7 @@ config BOARD_GOOGLE_SKOLAS4ES select BOARD_GOOGLE_BASEBOARD_SKOLAS select DRIVERS_GENESYSLOGIC_GL9755 select DRIVERS_INTEL_MIPI_CAMERA + select DRIVERS_I2C_SX9324 select SOC_INTEL_COMMON_BLOCK_IPU config BOARD_GOOGLE_TAEKO @@ -252,6 +256,7 @@ config BOARD_GOOGLE_PUJJO select DRIVERS_GENERIC_BAYHUB_LV2 select DRIVERS_GENERIC_GPIO_KEYS select DRIVERS_GENESYSLOGIC_GL9750 + select DRIVERS_I2C_SX9324 select HAVE_WWAN_POWER_SEQUENCE config BOARD_GOOGLE_XIVU diff --git a/src/mainboard/google/dedede/Kconfig b/src/mainboard/google/dedede/Kconfig index 476701805e..8901da3031 100644 --- a/src/mainboard/google/dedede/Kconfig +++ b/src/mainboard/google/dedede/Kconfig @@ -6,8 +6,6 @@ config BOARD_GOOGLE_BASEBOARD_DEDEDE select DRIVERS_I2C_GENERIC select DRIVERS_I2C_GPIO_MUX select DRIVERS_I2C_HID - select DRIVERS_I2C_SX9324 - select DRIVERS_I2C_SX9360 select DRIVERS_INTEL_DPTF select DRIVERS_SPI_ACPI select DRIVERS_USB_ACPI diff --git a/src/mainboard/google/dedede/Kconfig.name b/src/mainboard/google/dedede/Kconfig.name index 3bb63639a0..45cc1173ff 100644 --- a/src/mainboard/google/dedede/Kconfig.name +++ b/src/mainboard/google/dedede/Kconfig.name @@ -4,6 +4,7 @@ config BOARD_GOOGLE_BOTEN bool "-> Boten (Lenovo 500e Chromebook Gen 3)" select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50 select BASEBOARD_DEDEDE_LAPTOP + select DRIVERS_I2C_SX9324 select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR config BOARD_GOOGLE_DEDEDE @@ -106,6 +107,7 @@ config BOARD_GOOGLE_STORO bool "-> Storo (Asus Chromebook CR1100)" select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50 select BASEBOARD_DEDEDE_LAPTOP + select DRIVERS_I2C_SX9324 select DRIVERS_INTEL_MIPI_CAMERA select SOC_INTEL_COMMON_BLOCK_IPU select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR @@ -121,6 +123,7 @@ config BOARD_GOOGLE_KRACKO select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50 select BASEBOARD_DEDEDE_LAPTOP select DRIVERS_GENERIC_MAX98357A + select DRIVERS_I2C_SX9324 select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR config BOARD_GOOGLE_BLIPPER @@ -154,6 +157,7 @@ config BOARD_GOOGLE_BUGZZY select BASEBOARD_DEDEDE_LAPTOP select DRIVERS_GENERIC_MAX98357A select DRIVERS_I2C_DA7219 + select DRIVERS_I2C_SX9360 select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR config BOARD_GOOGLE_CORORI @@ -172,6 +176,7 @@ config BOARD_GOOGLE_GOOEY bool "-> Gooey" select BOARD_GOOGLE_BASEBOARD_DEDEDE_TPM2 select BASEBOARD_DEDEDE_LAPTOP + select DRIVERS_I2C_SX9324 select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR config BOARD_GOOGLE_BEADRIX @@ -179,6 +184,7 @@ config BOARD_GOOGLE_BEADRIX select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50 select BASEBOARD_DEDEDE_LAPTOP select DRIVERS_GENERIC_MAX98357A + select DRIVERS_I2C_SX9324 config BOARD_GOOGLE_SHOTZO bool "-> Shotzo" diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig index 25d4ca496e..d48399981c 100644 --- a/src/mainboard/google/zork/Kconfig +++ b/src/mainboard/google/zork/Kconfig @@ -21,7 +21,6 @@ config BOARD_SPECIFIC_OPTIONS select DRIVERS_GENERIC_ALC1015 select DRIVERS_I2C_GENERIC select DRIVERS_I2C_HID - select DRIVERS_I2C_SX9324 select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_AUDIO_CODEC select EC_GOOGLE_CHROMEEC_BOARDID diff --git a/src/mainboard/google/zork/Kconfig.name b/src/mainboard/google/zork/Kconfig.name index bac7ee42e0..7ba518a219 100644 --- a/src/mainboard/google/zork/Kconfig.name +++ b/src/mainboard/google/zork/Kconfig.name @@ -7,6 +7,7 @@ config BOARD_GOOGLE_DALBOZ config BOARD_GOOGLE_VILBOZ bool "-> Vilboz (Lenovo 100e/300e Gen3 AMD)" select BOARD_GOOGLE_BASEBOARD_DALBOZ + select DRIVERS_I2C_SX9324 config BOARD_GOOGLE_EZKINIL bool "-> Ezkinil (Acer Chromebook Spin 514)"