zephyr: convert PLATFORM_EC_I2C to a helper symbol

Convert CONFIG_PLATFORM_EC_I2C to a helper symbol that is automatically
enabled if the Zephyr CONFIG_I2C option is enabled.

BUG=b:217926701
BRANCH=none
TEST=zmake testall

Signed-off-by: Keith Short <keithshort@chromium.org>
Change-Id: I5aab26b0dea609a706b07ed752503f7432848136
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3575084
Reviewed-by: Aaron Massey <aaronmassey@google.com>

14 files changed, 21 insertions, 21 deletions

diff --git a/docs/zephyr/zephyr_i2c.md b/docs/zephyr/zephyr_i2c.md
index 7ded5b2242..4f001e4408 100644
--- a/docs/zephyr/zephyr_i2c.md
+++ b/docs/zephyr/zephyr_i2c.md
@@ -9,7 +9,7 @@ USB-C chips, battery, charging IC, and sensors.
 
 ## Kconfig Options
 
-The Kconfig option `CONFIG_PLATFORM_EC_I2C` enables I2C support in the EC
+The Kconfig option [`CONFIG_I2C`] enables I2C support in the EC
 application.  Refer to [Kconfig.i2c] for all sub-options related to I2C support.
 
 The upstream Zephyr I2C driver also provides I2C shell commands with the
@@ -348,6 +348,7 @@ below:
 [subcommands]: https://github.com/zephyrproject-rtos/zephyr/blob/f4a0ea7b43eee4d2ee735ab6beccc68c9d40a7d0/drivers/i2c/i2c_shell.c#L245
 [I2C Example]: ../images/i2c_example.png
 [Kconfig.i2c]: ../../zephyr/Kconfig.i2c
+[`CONFIG_I2C`]: https://docs.zephyrproject.org/latest/kconfig.html#CONFIG_I2C
 [`CONFIG_I2C_SHELL`]: https://docs.zephyrproject.org/latest/kconfig.html#CONFIG_I2C_SHELL
 [cros-ec-i2c-port-base.yaml]: https://source.chromium.org/chromiumos/chromiumos/codesearch/+/main:src/platform/ec/zephyr/dts/bindings/i2c/cros-ec-i2c-port-base.yaml
 [volteer.dts]: https://source.chromium.org/chromiumos/chromiumos/codesearch/+/main:src/platform/ec/zephyr/boards/arm/volteer/volteer.dts;
diff --git a/zephyr/Kconfig.i2c b/zephyr/Kconfig.i2c
index 350c347d5c..23ccf88bd0 100644
--- a/zephyr/Kconfig.i2c
+++ b/zephyr/Kconfig.i2c
@@ -3,10 +3,7 @@
 # found in the LICENSE file.
 
 config PLATFORM_EC_I2C
-	bool "I2C shim"
-	default n if ARCH_POSIX
-	default y
-	imply I2C
+	def_bool I2C
 	help
 	  Enable compilation of the EC i2c module. Once enabled, it will be
 	  possible to make calls using the old platform/ec i2c APIs defined
@@ -18,7 +15,6 @@ if PLATFORM_EC_I2C
 
 config PLATFORM_EC_I2C_DEBUG
 	bool "I2C Tracing"
-	default n if ARCH_POSIX
 	help
 	  This option enables I2C bus communication tracing. Use the console
 	  command "i2ctrace" to enable and disable tracing on specific I2C
@@ -37,7 +33,6 @@ config PLATFORM_EC_I2C_PASSTHRU_RESTRICTED
 
 config PLATFORM_EC_I2C_DEBUG_PASSTHRU
 	bool "I2C Passthru Debug"
-	default n if ARCH_POSIX
 	help
 	  This option enables extra debug for I2C passthru operations initiated
 	  by the AP.
diff --git a/zephyr/boards/riscv/it8xxx2/it8xxx2_defconfig b/zephyr/boards/riscv/it8xxx2/it8xxx2_defconfig
index c370db274e..9650d50caf 100644
--- a/zephyr/boards/riscv/it8xxx2/it8xxx2_defconfig
+++ b/zephyr/boards/riscv/it8xxx2/it8xxx2_defconfig
@@ -44,8 +44,8 @@ CONFIG_PLATFORM_EC_CONSOLE_CMD_FLASH=y
 CONFIG_SOC_FLASH_ITE_IT8XXX2=y
 
 # I2C
+CONFIG_I2C=y
 CONFIG_I2C_ITE_IT8XXX2=y
-CONFIG_PLATFORM_EC_I2C=y
 
 # Pinmux Driver
 CONFIG_PINMUX=y
