zephyr: shi: default the shi node as disabled on ite

Change the shi node definition for ite platforms to be declared without
pinctrl and as disabled. That allows a program to enable the node and
define the pin used in the specific implementation.

BRANCH=none
BUG=none
TEST=zmake compare-builds

Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
Change-Id: I2e01a725fbc017d88c95b8567ad43294dbdcb9cc
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4177234
Reviewed-by: Jeremy Bettis <jbettis@chromium.org>

14 files changed, 63 insertions, 6 deletions

diff --git a/zephyr/boards/riscv/it8xxx2/it8xxx2.dts b/zephyr/boards/riscv/it8xxx2/it8xxx2.dts
index c3611e1f0b..9567ffaad3 100644
--- a/zephyr/boards/riscv/it8xxx2/it8xxx2.dts
+++ b/zephyr/boards/riscv/it8xxx2/it8xxx2.dts
@@ -6,6 +6,7 @@
 #include <cros/ite/it8xxx2.dtsi>
 #include <dt-bindings/gpio_defines.h>
 #include <dt-bindings/gpio/ite-it8xxx2-gpio.h>
+#include <ite/it8xxx2-pinctrl-map.dtsi>
 
 #define GPIO_VOLTAGE_1P8 IT8XXX2_GPIO_VOLTAGE_1P8
 
diff --git a/zephyr/include/cros/ite/it8xxx2.dtsi b/zephyr/include/cros/ite/it8xxx2.dtsi
index c4dda61839..05c81b6896 100644
--- a/zephyr/include/cros/ite/it8xxx2.dtsi
+++ b/zephyr/include/cros/ite/it8xxx2.dtsi
@@ -4,7 +4,6 @@
  */
 
 #include <cros/binman.dtsi>
