summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--zephyr/Kconfig.i2c5
-rw-r--r--zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig3
-rw-r--r--zephyr/program/brya/prj.conf3
-rw-r--r--zephyr/program/corsola/prj.conf3
-rw-r--r--zephyr/program/herobrine/program.conf1
-rw-r--r--zephyr/program/intelrvp/prj.conf3
-rw-r--r--zephyr/program/it8xxx2_evb/prj.conf3
-rw-r--r--zephyr/program/minimal/prj.conf2
-rw-r--r--zephyr/program/nissa/program.conf3
-rw-r--r--zephyr/program/rex/prj.conf1
-rw-r--r--zephyr/program/skyrim/prj.conf3
-rw-r--r--zephyr/program/trogdor/lazor/prj.conf3
-rw-r--r--zephyr/shim/src/i2c.c7
-rw-r--r--zephyr/test/drivers/prj.conf1
-rw-r--r--zephyr/test/i2c/prj.conf1
-rw-r--r--zephyr/test/i2c_dts/prj.conf1
-rw-r--r--zephyr/test/kingler/prj.conf1
-rw-r--r--zephyr/test/krabby/prj.conf1
-rw-r--r--zephyr/test/vboot_efs2/prj.conf1
19 files changed, 5 insertions, 41 deletions
diff --git a/zephyr/Kconfig.i2c b/zephyr/Kconfig.i2c
index 0187409b31..9fa1d274aa 100644
--- a/zephyr/Kconfig.i2c
+++ b/zephyr/Kconfig.i2c
@@ -3,7 +3,10 @@
# found in the LICENSE file.
config PLATFORM_EC_I2C
- def_bool I2C
+ bool "EC I2C Support"
+ default y
+ depends on DT_HAS_NAMED_I2C_PORTS_ENABLED
+ select 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
diff --git a/zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig b/zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig
index 369c88e3cb..c39b9997f4 100644
--- a/zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig
+++ b/zephyr/boards/arm/npcx_evb/npcx9_evb_defconfig
@@ -37,9 +37,6 @@ CONFIG_CLOCK_CONTROL=y
# WATCHDOG configuration
CONFIG_WATCHDOG=y
-# I2C
-CONFIG_I2C=y
-
# PWM
CONFIG_PWM=y
CONFIG_PWM_SHELL=n
diff --git a/zephyr/program/brya/prj.conf b/zephyr/program/brya/prj.conf
index 1678eb29d2..1accab9770 100644
--- a/zephyr/program/brya/prj.conf
+++ b/zephyr/program/brya/prj.conf
@@ -37,9 +37,6 @@ CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S4=y
CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S5=y
CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_DEFAULT_VW_WIDTH_US=150
-# I2C
-CONFIG_I2C=y
-
# Power Sequencing
CONFIG_PLATFORM_EC_POWERSEQ=y
CONFIG_PLATFORM_EC_POWERSEQ_RTC_RESET=y
diff --git a/zephyr/program/corsola/prj.conf b/zephyr/program/corsola/prj.conf
index ea72d0890f..95fdf7b903 100644
--- a/zephyr/program/corsola/prj.conf
+++ b/zephyr/program/corsola/prj.conf
@@ -32,9 +32,6 @@ CONFIG_EEPROM_AT24=y
CONFIG_EEPROM_SHELL=n
CONFIG_PLATFORM_EC_BOARD_VERSION_CBI=y
-# I2C
-CONFIG_I2C=y
-
# Keyboard
CONFIG_PLATFORM_EC_KEYBOARD=y
CONFIG_PLATFORM_EC_KEYBOARD_PROTOCOL_MKBP=y
diff --git a/zephyr/program/herobrine/program.conf b/zephyr/program/herobrine/program.conf
index 79e956aa51..baff6ef280 100644
--- a/zephyr/program/herobrine/program.conf
+++ b/zephyr/program/herobrine/program.conf
@@ -15,7 +15,6 @@ CONFIG_KERNEL_SHELL=y
CONFIG_PLATFORM_EC_BOARD_RESET_AFTER_POWER_ON=y
# I2C options
-CONFIG_I2C=y
CONFIG_PLATFORM_EC_CONSOLE_CMD_I2C_SPEED=y
CONFIG_PLATFORM_EC_HOSTCMD_I2C_CONTROL=y
diff --git a/zephyr/program/intelrvp/prj.conf b/zephyr/program/intelrvp/prj.conf
index 46e332d91c..97b44e476d 100644
--- a/zephyr/program/intelrvp/prj.conf
+++ b/zephyr/program/intelrvp/prj.conf
@@ -33,9 +33,6 @@ CONFIG_PLATFORM_EC_USB_VID=0x18d1
CONFIG_PLATFORM_EC_USB_PID=0x8086
CONFIG_PLATFORM_EC_USB_PD_REQUIRE_AP_MODE_ENTRY=y
-# I2C
-CONFIG_I2C=y
-
# eSPI
CONFIG_ESPI=y
CONFIG_PLATFORM_EC_HOST_INTERFACE_ESPI_VW_SLP_S3=y
diff --git a/zephyr/program/it8xxx2_evb/prj.conf b/zephyr/program/it8xxx2_evb/prj.conf
index 5d561eb4e4..1e1cac492b 100644
--- a/zephyr/program/it8xxx2_evb/prj.conf
+++ b/zephyr/program/it8xxx2_evb/prj.conf
@@ -19,9 +19,6 @@ CONFIG_LOG=y
# Fan
CONFIG_SENSOR=y
-# I2C
-CONFIG_I2C=y
-
# PWM
CONFIG_PWM=y
CONFIG_PWM_SHELL=n
diff --git a/zephyr/program/minimal/prj.conf b/zephyr/program/minimal/prj.conf
index db7cac0cef..bacb4fe288 100644
--- a/zephyr/program/minimal/prj.conf
+++ b/zephyr/program/minimal/prj.conf
@@ -9,10 +9,10 @@ CONFIG_SYSCON=y
# Disable default features we don't want in a minimal example.
CONFIG_ADC=n
-CONFIG_I2C=n
CONFIG_PWM=n
CONFIG_PLATFORM_EC_BACKLIGHT_LID=n
CONFIG_PLATFORM_EC_KEYBOARD=n
CONFIG_PLATFORM_EC_POWER_BUTTON=n
CONFIG_PLATFORM_EC_SWITCH=n
CONFIG_PLATFORM_EC_VBOOT_EFS2=n
+CONFIG_PLATFORM_EC_I2C=n
diff --git a/zephyr/program/nissa/program.conf b/zephyr/program/nissa/program.conf
index dad804a8ee..b26ea75246 100644
--- a/zephyr/program/nissa/program.conf
+++ b/zephyr/program/nissa/program.conf
@@ -53,9 +53,6 @@ CONFIG_X86_NON_DSX_PWRSEQ_HOST_CMD=y
CONFIG_AP_PWRSEQ_S0IX=y
CONFIG_AP_PWRSEQ_S0IX_ERROR_RECOVERY=y
-# I2C
-CONFIG_I2C=y
-
# Keyboard support
CONFIG_PLATFORM_EC_KBLIGHT_ENABLE_PIN=y
CONFIG_PLATFORM_EC_KEYBOARD=y
diff --git a/zephyr/program/rex/prj.conf b/zephyr/program/rex/prj.conf
index 6be79dca70..53446f353b 100644
--- a/zephyr/program/rex/prj.conf
+++ b/zephyr/program/rex/prj.conf
@@ -52,7 +52,6 @@ CONFIG_X86_NON_DSX_PWRSEQ_CONSOLE=y
CONFIG_AP_PWRSEQ_S0IX=y
# I2C
-CONFIG_I2C=y
CONFIG_PLATFORM_EC_HOSTCMD_I2C_CONTROL=y
# PWM
diff --git a/zephyr/program/skyrim/prj.conf b/zephyr/program/skyrim/prj.conf
index 874f823010..202ddd90a9 100644
--- a/zephyr/program/skyrim/prj.conf
+++ b/zephyr/program/skyrim/prj.conf
@@ -27,9 +27,6 @@ CONFIG_PLATFORM_EC_PORT80=y
# Power button
CONFIG_PLATFORM_EC_POWER_BUTTON=y
-# I2C
-CONFIG_I2C=y
-
# CBI
CONFIG_EEPROM=y
CONFIG_EEPROM_AT24=y
diff --git a/zephyr/program/trogdor/lazor/prj.conf b/zephyr/program/trogdor/lazor/prj.conf
index 2e0569b22b..323fb1ca00 100644
--- a/zephyr/program/trogdor/lazor/prj.conf
+++ b/zephyr/program/trogdor/lazor/prj.conf
@@ -21,9 +21,6 @@ CONFIG_PLATFORM_EC_LID_SWITCH=y
CONFIG_PLATFORM_EC_BACKLIGHT_LID=y
CONFIG_PLATFORM_EC_POWER_BUTTON=y
-# I2C
-CONFIG_I2C=y
-
# LED
CONFIG_PLATFORM_EC_LED_DT=y
diff --git a/zephyr/shim/src/i2c.c b/zephyr/shim/src/i2c.c
index 0074327826..0a9fc41397 100644
--- a/zephyr/shim/src/i2c.c
+++ b/zephyr/shim/src/i2c.c
@@ -11,13 +11,6 @@
#include "i2c/i2c.h"
/*
- * The named-i2c-ports node is required by the I2C shim
- */
-#if !DT_NODE_EXISTS(DT_PATH(named_i2c_ports))
-#error I2C shim requires the named-i2c-ports node to be defined.
-#endif
-
-/*
* Initialize device bindings in i2c_devices.
* This macro should be called from within DT_FOREACH_CHILD.
*/
diff --git a/zephyr/test/drivers/prj.conf b/zephyr/test/drivers/prj.conf
index 3169051bed..f796adfbe1 100644
--- a/zephyr/test/drivers/prj.conf
+++ b/zephyr/test/drivers/prj.conf
@@ -45,7 +45,6 @@ CONFIG_CROS_EC=y
CONFIG_SHIMMED_TASKS=y
CONFIG_EMUL=y
CONFIG_LOG=y
-CONFIG_I2C=y
CONFIG_I2C_EMUL=y
CONFIG_GPIO=y
CONFIG_GPIO_EMUL=y
diff --git a/zephyr/test/i2c/prj.conf b/zephyr/test/i2c/prj.conf
index ee6c43f51a..b81e088ceb 100644
--- a/zephyr/test/i2c/prj.conf
+++ b/zephyr/test/i2c/prj.conf
@@ -6,7 +6,6 @@ CONFIG_ZTEST=y
CONFIG_LOG=y
CONFIG_EMUL=y
-CONFIG_I2C=y
CONFIG_I2C_EMUL=y
CONFIG_BMI160=y
CONFIG_EMUL_BMI160=y
diff --git a/zephyr/test/i2c_dts/prj.conf b/zephyr/test/i2c_dts/prj.conf
index 6c008faf64..37e0b443a4 100644
--- a/zephyr/test/i2c_dts/prj.conf
+++ b/zephyr/test/i2c_dts/prj.conf
@@ -7,7 +7,6 @@ CONFIG_ZTEST_NEW_API=y
CONFIG_LOG=y
CONFIG_EMUL=y
-CONFIG_I2C=y
CONFIG_I2C_EMUL=y
CONFIG_BMI160=y
CONFIG_EMUL_BMI160=y
diff --git a/zephyr/test/kingler/prj.conf b/zephyr/test/kingler/prj.conf
index 76f4434bc6..a5249f0776 100644
--- a/zephyr/test/kingler/prj.conf
+++ b/zephyr/test/kingler/prj.conf
@@ -18,7 +18,6 @@ CONFIG_PLATFORM_EC_GMR_TABLET_MODE=y
CONFIG_PLATFORM_EC_TABLET_MODE=y
CONFIG_PLATFORM_EC_LID_ANGLE=y
-CONFIG_I2C=y
CONFIG_I2C_NPCX=n
CONFIG_PLATFORM_EC_BOARD_VERSION_CBI=y
diff --git a/zephyr/test/krabby/prj.conf b/zephyr/test/krabby/prj.conf
index c83242059d..fd41778593 100644
--- a/zephyr/test/krabby/prj.conf
+++ b/zephyr/test/krabby/prj.conf
@@ -14,7 +14,6 @@ CONFIG_EMUL_RT9490=y
CONFIG_EMUL_SMART_BATTERY=y
CONFIG_EMUL_TCPCI=y
CONFIG_EMUL_TUSB1064=y
-CONFIG_I2C=y
CONFIG_I2C_EMUL=y
CONFIG_PLATFORM_EC=y
diff --git a/zephyr/test/vboot_efs2/prj.conf b/zephyr/test/vboot_efs2/prj.conf
index 4858e0602d..45d18428bd 100644
--- a/zephyr/test/vboot_efs2/prj.conf
+++ b/zephyr/test/vboot_efs2/prj.conf
@@ -9,7 +9,6 @@ CONFIG_EMUL_CROS_FLASH=y
CONFIG_EMUL_SMART_BATTERY=y
CONFIG_EMUL_TCPCI=y
CONFIG_FLASH=y
-CONFIG_I2C=y
CONFIG_I2C_EMUL=y
CONFIG_PLATFORM_EC=y
CONFIG_PLATFORM_EC_BACKLIGHT_LID=n
View Lorry Controller Status