diff --git a/zephyr/projects/brya/prj.conf b/zephyr/projects/brya/prj.conf
index 129879fb98..f4f7569458 100644
--- a/zephyr/projects/brya/prj.conf
+++ b/zephyr/projects/brya/prj.conf
@@ -15,7 +15,6 @@ CONFIG_PLATFORM_EC_VBOOT_EFS2=y
 CONFIG_PLATFORM_EC_VBOOT_HASH=y
 CONFIG_PLATFORM_EC_EXTPOWER_GPIO=y
 CONFIG_PLATFORM_EC_CONSOLE_CMD_SYSINFO=y
-CONFIG_PLATFORM_EC_I2C=y
 
 CONFIG_PLATFORM_EC_ADC_CHANNELS_RUNTIME_CONFIG=y
 
@@ -39,6 +38,9 @@ CONFIG_ESPI=y
 CONFIG_PLATFORM_EC_ESPI_VW_SLP_S4=y
 CONFIG_PLATFORM_EC_ESPI_VW_SLP_S5=y
 
+# I2C
+CONFIG_I2C=y
+
 # Power Sequencing
 CONFIG_PLATFORM_EC_POWERSEQ=y
 CONFIG_PLATFORM_EC_POWERSEQ_RTC_RESET=y
diff --git a/zephyr/projects/corsola/prj.conf b/zephyr/projects/corsola/prj.conf
index bf08abb714..1615aad9ad 100644
--- a/zephyr/projects/corsola/prj.conf
+++ b/zephyr/projects/corsola/prj.conf
@@ -6,6 +6,9 @@
 # http://google3/hardware/standards/usb/
 CONFIG_PLATFORM_EC_USB_PID=0x505C
 
+# I2C
+CONFIG_I2C=y
+
 # Keyboard
 CONFIG_PLATFORM_EC_KEYBOARD=y
 CONFIG_PLATFORM_EC_KEYBOARD_PROTOCOL_MKBP=y
diff --git a/zephyr/projects/corsola/prj_kingler.conf b/zephyr/projects/corsola/prj_kingler.conf
index 4d65755516..8cdc8f7261 100644
--- a/zephyr/projects/corsola/prj_kingler.conf
+++ b/zephyr/projects/corsola/prj_kingler.conf
@@ -58,10 +58,6 @@ CONFIG_PLATFORM_EC_EXTPOWER_GPIO=y
 # Host command
 CONFIG_PLATFORM_EC_HOSTCMD=y
 
-# I2C
-CONFIG_I2C=y
-CONFIG_PLATFORM_EC_I2C=y
-
 # PWM
 CONFIG_PWM=y
 CONFIG_PWM_SHELL=n
diff --git a/zephyr/projects/intelrvp/prj.conf b/zephyr/projects/intelrvp/prj.conf
index 014afe79bf..a4bca4bef9 100644
--- a/zephyr/projects/intelrvp/prj.conf
+++ b/zephyr/projects/intelrvp/prj.conf
@@ -27,7 +27,7 @@ CONFIG_PLATFORM_EC_USB_VID=0x18d1
 CONFIG_PLATFORM_EC_USB_PID=0x8086
 
 # I2C
-CONFIG_PLATFORM_EC_I2C=y
+CONFIG_I2C=y
 
 # eSPI
 CONFIG_ESPI=y
diff --git a/zephyr/projects/it8xxx2_evb/prj.conf b/zephyr/projects/it8xxx2_evb/prj.conf
index 8acc437c0d..c5e11967ce 100644
--- a/zephyr/projects/it8xxx2_evb/prj.conf
+++ b/zephyr/projects/it8xxx2_evb/prj.conf
@@ -14,7 +14,7 @@ CONFIG_AP_ARM_MTK_MT8192=y
 CONFIG_PLATFORM_EC_ADC=y
 
 # I2C
-CONFIG_PLATFORM_EC_I2C=y
+CONFIG_I2C=y
 
 # Fan
 CONFIG_PLATFORM_EC_FAN=y
diff --git a/zephyr/projects/nissa/prj.conf b/zephyr/projects/nissa/prj.conf
index 9e9995ce3e..7ba18ccc6d 100644
--- a/zephyr/projects/nissa/prj.conf
+++ b/zephyr/projects/nissa/prj.conf
@@ -29,7 +29,6 @@ CONFIG_SHELL_BACKEND_SERIAL_TX_RING_BUFFER_SIZE=128
 CONFIG_PLATFORM_EC_BACKLIGHT_LID=y
 CONFIG_PLATFORM_EC_CONSOLE_CMD_SYSINFO=y
 CONFIG_PLATFORM_EC_EEPROM_CBI_WP=y