-#include <ite/it8xxx2-pinctrl-map.dtsi>
 
 / {
 	chosen {
@@ -59,11 +58,7 @@
 			reg = <0x00f03a00 0x30>;
 			interrupts = <171 0>;
 			interrupt-parent = <&intc>;
-			pinctrl-0 = <&shi_mosi_gpm0_default
-				     &shi_miso_gpm1_default
-				     &shi_clk_gpm4_default
-				     &shi_cs_gpm5_default>;
-			pinctrl-names = "default";
+			status = "disabled";
 		};
 
 		fiu0: cros-flash@80000000 {
diff --git a/zephyr/program/corsola/ite_shi.dtsi b/zephyr/program/corsola/ite_shi.dtsi
new file mode 100644
index 0000000000..12c0c6ca5b
--- /dev/null
+++ b/zephyr/program/corsola/ite_shi.dtsi
@@ -0,0 +1,13 @@
+/* Copyright 2023 The ChromiumOS Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include <ite/it8xxx2-pinctrl-map.dtsi>
+
+&shi {
+	status = "okay";
+	pinctrl-0 = <&shi_mosi_gpm0_default &shi_miso_gpm1_default
+		     &shi_clk_gpm4_default &shi_cs_gpm5_default>;
+	pinctrl-names = "default";
+};
diff --git a/zephyr/program/corsola/krabby/project.overlay b/zephyr/program/corsola/krabby/project.overlay
index f166243219..5a7db69b43 100644
--- a/zephyr/program/corsola/krabby/project.overlay
+++ b/zephyr/program/corsola/krabby/project.overlay
@@ -16,6 +16,7 @@
 #include "../ite_led.dtsi"
 #include "../ite_motionsense.dtsi"
 #include "../ite_usbc.dtsi"
+#include "../ite_shi.dtsi"
 
 
 / {
diff --git a/zephyr/program/corsola/magikarp/project.overlay b/zephyr/program/corsola/magikarp/project.overlay
index e1c2b13bce..48c823fa0e 100644
--- a/zephyr/program/corsola/magikarp/project.overlay
+++ b/zephyr/program/corsola/magikarp/project.overlay
@@ -17,6 +17,7 @@
 #include "../ite_led.dtsi"
 #include "../ite_motionsense.dtsi"
 #include "../ite_usbc.dtsi"
+#include "../ite_shi.dtsi"
 
 / {
 	aliases {
diff --git a/zephyr/program/corsola/tentacruel/project.overlay b/zephyr/program/corsola/tentacruel/project.overlay
index 8a3b053980..370e16e8d1 100644
--- a/zephyr/program/corsola/tentacruel/project.overlay
+++ b/zephyr/program/corsola/tentacruel/project.overlay
@@ -17,6 +17,7 @@
 #include "../ite_led.dtsi"
 #include "../ite_motionsense.dtsi"
 #include "../ite_usbc.dtsi"
+#include "../ite_shi.dtsi"
 #include "./thermistor.dtsi"
 #include "./cbi.dtsi"
 
diff --git a/zephyr/program/geralt/geralt/project.overlay b/zephyr/program/geralt/geralt/project.overlay
index fc63f53050..b54d181c38 100644
--- a/zephyr/program/geralt/geralt/project.overlay
+++ b/zephyr/program/geralt/geralt/project.overlay
@@ -13,5 +13,6 @@
 #include "../motionsense.dtsi"
 #include "../power_signal.dtsi"
 #include "../usbc.dtsi"
+#include "../shi.dtsi"
 #include "battery.dtsi"
 #include "led.dtsi"
diff --git a/zephyr/program/geralt/shi.dtsi b/zephyr/program/geralt/shi.dtsi
new file mode 100644
index 0000000000..12c0c6ca5b
--- /dev/null
+++ b/zephyr/program/geralt/shi.dtsi
@@ -0,0 +1,13 @@
+/* Copyright 2023 The ChromiumOS Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include <ite/it8xxx2-pinctrl-map.dtsi>
+
+&shi {
+	status = "okay";
+	pinctrl-0 = <&shi_mosi_gpm0_default &shi_miso_gpm1_default
+		     &shi_clk_gpm4_default &shi_cs_gpm5_default>;
+	pinctrl-names = "default";
+};
diff --git a/zephyr/program/it8xxx2_evb/BUILD.py b/zephyr/program/it8xxx2_evb/BUILD.py
index ee89c75390..86538ec96e 100644
--- a/zephyr/program/it8xxx2_evb/BUILD.py
+++ b/zephyr/program/it8xxx2_evb/BUILD.py
@@ -14,5 +14,6 @@ register_raw_project(
         "i2c.dts",
         "interrupts.dts",
         "pwm.dts",
+        "shi.dts",
     ],
 )
diff --git a/zephyr/program/it8xxx2_evb/shi.dts b/zephyr/program/it8xxx2_evb/shi.dts
new file mode 100644
index 0000000000..12c0c6ca5b
--- /dev/null
+++ b/zephyr/program/it8xxx2_evb/shi.dts
@@ -0,0 +1,13 @@
+/* Copyright 2023 The ChromiumOS Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include <ite/it8xxx2-pinctrl-map.dtsi>
+
+&shi {
+	status = "okay";
+	pinctrl-0 = <&shi_mosi_gpm0_default &shi_miso_gpm1_default
+		     &shi_clk_gpm4_default &shi_cs_gpm5_default>;
+	pinctrl-names = "default";
+};
diff --git a/zephyr/program/nissa/joxer/project.overlay b/zephyr/program/nissa/joxer/project.overlay
index 9ca681d979..a7c551b7cc 100644
--- a/zephyr/program/nissa/joxer/project.overlay
+++ b/zephyr/program/nissa/joxer/project.overlay
@@ -4,6 +4,7 @@
  */
 
 #include "../cbi.dtsi"
+#include "../shi.dtsi"
 
 #include "cbi.dtsi"
 #include "generated.dtsi"
diff --git a/zephyr/program/nissa/nereid/project.overlay b/zephyr/program/nissa/nereid/project.overlay
index 0aceac1c47..ee367b9c28 100644
--- a/zephyr/program/nissa/nereid/project.overlay
+++ b/zephyr/program/nissa/nereid/project.overlay
@@ -4,6 +4,7 @@
  */
 
 #include "../cbi.dtsi"
+#include "../shi.dtsi"
 
 #include "generated.dtsi"
 #include "keyboard.dtsi"
diff --git a/zephyr/program/nissa/shi.dtsi b/zephyr/program/nissa/shi.dtsi
new file mode 100644
index 0000000000..12c0c6ca5b
--- /dev/null
+++ b/zephyr/program/nissa/shi.dtsi
@@ -0,0 +1,13 @@
+/* Copyright 2023 The ChromiumOS Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include <ite/it8xxx2-pinctrl-map.dtsi>
+
+&shi {
+	status = "okay";
+	pinctrl-0 = <&shi_mosi_gpm0_default &shi_miso_gpm1_default
+		     &shi_clk_gpm4_default &shi_cs_gpm5_default>;
+	pinctrl-names = "default";
+};
diff --git a/zephyr/program/nissa/yaviks/project.overlay b/zephyr/program/nissa/yaviks/project.overlay
index c2e9c574e6..97f431022c 100644
--- a/zephyr/program/nissa/yaviks/project.overlay
+++ b/zephyr/program/nissa/yaviks/project.overlay
@@ -3,6 +3,8 @@
  * found in the LICENSE file.
  */
 
+#include "../shi.dtsi"
+
 #include "cbi.dtsi"
 #include "fan.dtsi"
 #include "gpio.dtsi"