From e1c265a7b346fea2c20812b1c78342460e28b35b Mon Sep 17 00:00:00 2001 From: Keith Short Date: Wed, 15 Sep 2021 18:22:26 -0600 Subject: zephyr: Explicitly enable the I2C controller Explicitly enable the I2C controller node that is used on each board using the Nuvoton NPCX7 or NPCX9 chipset. This is a no-op at the moment, but prepares for an upstream change that will disable the I2C controller nodes by default. BUG=b:200292035 BRANCH=none TEST=zmake testall Signed-off-by: Keith Short Change-Id: I158ae44090a719ef20930350d89efd7903e6e531 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3169389 Reviewed-by: Jack Rosenthal --- zephyr/boards/arm/brya/brya.dts | 32 +++++++++++++++++++++++ zephyr/boards/arm/kohaku/kohaku.dts | 24 +++++++++++++++++ zephyr/boards/arm/trogdor/trogdor.dts | 24 +++++++++++++++++ zephyr/boards/arm/volteer/volteer.dts | 24 +++++++++++++++++ zephyr/projects/herobrine/herobrine_npcx9/i2c.dts | 28 ++++++++++++++++++++ 5 files changed, 132 insertions(+) diff --git a/zephyr/boards/arm/brya/brya.dts b/zephyr/boards/arm/brya/brya.dts index a0680342af..4ba8704cd2 100644 --- a/zephyr/boards/arm/brya/brya.dts +++ b/zephyr/boards/arm/brya/brya.dts @@ -92,41 +92,73 @@ clock-frequency = ; }; +&i2c_ctrl0 { + status = "okay"; +}; + &i2c1_0 { status = "okay"; clock-frequency = ; }; +&i2c_ctrl1 { + status = "okay"; +}; + &i2c2_0 { status = "okay"; clock-frequency = ; }; +&i2c_ctrl2 { + status = "okay"; +}; + &i2c3_0 { status = "okay"; clock-frequency = ; }; +&i2c_ctrl3 { + status = "okay"; +}; + &i2c4_1 { status = "okay"; clock-frequency = ; }; +&i2c_ctrl4 { + status = "okay"; +}; + &i2c5_0 { status = "okay"; clock-frequency = ; }; +&i2c_ctrl5 { + status = "okay"; +}; + &i2c6_1 { status = "okay"; clock-frequency = ; }; +&i2c_ctrl6 { + status = "okay"; +}; + &i2c7_0 { status = "okay"; clock-frequency = ; }; +&i2c_ctrl7 { + status = "okay"; +}; + &cros_kb_raw { status = "okay"; /* No KSO2 (it's inverted and implemented by GPIO) */ diff --git a/zephyr/boards/arm/kohaku/kohaku.dts b/zephyr/boards/arm/kohaku/kohaku.dts index 1670dcc0f2..00e340faea 100644 --- a/zephyr/boards/arm/kohaku/kohaku.dts +++ b/zephyr/boards/arm/kohaku/kohaku.dts @@ -368,27 +368,51 @@ clock-frequency = ; }; +&i2c_ctrl0 { + status = "okay"; +}; + &i2c1_0 { status = "okay"; clock-frequency = ; }; +&i2c_ctrl1 { + status = "okay"; +}; + &i2c2_0 { status = "okay"; clock-frequency = ; }; +&i2c_ctrl2 { + status = "okay"; +}; + &i2c3_0 { status = "okay"; clock-frequency = ; }; +&i2c_ctrl3 { + status = "okay"; +}; + &i2c5_0 { status = "okay"; clock-frequency = ; }; +&i2c_ctrl5 { + status = "okay"; +}; + &i2c7_0 { status = "okay"; clock-frequency = ; }; + +&i2c_ctrl7 { + status = "okay"; +}; diff --git a/zephyr/boards/arm/trogdor/trogdor.dts b/zephyr/boards/arm/trogdor/trogdor.dts index f5e50d9466..4bc7f7efc1 100644 --- a/zephyr/boards/arm/trogdor/trogdor.dts +++ b/zephyr/boards/arm/trogdor/trogdor.dts @@ -182,31 +182,55 @@ }; }; +&i2c_ctrl0 { + status = "okay"; +}; + &i2c1_0 { status = "okay"; clock-frequency = ; }; +&i2c_ctrl1 { + status = "okay"; +}; + &i2c2_0 { status = "okay"; clock-frequency = ; }; +&i2c_ctrl2 { + status = "okay"; +}; + &i2c3_0 { /* Not used as no WLC connected */ clock-frequency = ; }; +&i2c_ctrl3 { + status = "okay"; +}; + &i2c5_0 { status = "okay"; clock-frequency = ; }; +&i2c_ctrl5 { + status = "okay"; +}; + &i2c7_0 { status = "okay"; clock-frequency = ; }; +&i2c_ctrl7 { + status = "okay"; +}; + /* Keyboard backlight */ &pwm3 { status = "okay"; diff --git a/zephyr/boards/arm/volteer/volteer.dts b/zephyr/boards/arm/volteer/volteer.dts index 2a1c5c206d..3c32feaf20 100644 --- a/zephyr/boards/arm/volteer/volteer.dts +++ b/zephyr/boards/arm/volteer/volteer.dts @@ -207,26 +207,46 @@ clock-frequency = ; }; +&i2c_ctrl0 { + status = "okay"; +}; + &i2c1_0 { status = "okay"; clock-frequency = ; }; +&i2c_ctrl1 { + status = "okay"; +}; + &i2c2_0 { status = "okay"; clock-frequency = ; }; +&i2c_ctrl2 { + status = "okay"; +}; + &i2c3_0 { status = "okay"; clock-frequency = ; }; +&i2c_ctrl3 { + status = "okay"; +}; + &i2c5_0 { status = "okay"; clock-frequency = ; }; +&i2c_ctrl5 { + status = "okay"; +}; + &i2c7_0 { status = "okay"; clock-frequency = ; @@ -239,6 +259,10 @@ }; }; +&i2c_ctrl7 { + status = "okay"; +}; + &cros_kb_raw { status = "okay"; /* No KSO2 (it's inverted and implemented by GPIO) */ diff --git a/zephyr/projects/herobrine/herobrine_npcx9/i2c.dts b/zephyr/projects/herobrine/herobrine_npcx9/i2c.dts index 8e26fae393..0821f8b806 100644 --- a/zephyr/projects/herobrine/herobrine_npcx9/i2c.dts +++ b/zephyr/projects/herobrine/herobrine_npcx9/i2c.dts @@ -84,6 +84,10 @@ }; }; +&i2c_ctrl0 { + status = "okay"; +}; + &i2c1_0 { status = "okay"; /* @@ -98,17 +102,29 @@ clock-frequency = ; }; +&i2c_ctrl1 { + status = "okay"; +}; + &i2c2_0 { status = "okay"; /* TODO(b/200280341): PS8805 SPI ROM access */ clock-frequency = ; }; +&i2c_ctrl2 { + status = "okay"; +}; + &i2c3_0 { /* Not used as no WLC connected */ clock-frequency = ; }; +&i2c_ctrl3 { + status = "okay"; +}; + &i2c4_1 { status = "okay"; clock-frequency = ; @@ -121,12 +137,24 @@ }; }; +&i2c_ctrl4 { + status = "okay"; +}; + &i2c5_0 { status = "okay"; clock-frequency = ; }; +&i2c_ctrl5 { + status = "okay"; +}; + &i2c7_0 { status = "okay"; clock-frequency = ; }; + +&i2c_ctrl7 { + status = "okay"; +}; -- cgit v1.2.1