-CONFIG_PLATFORM_EC_I2C=y
 CONFIG_PLATFORM_EC_LID_SWITCH=y
 CONFIG_PLATFORM_EC_POWER_BUTTON=y
 CONFIG_PLATFORM_EC_SWITCH=y
@@ -56,6 +55,9 @@ CONFIG_AP_PWRSEQ=y
 CONFIG_X86_NON_DSX_PWRSEQ_ADL=y
 CONFIG_X86_NON_DSX_PWRSEQ_CONSOLE=y
 
+# I2C
+CONFIG_I2C=y
+
 # Keyboard support
 CONFIG_PLATFORM_EC_KBLIGHT_ENABLE_PIN=y
 CONFIG_PLATFORM_EC_KEYBOARD=y
@@ -98,7 +100,6 @@ CONFIG_PWM_SHELL=y
 # TODO(b/188605676): bring these features up
 CONFIG_PLATFORM_EC_BACKLIGHT_LID=n
 
-
 # Sensors support
 CONFIG_PLATFORM_EC_LID_ANGLE=y
 CONFIG_PLATFORM_EC_LID_ANGLE_UPDATE=y
diff --git a/zephyr/projects/posix-ec/prj.conf b/zephyr/projects/posix-ec/prj.conf
index a3c507d13a..f6549c7839 100644
--- a/zephyr/projects/posix-ec/prj.conf
+++ b/zephyr/projects/posix-ec/prj.conf
@@ -9,4 +9,3 @@ CONFIG_PLATFORM_EC=y
 CONFIG_SHIMMED_TASKS=n
 CONFIG_PLATFORM_EC_KEYBOARD=n
 CONFIG_PLATFORM_EC_HOSTCMD=n
-CONFIG_PLATFORM_EC_I2C=n
diff --git a/zephyr/projects/skyrim/prj.conf b/zephyr/projects/skyrim/prj.conf
index 59c37b5150..a9be70454b 100644
--- a/zephyr/projects/skyrim/prj.conf
+++ b/zephyr/projects/skyrim/prj.conf
@@ -28,6 +28,9 @@ CONFIG_PLATFORM_EC_POWER_BUTTON=y
 # ADC
 CONFIG_PLATFORM_EC_ADC=y
 
+# I2C
+CONFIG_I2C=y
+
 # CBI
 CONFIG_EEPROM=y
 CONFIG_EEPROM_AT24=y
diff --git a/zephyr/projects/trogdor/lazor/prj.conf b/zephyr/projects/trogdor/lazor/prj.conf
index 15fe14e08c..f95d5a4153 100644
--- a/zephyr/projects/trogdor/lazor/prj.conf
+++ b/zephyr/projects/trogdor/lazor/prj.conf
@@ -20,7 +20,9 @@ CONFIG_PLATFORM_EC_SWITCH=y
 CONFIG_PLATFORM_EC_LID_SWITCH=y
 CONFIG_PLATFORM_EC_BACKLIGHT_LID=y
 CONFIG_PLATFORM_EC_POWER_BUTTON=y
-CONFIG_PLATFORM_EC_I2C=y
+
+# I2C
+CONFIG_I2C=y
 
 # LED
 CONFIG_PLATFORM_EC_LED_DT=y
diff --git a/zephyr/test/drivers/prj.conf b/zephyr/test/drivers/prj.conf
index e1832961a8..0f230410df 100644
--- a/zephyr/test/drivers/prj.conf
+++ b/zephyr/test/drivers/prj.conf
@@ -78,7 +78,6 @@ CONFIG_PLATFORM_EC_USB_CHARGER=y
 CONFIG_PLATFORM_EC_BC12_DETECT_PI3USB9201=y
 CONFIG_PLATFORM_EC_USB_POWER_DELIVERY=y
 CONFIG_PLATFORM_EC_USB_PD_5V_EN_CUSTOM=y
-CONFIG_PLATFORM_EC_I2C=y
 CONFIG_PLATFORM_EC_BATTERY=y
 CONFIG_PLATFORM_EC_BATTERY_SMART=y
 CONFIG_PLATFORM_EC_CHARGER_DISCHARGE_ON_AC=y
diff --git a/zephyr/test/i2c/prj.conf b/zephyr/test/i2c/prj.conf
index 8023c0492b..69c276712e 100644
--- a/zephyr/test/i2c/prj.conf
+++ b/zephyr/test/i2c/prj.conf
@@ -14,7 +14,6 @@ CONFIG_SENSOR=y
 CONFIG_BMI160_TRIGGER_NONE=y
 
 CONFIG_PLATFORM_EC=y
-CONFIG_PLATFORM_EC_I2C=y
 CONFIG_CROS_EC=y
 
 # TODO(b/173711210) figure out why SPI is required here when we're not using it.