summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiana Z <dzigterman@chromium.org>2022-09-16 14:00:30 -0600
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2022-09-16 23:21:17 +0000
commit38233ee7028784b127b8f5c11dfcf5d22fb020c5 (patch)
tree325d8c0c67c8845034af28e2a8829e8ac3666a59
parent83790c8b685bff4c9bed07a20f9eb9eb1e7b7255 (diff)
downloadchrome-ec-38233ee7028784b127b8f5c11dfcf5d22fb020c5.tar.gz
Skyrim: Create i2c dtsi file
Move the i2c common code into a dtsi file which the variants may include in their own dts files. BRANCH=None BUG=b:244457125 TEST=zmake build skyrim and variants Signed-off-by: Diana Z <dzigterman@chromium.org> Change-Id: I1b48e21c76fff8bd1f4db127aea4da2bf936c1e9 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3902646 Reviewed-by: Keith Short <keithshort@chromium.org> Commit-Queue: Keith Short <keithshort@chromium.org>
-rw-r--r--zephyr/projects/skyrim/BUILD.py1
-rw-r--r--zephyr/projects/skyrim/i2c_common.dtsi (renamed from zephyr/projects/skyrim/i2c.dts)0
-rw-r--r--zephyr/projects/skyrim/morthal.dts2
-rw-r--r--zephyr/projects/skyrim/skyrim.dts2
-rw-r--r--zephyr/projects/skyrim/winterhold.dts2
5 files changed, 6 insertions, 1 deletions
diff --git a/zephyr/projects/skyrim/BUILD.py b/zephyr/projects/skyrim/BUILD.py
index bc582a7eae..ff53aeefda 100644
--- a/zephyr/projects/skyrim/BUILD.py
+++ b/zephyr/projects/skyrim/BUILD.py
@@ -19,7 +19,6 @@ def register_skyrim_project(
here / "adc.dts",
here / "fan.dts",
here / "gpio.dts",
- here / "i2c.dts",
here / "interrupts.dts",
here / "keyboard.dts",
here / "motionsense.dts",
diff --git a/zephyr/projects/skyrim/i2c.dts b/zephyr/projects/skyrim/i2c_common.dtsi
index 381a375cac..381a375cac 100644
--- a/zephyr/projects/skyrim/i2c.dts
+++ b/zephyr/projects/skyrim/i2c_common.dtsi
diff --git a/zephyr/projects/skyrim/morthal.dts b/zephyr/projects/skyrim/morthal.dts
index 3e6fa0ebfd..1ff2795144 100644
--- a/zephyr/projects/skyrim/morthal.dts
+++ b/zephyr/projects/skyrim/morthal.dts
@@ -3,6 +3,8 @@
* found in the LICENSE file.
*/
+#include "i2c_common.dtsi"
+
/ {
named-gpios {
/* Morthal-specific GPIO customizations */
diff --git a/zephyr/projects/skyrim/skyrim.dts b/zephyr/projects/skyrim/skyrim.dts
index 818c2d3e43..ca631f21d3 100644
--- a/zephyr/projects/skyrim/skyrim.dts
+++ b/zephyr/projects/skyrim/skyrim.dts
@@ -3,6 +3,8 @@
* found in the LICENSE file.
*/
+#include "i2c_common.dtsi"
+
/ {
named-gpios {
/* Skyrim-specific GPIO customizations */
diff --git a/zephyr/projects/skyrim/winterhold.dts b/zephyr/projects/skyrim/winterhold.dts
index dd6639d9a9..298786071b 100644
--- a/zephyr/projects/skyrim/winterhold.dts
+++ b/zephyr/projects/skyrim/winterhold.dts
@@ -3,6 +3,8 @@
* found in the LICENSE file.
*/
+#include "i2c_common.dtsi"
+
/ {
named-gpios {
/* Winterhold-specific GPIO customizations */