zephyr: create common i2c dtsi files

For variants share a majority of the i2c nodes. Create an i2c dtsi file
for these cases not to repeat code/configuration.

BUG=b:228240586
TEST=zmake build -a
BRANCH=main

Signed-off-by: Dawid Niedzwiecki <dn@semihalf.com>
Change-Id: Ia4053c39e365e0d0924ac30e2633178f8ad79239
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3858649
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: Dawid Niedzwiecki <dawidn@google.com>

8 files changed, 324 insertions, 938 deletions

diff --git a/zephyr/projects/corsola/i2c_krabby.dts b/zephyr/projects/corsola/i2c_krabby.dts
index c27ad04245..aa9a845bbe 100644
--- a/zephyr/projects/corsola/i2c_krabby.dts
+++ b/zephyr/projects/corsola/i2c_krabby.dts
@@ -3,143 +3,9 @@
  * found in the LICENSE file.
  */
 
-/ {
-	named-i2c-ports {
-		compatible = "named-i2c-ports";
-
-		battery {
-			i2c-port = <&i2c1>;
-			remote-port = <1>;
-			enum-names = "I2C_PORT_BATTERY",
-				"I2C_PORT_VIRTUAL_BATTERY";
-		};
-		i2c_charger: charger {
-			i2c-port = <&i2c0>;
-			enum-names = "I2C_PORT_CHARGER",
-				"I2C_PORT_EEPROM";
-		};
-		i2c_sensor: sensor {
-			i2c-port = <&i2c3>;
-			enum-names = "I2C_PORT_SENSOR";
-		};
-		i2c_usb_c0: usb-c0 {
-			i2c-port = <&i2c2>;
-			enum-names = "I2C_PORT_USB_C0",
-				"I2C_PORT_USB_MUX0";
-		};
-		i2c_usb_c1: usb-c1 {
-			i2c-port = <&i2c4>;
-			enum-names = "I2C_PORT_USB_C1",
-				"I2C_PORT_USB_MUX1";
-		};
-	};
-
-};
-
-&pinctrl {
-	i2c3_clk_gpf2_sleep: i2c3_clk_gpf2_sleep {
-		pinmuxs = <&pinctrlf 2 IT8XXX2_ALT_DEFAULT>;
-	};
-	i2c3_data_gpf3_sleep: i2c3_data_gpf3_sleep {
-		pinmuxs = <&pinctrlf 3 IT8XXX2_ALT_DEFAULT>;
-	};
-};
-
-&i2c0 {
-	/* EC_I2C_PWR_CBI */
-	label = "I2C_PWR_CBI";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST>;
-	pinctrl-0 = <&i2c0_clk_gpb3_default
-		     &i2c0_data_gpb4_default>;
-	pinctrl-names = "default";
-
-	charger: rt9490@53 {
-		compatible = "richtek,rt9490";
-		status = "okay";
-		reg = <0x53>;
-	};
-
-	cbi_eeprom: eeprom@50 {
-		compatible = "atmel,at24";
-		reg = <0x50>;
-		size = <2048>;
-		pagesize = <16>;
-		address-width = <8>;
-		timeout = <5>;
-	};
-};
-
-&i2c1 {
-	/* EC_I2C_BATTERY */
-	label = "I2C_BATTERY";
-	status = "okay";
-	clock-frequency = <50000>;
-	pinctrl-0 = <&i2c1_clk_gpc1_default
-		     &i2c1_data_gpc2_default>;
-	pinctrl-names = "default";
-};
-
-&i2c2 {
-	/* EC_I2C_USB_C0 */
-	label = "I2C_USB_C0";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST>;
-	pinctrl-0 = <&i2c2_clk_gpf6_default
-		     &i2c2_data_gpf7_default>;
-	pinctrl-names = "default";
-
-	bc12_ppc_port0: rt1739@70 {
-		compatible = "richtek,rt1739";
-		status = "okay";
-		reg = <0x70>;
-	};
-
-	it5205_mux_0: it5205-mux-0@48 {
-		compatible = "ite,it5205";
-		reg = <0x48>;
-	};
-};
-
-&i2c3 {
-	/* EC_I2C_SENSOR */
-	label = "I2C_SENSOR";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST>;
-	scl-gpios = <&gpiof 2 0>;
-	sda-gpios = <&gpiof 3 0>;
-	pinctrl-0 = <&i2c3_clk_gpf2_default
-		     &i2c3_data_gpf3_default>;
-	pinctrl-1 = <&i2c3_clk_gpf2_sleep
-		     &i2c3_data_gpf3_sleep>;
-	pinctrl-names = "default", "sleep";
-	prescale-scl-low = <1>;
-};
+#include "i2c_krabby_tentacruel.dtsi"
 
 &i2c4 {
-	/* EC_I2C_USB_C1 */
-	label = "I2C_USB_C1";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST>;
-	pinctrl-0 = <&i2c4_clk_gpe0_default
-		     &i2c4_data_gpe7_default>;
-	pinctrl-names = "default";
-	prescale-scl-low = <1>;
-
-	bc12_port1: rt9490-bc12@53 {
-		compatible = "richtek,rt9490-bc12";
-		status = "okay";
-		reg = <0x53>;
-		irq = <&int_usb_c1_bc12_charger>;
-	};
-
-	ppc_port1: syv682x@40 {
-		compatible = "silergy,syv682x";
-		status = "okay";
-		reg = <0x40>;
-		frs_en_gpio = <&gpio_ec_x_gpio1>;
-	};
-
 	tusb1064_mux_1: tusb1064-mux-1@44 {
 		compatible = "ti,tusb1064";
 		reg = <0x44>;
diff --git a/zephyr/projects/corsola/i2c_krabby_tentacruel.dtsi b/zephyr/projects/corsola/i2c_krabby_tentacruel.dtsi
new file mode 100644
index 0000000000..0265e0354f
--- /dev/null
+++ b/zephyr/projects/corsola/i2c_krabby_tentacruel.dtsi
@@ -0,0 +1,142 @@
+/* Copyright 2022 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/ {
+	named-i2c-ports {
+		compatible = "named-i2c-ports";
+
+		battery {
+			i2c-port = <&i2c1>;
+			remote-port = <1>;
+			enum-names = "I2C_PORT_BATTERY",
+				"I2C_PORT_VIRTUAL_BATTERY";
+		};
+		i2c_charger: charger {
+			i2c-port = <&i2c0>;
+			enum-names = "I2C_PORT_CHARGER",
+				"I2C_PORT_EEPROM";
+		};
+		i2c_sensor: sensor {
+			i2c-port = <&i2c3>;
+			enum-names = "I2C_PORT_SENSOR";
+		};
+		i2c_usb_c0: usb-c0 {
+			i2c-port = <&i2c2>;
+			enum-names = "I2C_PORT_USB_C0",
+				"I2C_PORT_USB_MUX0";
+		};
+		i2c_usb_c1: usb-c1 {
+			i2c-port = <&i2c4>;
+			enum-names = "I2C_PORT_USB_C1",
+				"I2C_PORT_USB_MUX1";
+		};
+	};
+
+};
+
+&pinctrl {
+	i2c3_clk_gpf2_sleep: i2c3_clk_gpf2_sleep {
+		pinmuxs = <&pinctrlf 2 IT8XXX2_ALT_DEFAULT>;
+	};
+	i2c3_data_gpf3_sleep: i2c3_data_gpf3_sleep {
+		pinmuxs = <&pinctrlf 3 IT8XXX2_ALT_DEFAULT>;
+	};
+};
+
+&i2c0 {
+	/* EC_I2C_PWR_CBI */
+	label = "I2C_PWR_CBI";
+	status = "okay";
+	clock-frequency = <I2C_BITRATE_FAST>;
+	pinctrl-0 = <&i2c0_clk_gpb3_default
+		     &i2c0_data_gpb4_default>;
+	pinctrl-names = "default";
+
+	charger: rt9490@53 {
+		compatible = "richtek,rt9490";
+		status = "okay";
+		reg = <0x53>;
+	};
+
+	cbi_eeprom: eeprom@50 {
+		compatible = "atmel,at24";
+		reg = <0x50>;
+		size = <2048>;
+		pagesize = <16>;
+		address-width = <8>;
+		timeout = <5>;
+	};
+};
+
+&i2c1 {
+	/* EC_I2C_BATTERY */
+	label = "I2C_BATTERY";
+	status = "okay";
+	clock-frequency = <50000>;
+	pinctrl-0 = <&i2c1_clk_gpc1_default
+		     &i2c1_data_gpc2_default>;
+	pinctrl-names = "default";
+};
+
+&i2c2 {
+	/* EC_I2C_USB_C0 */
+	label = "I2C_USB_C0";
+	status = "okay";
+	clock-frequency = <I2C_BITRATE_FAST>;
+	pinctrl-0 = <&i2c2_clk_gpf6_default
+		     &i2c2_data_gpf7_default>;
+	pinctrl-names = "default";
+
+	bc12_ppc_port0: rt1739@70 {
+		compatible = "richtek,rt1739";
+		status = "okay";
+		reg = <0x70>;
+	};
+
+	it5205_mux_0: it5205-mux-0@48 {
+		compatible = "ite,it5205";
+		reg = <0x48>;
+	};
+};
+
+&i2c3 {
+	/* EC_I2C_SENSOR */
+	label = "I2C_SENSOR";
+	status = "okay";
+	clock-frequency = <I2C_BITRATE_FAST>;
+	scl-gpios = <&gpiof 2 0>;
+	sda-gpios = <&gpiof 3 0>;
+	pinctrl-0 = <&i2c3_clk_gpf2_default
+		     &i2c3_data_gpf3_default>;
+	pinctrl-1 = <&i2c3_clk_gpf2_sleep
+		     &i2c3_data_gpf3_sleep>;
+	pinctrl-names = "default", "sleep";
+	prescale-scl-low = <1>;
+};
+
+&i2c4 {
+	/* EC_I2C_USB_C1 */
+	label = "I2C_USB_C1";
+	status = "okay";
+	clock-frequency = <I2C_BITRATE_FAST>;
+	pinctrl-0 = <&i2c4_clk_gpe0_default
+		     &i2c4_data_gpe7_default>;
+	pinctrl-names = "default";
+	prescale-scl-low = <1>;
+
+	bc12_port1: rt9490-bc12@53 {
+		compatible = "richtek,rt9490-bc12";
+		status = "okay";
+		reg = <0x53>;
+		irq = <&int_usb_c1_bc12_charger>;
+	};
+
+	ppc_port1: syv682x@40 {
+		compatible = "silergy,syv682x";
+		status = "okay";
+		reg = <0x40>;
+		frs_en_gpio = <&gpio_ec_x_gpio1>;
+	};
+};
diff --git a/zephyr/projects/corsola/i2c_tentacruel.dts b/zephyr/projects/corsola/i2c_tentacruel.dts
index 9ce2d7a7f5..91e88493ec 100644
--- a/zephyr/projects/corsola/i2c_tentacruel.dts
+++ b/zephyr/projects/corsola/i2c_tentacruel.dts
@@ -3,143 +3,9 @@
  * found in the LICENSE file.
  */
 
-/ {
-	named-i2c-ports {
-		compatible = "named-i2c-ports";
-
-		battery {
-			i2c-port = <&i2c1>;
-			remote-port = <1>;
-			enum-names = "I2C_PORT_BATTERY",
-				"I2C_PORT_VIRTUAL_BATTERY";
-		};
-		i2c_charger: charger {
-			i2c-port = <&i2c0>;
-			enum-names = "I2C_PORT_CHARGER",
-				"I2C_PORT_EEPROM";
-		};
-		i2c_sensor: sensor {
-			i2c-port = <&i2c3>;
-			enum-names = "I2C_PORT_SENSOR";
-		};
-		i2c_usb_c0: usb-c0 {
-			i2c-port = <&i2c2>;
-			enum-names = "I2C_PORT_USB_C0",
-				"I2C_PORT_USB_MUX0";
-		};
-		i2c_usb_c1: usb-c1 {
-			i2c-port = <&i2c4>;
-			enum-names = "I2C_PORT_USB_C1",
-				"I2C_PORT_USB_MUX1";
-		};
-	};
-
-};
-
-&pinctrl {
-	i2c3_clk_gpf2_sleep: i2c3_clk_gpf2_sleep {
-		pinmuxs = <&pinctrlf 2 IT8XXX2_ALT_DEFAULT>;
-	};
-	i2c3_data_gpf3_sleep: i2c3_data_gpf3_sleep {
-		pinmuxs = <&pinctrlf 3 IT8XXX2_ALT_DEFAULT>;
-	};
-};
-
-&i2c0 {
-	/* EC_I2C_PWR_CBI */
-	label = "I2C_PWR_CBI";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST>;
-	pinctrl-0 = <&i2c0_clk_gpb3_default
-		     &i2c0_data_gpb4_default>;
-	pinctrl-names = "default";
-
-	charger: rt9490@53 {
-		compatible = "richtek,rt9490";
-		status = "okay";
-		reg = <0x53>;
-	};
-
-	cbi_eeprom: eeprom@50 {
-		compatible = "atmel,at24";
-		reg = <0x50>;
-		size = <2048>;
-		pagesize = <16>;
-		address-width = <8>;
-		timeout = <5>;
-	};
-};
-
-&i2c1 {
-	/* EC_I2C_BATTERY */
-	label = "I2C_BATTERY";
-	status = "okay";
-	clock-frequency = <50000>;
-	pinctrl-0 = <&i2c1_clk_gpc1_default
-		     &i2c1_data_gpc2_default>;
-	pinctrl-names = "default";
-};
-
-&i2c2 {
-	/* EC_I2C_USB_C0 */
-	label = "I2C_USB_C0";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST>;
-	pinctrl-0 = <&i2c2_clk_gpf6_default
-		     &i2c2_data_gpf7_default>;
-	pinctrl-names = "default";
-
-	bc12_ppc_port0: rt1739@70 {
-		compatible = "richtek,rt1739";
-		status = "okay";
-		reg = <0x70>;
-	};
-
-	it5205_mux_0: it5205-mux-0@48 {
-		compatible = "ite,it5205";
-		reg = <0x48>;
-	};
-};
-
-&i2c3 {
-	/* EC_I2C_SENSOR */
-	label = "I2C_SENSOR";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST>;
-	scl-gpios = <&gpiof 2 0>;
-	sda-gpios = <&gpiof 3 0>;
-	pinctrl-0 = <&i2c3_clk_gpf2_default
-		     &i2c3_data_gpf3_default>;
-	pinctrl-1 = <&i2c3_clk_gpf2_sleep
-		     &i2c3_data_gpf3_sleep>;
-	pinctrl-names = "default", "sleep";
-	prescale-scl-low = <1>;
-};
+#include "i2c_krabby_tentacruel.dtsi"
 
 &i2c4 {
-	/* EC_I2C_USB_C1 */
-	label = "I2C_USB_C1";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST>;
-	pinctrl-0 = <&i2c4_clk_gpe0_default
-		     &i2c4_data_gpe7_default>;
-	pinctrl-names = "default";
-	prescale-scl-low = <1>;
-
-	bc12_port1: rt9490-bc12@53 {
-		compatible = "richtek,rt9490-bc12";
-		status = "okay";
-		reg = <0x53>;
-		irq = <&int_usb_c1_bc12_charger>;
-	};
-
-	ppc_port1: syv682x@40 {
-		compatible = "silergy,syv682x";
-		status = "okay";
-		reg = <0x40>;
-		frs_en_gpio = <&gpio_ec_x_gpio1>;
-	};
-
 	ps8743_mux_1: ps8743-mux-1@10 {
 		compatible = "parade,ps8743";
 		reg = <0x10>;
diff --git a/zephyr/projects/herobrine/i2c_common.dtsi b/zephyr/projects/herobrine/i2c_common.dtsi
new file mode 100644
index 0000000000..27af28cc7a
--- /dev/null
+++ b/zephyr/projects/herobrine/i2c_common.dtsi
@@ -0,0 +1,176 @@
+/* Copyright 2022 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/ {
+	aliases {
+		i2c-0 = &i2c0_0;
+		i2c-1 = &i2c1_0;
+		i2c-2 = &i2c2_0;
+		i2c-3 = &i2c3_0;
+		i2c-4 = &i2c4_1;
+		i2c-5 = &i2c5_0;
+		i2c-7 = &i2c7_0;
+	};
+
+	named-i2c-ports {
+		compatible = "named-i2c-ports";
+
+		i2c_power: power {
+			i2c-port = <&i2c0_0>;
+			remote-port = <0>;
+			enum-names = "I2C_PORT_POWER",
+				"I2C_PORT_BATTERY",
+				"I2C_PORT_VIRTUAL_BATTERY",
+				"I2C_PORT_CHARGER";
+		};
+		i2c_tcpc0: tcpc0 {
+			i2c-port = <&i2c1_0>;
+			dynamic-speed;
+			enum-names = "I2C_PORT_TCPC0";
+		};
+		i2c_tcpc1: tcpc1 {
+			i2c-port = <&i2c2_0>;
+			dynamic-speed;
+			enum-names = "I2C_PORT_TCPC1";
+		};
+		rtc {
+			i2c-port = <&i2c4_1>;
+			enum-names = "I2C_PORT_RTC";
+		};
+		i2c_eeprom: eeprom {
+			i2c-port = <&i2c5_0>;
+			enum-names = "I2C_PORT_EEPROM";
+		};
+		i2c_sensor: sensor {
+			i2c-port = <&i2c7_0>;
+			enum-names = "I2C_PORT_SENSOR",
+				"I2C_PORT_ACCEL";
+		};
+	};
+
+
+};
+
+&i2c0_0 {
+	label = "I2C_POWER";
+	status = "okay";
+	clock-frequency = <I2C_BITRATE_STANDARD>;
+	pinctrl-0 = <&i2c0_0_sda_scl_gpb4_b5>;
+	pinctrl-names = "default";
+
+	bc12_port0: pi3usb9201@5f {
+		compatible = "pericom,pi3usb9201";
+		status = "okay";
+		reg = <0x5f>;
+		irq = <&int_usb_c0_bc12>;
+	};
+
+	charger: isl923x@9 {
+		compatible = "intersil,isl923x";
+		status = "okay";
+		reg = <0x9>;
+	};
+};
+
+&i2c_ctrl0 {
+	status = "okay";
+};
+
+&i2c1_0 {
+	label = "I2C_USB_C0_PD";
+	status = "okay";
+	clock-frequency = <I2C_BITRATE_FAST_PLUS>;
+	pinctrl-0 = <&i2c1_0_sda_scl_gp87_90>;
+	pinctrl-names = "default";
+
+	ppc_port0: sn5s330@40 {
+		compatible = "ti,sn5s330";
+		status = "okay";
+		reg = <0x40>;
+	};
+
+	ppc_port0_alt: syv682x@41 {
+		compatible = "silergy,syv682x";
+		status = "okay";
+		reg = <0x41>;
+		frs_en_gpio = <&gpio_usb_c0_frs_en>;
+	};
+};
+
+&i2c_ctrl1 {
+	status = "okay";
+};
+
+&i2c2_0 {
+	label = "I2C_USB_C1_PD";
+	status = "okay";
+	clock-frequency = <I2C_BITRATE_FAST_PLUS>;
+	pinctrl-0 = <&i2c2_0_sda_scl_gp91_92>;
+	pinctrl-names = "default";
+
+	ppc_port1: sn5s330@40 {
+		compatible = "ti,sn5s330";
+		status = "okay";
+		reg = <0x40>;
+	};
+};
+
+&i2c_ctrl2 {
+	status = "okay";
+};
+
+&i2c3_0 {
+	/* Not used as no WLC connected */
+	clock-frequency = <I2C_BITRATE_FAST>;
+};
+
+&i2c4_1 {
+	label = "I2C_RTC";
+	status = "okay";
+	clock-frequency = <I2C_BITRATE_FAST>;
+	pinctrl-0 = <&i2c4_1_sda_scl_gpf2_f3>;
+	pinctrl-names = "default";
+
+	pcf85063a: pcf85063a@51 {
+		compatible = "nxp,rtc-pcf85063a";
+		reg = <0x51>;
+		int-pin = <&gpio_rtc_ec_wake_odl>;
+	};
+};
+
+&i2c_ctrl4 {
+	status = "okay";
+};
+
+&i2c5_0 {
+	label = "I2C_EEPROM";
+	status = "okay";
+	clock-frequency = <I2C_BITRATE_FAST>;
+	pinctrl-0 = <&i2c5_0_sda_scl_gp33_36>;
+	pinctrl-names = "default";
+
+	bc12_port1: pi3usb9201@5f {
+		compatible = "pericom,pi3usb9201";
+		status = "okay";
+		reg = <0x5f>;
+		irq = <&int_usb_c1_bc12>;
+	};
+};
+
+&i2c_ctrl5 {
+	status = "okay";
+};
+
+&i2c7_0 {
+	label = "I2C_SENSOR";
+	status = "okay";
+	clock-frequency = <I2C_BITRATE_FAST>;
+	pinctrl-0 = <&i2c7_0_sda_scl_gpb2_b3>;
+	pinctrl-names = "default";
+};
+
+&i2c_ctrl7 {
+	status = "okay";
+};
diff --git a/zephyr/projects/herobrine/i2c_evoker.dts b/zephyr/projects/herobrine/i2c_evoker.dts
index f8507f427c..c72ab99054 100644
--- a/zephyr/projects/herobrine/i2c_evoker.dts
+++ b/zephyr/projects/herobrine/i2c_evoker.dts
@@ -3,184 +3,18 @@
  * found in the LICENSE file.
  */
 
-/ {
-	aliases {
-		i2c-0 = &i2c0_0;
-		i2c-1 = &i2c1_0;
-		i2c-2 = &i2c2_0;
-		i2c-3 = &i2c3_0;
-		i2c-4 = &i2c4_1;
-		i2c-5 = &i2c5_0;
-		i2c-7 = &i2c7_0;
-	};
-
-	named-i2c-ports {
-		compatible = "named-i2c-ports";
-
-		i2c_power: power {
-			i2c-port = <&i2c0_0>;
-			remote-port = <0>;
-			enum-names = "I2C_PORT_POWER",
-				"I2C_PORT_BATTERY",
-				"I2C_PORT_VIRTUAL_BATTERY",
-				"I2C_PORT_CHARGER";
-		};
-		i2c_tcpc0: tcpc0 {
-			i2c-port = <&i2c1_0>;
-			dynamic-speed;
-			enum-names = "I2C_PORT_TCPC0";
-		};
-		i2c_tcpc1: tcpc1 {
-			i2c-port = <&i2c2_0>;
-			dynamic-speed;
-			enum-names = "I2C_PORT_TCPC1";
-		};
-		rtc {
-			i2c-port = <&i2c4_1>;
-			enum-names = "I2C_PORT_RTC";
-		};
-		i2c_eeprom: eeprom {
-			i2c-port = <&i2c5_0>;
-			enum-names = "I2C_PORT_EEPROM";
-		};
-		i2c_sensor: sensor {
-			i2c-port = <&i2c7_0>;
-			enum-names = "I2C_PORT_SENSOR",
-				"I2C_PORT_ACCEL";
-		};
-	};
-
-
-};
-
-&i2c0_0 {
-	label = "I2C_POWER";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_STANDARD>;
-	pinctrl-0 = <&i2c0_0_sda_scl_gpb4_b5>;
-	pinctrl-names = "default";
-
-	bc12_port0: pi3usb9201@5f {
-		compatible = "pericom,pi3usb9201";
-		status = "okay";
-		reg = <0x5f>;
-		irq = <&int_usb_c0_bc12>;
-	};
-
-	charger: isl923x@9 {
-		compatible = "intersil,isl923x";
-		status = "okay";
-		reg = <0x9>;
-	};
-};
-
-&i2c_ctrl0 {
-	status = "okay";
-};
+#include "i2c_common.dtsi"
 
 &i2c1_0 {
-	label = "I2C_USB_C0_PD";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST_PLUS>;
-	pinctrl-0 = <&i2c1_0_sda_scl_gp87_90>;
-	pinctrl-names = "default";
-
-	ppc_port0: sn5s330@40 {
-		compatible = "ti,sn5s330";
-		status = "okay";
-		reg = <0x40>;
-	};
-
-	ppc_port0_alt: syv682x@41 {
-		compatible = "silergy,syv682x";
-		status = "okay";
-		reg = <0x41>;
-		frs_en_gpio = <&gpio_usb_c0_frs_en>;
-	};
-
 	tcpc_port0: ps8xxx@b {
 		compatible = "parade,ps8xxx";
 		reg = <0xb>;
 	};
 };
 
-&i2c_ctrl1 {
-	status = "okay";
-};
-
 &i2c2_0 {
-	label = "I2C_USB_C1_PD";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST_PLUS>;
-	pinctrl-0 = <&i2c2_0_sda_scl_gp91_92>;
-	pinctrl-names = "default";
-
-	ppc_port1: sn5s330@40 {
-		compatible = "ti,sn5s330";
-		status = "okay";
-		reg = <0x40>;
-	};
-
 	tcpc_port1: ps8xxx@b {
 		compatible = "parade,ps8xxx";
 		reg = <0xb>;
 	};
 };
-
-&i2c_ctrl2 {
-	status = "okay";
-};
-
-&i2c3_0 {
-	/* Not used as no WLC connected */
-	clock-frequency = <I2C_BITRATE_FAST>;
-};
-
-&i2c4_1 {
-	label = "I2C_RTC";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST>;
-	pinctrl-0 = <&i2c4_1_sda_scl_gpf2_f3>;
-	pinctrl-names = "default";
-
-	pcf85063a: pcf85063a@51 {
-		compatible = "nxp,rtc-pcf85063a";
-		reg = <0x51>;
-		int-pin = <&gpio_rtc_ec_wake_odl>;
-	};
-};
-
-&i2c_ctrl4 {
-	status = "okay";
-};
-
-&i2c5_0 {
-	label = "I2C_EEPROM";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST>;
-	pinctrl-0 = <&i2c5_0_sda_scl_gp33_36>;
-	pinctrl-names = "default";
-
-	bc12_port1: pi3usb9201@5f {
-		compatible = "pericom,pi3usb9201";
-		status = "okay";
-		reg = <0x5f>;
-		irq = <&int_usb_c1_bc12>;
-	};
-};
-
-&i2c_ctrl5 {
-	status = "okay";
-};
-
-&i2c7_0 {
-	label = "I2C_SENSOR";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST>;
-	pinctrl-0 = <&i2c7_0_sda_scl_gpb2_b3>;
-	pinctrl-names = "default";
-};
-
-&i2c_ctrl7 {
-	status = "okay";
-};
diff --git a/zephyr/projects/herobrine/i2c_herobrine.dts b/zephyr/projects/herobrine/i2c_herobrine.dts
index f8507f427c..c72ab99054 100644
--- a/zephyr/projects/herobrine/i2c_herobrine.dts
+++ b/zephyr/projects/herobrine/i2c_herobrine.dts
@@ -3,184 +3,18 @@
  * found in the LICENSE file.
  */
 
-/ {
-	aliases {
-		i2c-0 = &i2c0_0;
-		i2c-1 = &i2c1_0;
-		i2c-2 = &i2c2_0;
-		i2c-3 = &i2c3_0;
-		i2c-4 = &i2c4_1;
-		i2c-5 = &i2c5_0;
-		i2c-7 = &i2c7_0;
-	};
-
-	named-i2c-ports {
-		compatible = "named-i2c-ports";
-
-		i2c_power: power {
-			i2c-port = <&i2c0_0>;
-			remote-port = <0>;
-			enum-names = "I2C_PORT_POWER",
-				"I2C_PORT_BATTERY",
-				"I2C_PORT_VIRTUAL_BATTERY",
-				"I2C_PORT_CHARGER";
-		};
-		i2c_tcpc0: tcpc0 {
-			i2c-port = <&i2c1_0>;
-			dynamic-speed;
-			enum-names = "I2C_PORT_TCPC0";
-		};
-		i2c_tcpc1: tcpc1 {
-			i2c-port = <&i2c2_0>;
-			dynamic-speed;
-			enum-names = "I2C_PORT_TCPC1";
-		};
-		rtc {
-			i2c-port = <&i2c4_1>;
-			enum-names = "I2C_PORT_RTC";
-		};
-		i2c_eeprom: eeprom {
-			i2c-port = <&i2c5_0>;
-			enum-names = "I2C_PORT_EEPROM";
-		};
-		i2c_sensor: sensor {
-			i2c-port = <&i2c7_0>;
-			enum-names = "I2C_PORT_SENSOR",
-				"I2C_PORT_ACCEL";
-		};
-	};
-
-
-};
-
-&i2c0_0 {
-	label = "I2C_POWER";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_STANDARD>;
-	pinctrl-0 = <&i2c0_0_sda_scl_gpb4_b5>;
-	pinctrl-names = "default";
-
-	bc12_port0: pi3usb9201@5f {
-		compatible = "pericom,pi3usb9201";
-		status = "okay";
-		reg = <0x5f>;
-		irq = <&int_usb_c0_bc12>;
-	};
-
-	charger: isl923x@9 {
-		compatible = "intersil,isl923x";
-		status = "okay";
-		reg = <0x9>;
-	};
-};
-
-&i2c_ctrl0 {
-	status = "okay";
-};
+#include "i2c_common.dtsi"
 
 &i2c1_0 {
-	label = "I2C_USB_C0_PD";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST_PLUS>;
-	pinctrl-0 = <&i2c1_0_sda_scl_gp87_90>;
-	pinctrl-names = "default";
-
-	ppc_port0: sn5s330@40 {
-		compatible = "ti,sn5s330";
-		status = "okay";
-		reg = <0x40>;
-	};
-
-	ppc_port0_alt: syv682x@41 {
-		compatible = "silergy,syv682x";
-		status = "okay";
-		reg = <0x41>;
-		frs_en_gpio = <&gpio_usb_c0_frs_en>;
-	};
-
 	tcpc_port0: ps8xxx@b {
 		compatible = "parade,ps8xxx";
 		reg = <0xb>;
 	};
 };
 
-&i2c_ctrl1 {
-	status = "okay";
-};
-
 &i2c2_0 {
-	label = "I2C_USB_C1_PD";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST_PLUS>;
-	pinctrl-0 = <&i2c2_0_sda_scl_gp91_92>;
-	pinctrl-names = "default";
-
-	ppc_port1: sn5s330@40 {
-		compatible = "ti,sn5s330";
-		status = "okay";
-		reg = <0x40>;
-	};
-
 	tcpc_port1: ps8xxx@b {
 		compatible = "parade,ps8xxx";
 		reg = <0xb>;
 	};
 };
-
-&i2c_ctrl2 {
-	status = "okay";
-};
-
-&i2c3_0 {
-	/* Not used as no WLC connected */
-	clock-frequency = <I2C_BITRATE_FAST>;
-};
-
-&i2c4_1 {
-	label = "I2C_RTC";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST>;
-	pinctrl-0 = <&i2c4_1_sda_scl_gpf2_f3>;
-	pinctrl-names = "default";
-
-	pcf85063a: pcf85063a@51 {
-		compatible = "nxp,rtc-pcf85063a";
-		reg = <0x51>;
-		int-pin = <&gpio_rtc_ec_wake_odl>;
-	};
-};
-
-&i2c_ctrl4 {
-	status = "okay";
-};
-
-&i2c5_0 {
-	label = "I2C_EEPROM";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST>;
-	pinctrl-0 = <&i2c5_0_sda_scl_gp33_36>;
-	pinctrl-names = "default";
-
-	bc12_port1: pi3usb9201@5f {
-		compatible = "pericom,pi3usb9201";
-		status = "okay";
-		reg = <0x5f>;
-		irq = <&int_usb_c1_bc12>;
-	};
-};
-
-&i2c_ctrl5 {
-	status = "okay";
-};
-
-&i2c7_0 {
-	label = "I2C_SENSOR";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST>;
-	pinctrl-0 = <&i2c7_0_sda_scl_gpb2_b3>;
-	pinctrl-names = "default";
-};
-
-&i2c_ctrl7 {
-	status = "okay";
-};
diff --git a/zephyr/projects/herobrine/i2c_hoglin.dts b/zephyr/projects/herobrine/i2c_hoglin.dts
index b4e28e9507..37cd7a93e1 100644
--- a/zephyr/projects/herobrine/i2c_hoglin.dts
+++ b/zephyr/projects/herobrine/i2c_hoglin.dts
@@ -3,184 +3,18 @@
  * found in the LICENSE file.
  */
 
-/ {
-	aliases {
-		i2c-0 = &i2c0_0;
-		i2c-1 = &i2c1_0;
-		i2c-2 = &i2c2_0;
-		i2c-3 = &i2c3_0;
-		i2c-4 = &i2c4_1;
-		i2c-5 = &i2c5_0;
-		i2c-7 = &i2c7_0;
-	};
-
-	named-i2c-ports {
-		compatible = "named-i2c-ports";
-
-		i2c_power: power {
-			i2c-port = <&i2c0_0>;
-			remote-port = <0>;
-			enum-names = "I2C_PORT_POWER",
-				"I2C_PORT_BATTERY",
-				"I2C_PORT_VIRTUAL_BATTERY",
-				"I2C_PORT_CHARGER";
-		};
-		i2c_tcpc0: tcpc0 {
-			i2c-port = <&i2c1_0>;
-			dynamic-speed;
-			enum-names = "I2C_PORT_TCPC0";
-		};
-		i2c_tcpc1: tcpc1 {
-			i2c-port = <&i2c2_0>;
-			dynamic-speed;
-			enum-names = "I2C_PORT_TCPC1";
-		};
-		rtc {
-			i2c-port = <&i2c4_1>;
-			enum-names = "I2C_PORT_RTC";
-		};
-		i2c_eeprom: eeprom {
-			i2c-port = <&i2c5_0>;
-			enum-names = "I2C_PORT_EEPROM";
-		};
-		i2c_sensor: sensor {
-			i2c-port = <&i2c7_0>;
-			enum-names = "I2C_PORT_SENSOR",
-				"I2C_PORT_ACCEL";
-		};
-	};
-
-
-};
-
-&i2c0_0 {
-	label = "I2C_POWER";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_STANDARD>;
-	pinctrl-0 = <&i2c0_0_sda_scl_gpb4_b5>;
-	pinctrl-names = "default";
-
-	bc12_port0: pi3usb9201@5f {
-		compatible = "pericom,pi3usb9201";
-		status = "okay";
-		reg = <0x5f>;
-		irq = <&int_usb_c0_bc12>;
-	};
-
-	charger: isl923x@9 {
-		compatible = "intersil,isl923x";
-		status = "okay";
-		reg = <0x9>;
-	};
-};
-
-&i2c_ctrl0 {
-	status = "okay";
-};
+#include "i2c_common.dtsi"
 
 &i2c1_0 {
-	label = "I2C_USB_C0_PD";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST_PLUS>;
-	pinctrl-0 = <&i2c1_0_sda_scl_gp87_90>;
-	pinctrl-names = "default";
-
-	ppc_port0: sn5s330@40 {
-		compatible = "ti,sn5s330";
-		status = "okay";
-		reg = <0x40>;
-	};
-
-	ppc_port0_alt: syv682x@41 {
-		compatible = "silergy,syv682x";
-		status = "okay";
-		reg = <0x41>;
-		frs_en_gpio = <&gpio_usb_c0_frs_en>;
-	};
-
 	tcpc_port0: ps8xxx@1b {
 		compatible = "parade,ps8xxx";
 		reg = <0x1b>;
 	};
 };
 
-&i2c_ctrl1 {
-	status = "okay";
-};
-
 &i2c2_0 {
-	label = "I2C_USB_C1_PD";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST_PLUS>;
-	pinctrl-0 = <&i2c2_0_sda_scl_gp91_92>;
-	pinctrl-names = "default";
-
-	ppc_port1: sn5s330@40 {
-		compatible = "ti,sn5s330";
-		status = "okay";
-		reg = <0x40>;
-	};
-
 	tcpc_port1: ps8xxx@1b {
 		compatible = "parade,ps8xxx";
 		reg = <0x1b>;
 	};
 };
-
-&i2c_ctrl2 {
-	status = "okay";
-};
-
-&i2c3_0 {
-	/* Not used as no WLC connected */
-	clock-frequency = <I2C_BITRATE_FAST>;
-};
-
-&i2c4_1 {
-	label = "I2C_RTC";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST>;
-	pinctrl-0 = <&i2c4_1_sda_scl_gpf2_f3>;
-	pinctrl-names = "default";
-
-	pcf85063a: pcf85063a@51 {
-		compatible = "nxp,rtc-pcf85063a";
-		reg = <0x51>;
-		int-pin = <&gpio_rtc_ec_wake_odl>;
-	};
-};
-
-&i2c_ctrl4 {
-	status = "okay";
-};
-
-&i2c5_0 {
-	label = "I2C_EEPROM";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST>;
-	pinctrl-0 = <&i2c5_0_sda_scl_gp33_36>;
-	pinctrl-names = "default";
-
-	bc12_port1: pi3usb9201@5f {
-		compatible = "pericom,pi3usb9201";
-		status = "okay";
-		reg = <0x5f>;
-		irq = <&int_usb_c1_bc12>;
-	};
-};
-
-&i2c_ctrl5 {
-	status = "okay";
-};
-
-&i2c7_0 {
-	label = "I2C_SENSOR";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST>;
-	pinctrl-0 = <&i2c7_0_sda_scl_gpb2_b3>;
-	pinctrl-names = "default";
-};
-
-&i2c_ctrl7 {
-	status = "okay";
-};
diff --git a/zephyr/projects/herobrine/i2c_villager.dts b/zephyr/projects/herobrine/i2c_villager.dts
index f8507f427c..c72ab99054 100644
--- a/zephyr/projects/herobrine/i2c_villager.dts
+++ b/zephyr/projects/herobrine/i2c_villager.dts
@@ -3,184 +3,18 @@
  * found in the LICENSE file.
  */
 
-/ {
-	aliases {
-		i2c-0 = &i2c0_0;
-		i2c-1 = &i2c1_0;
-		i2c-2 = &i2c2_0;
-		i2c-3 = &i2c3_0;
-		i2c-4 = &i2c4_1;
-		i2c-5 = &i2c5_0;
-		i2c-7 = &i2c7_0;
-	};
-
-	named-i2c-ports {
-		compatible = "named-i2c-ports";
-
-		i2c_power: power {
-			i2c-port = <&i2c0_0>;
-			remote-port = <0>;
-			enum-names = "I2C_PORT_POWER",
-				"I2C_PORT_BATTERY",
-				"I2C_PORT_VIRTUAL_BATTERY",
-				"I2C_PORT_CHARGER";
-		};
-		i2c_tcpc0: tcpc0 {
-			i2c-port = <&i2c1_0>;
-			dynamic-speed;
-			enum-names = "I2C_PORT_TCPC0";
-		};
-		i2c_tcpc1: tcpc1 {
-			i2c-port = <&i2c2_0>;
-			dynamic-speed;
-			enum-names = "I2C_PORT_TCPC1";
-		};
-		rtc {
-			i2c-port = <&i2c4_1>;
-			enum-names = "I2C_PORT_RTC";
-		};
-		i2c_eeprom: eeprom {
-			i2c-port = <&i2c5_0>;
-			enum-names = "I2C_PORT_EEPROM";
-		};
-		i2c_sensor: sensor {
-			i2c-port = <&i2c7_0>;
-			enum-names = "I2C_PORT_SENSOR",
-				"I2C_PORT_ACCEL";
-		};
-	};
-
-
-};
-
-&i2c0_0 {
-	label = "I2C_POWER";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_STANDARD>;
-	pinctrl-0 = <&i2c0_0_sda_scl_gpb4_b5>;
-	pinctrl-names = "default";
-
-	bc12_port0: pi3usb9201@5f {
-		compatible = "pericom,pi3usb9201";
-		status = "okay";
-		reg = <0x5f>;
-		irq = <&int_usb_c0_bc12>;
-	};
-
-	charger: isl923x@9 {
-		compatible = "intersil,isl923x";
-		status = "okay";
-		reg = <0x9>;
-	};
-};
-
-&i2c_ctrl0 {
-	status = "okay";
-};
+#include "i2c_common.dtsi"
 
 &i2c1_0 {
-	label = "I2C_USB_C0_PD";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST_PLUS>;
-	pinctrl-0 = <&i2c1_0_sda_scl_gp87_90>;
-	pinctrl-names = "default";
-
-	ppc_port0: sn5s330@40 {
-		compatible = "ti,sn5s330";
-		status = "okay";
-		reg = <0x40>;
-	};
-
-	ppc_port0_alt: syv682x@41 {
-		compatible = "silergy,syv682x";
-		status = "okay";
-		reg = <0x41>;
-		frs_en_gpio = <&gpio_usb_c0_frs_en>;
-	};
-
 	tcpc_port0: ps8xxx@b {
 		compatible = "parade,ps8xxx";
 		reg = <0xb>;
 	};
 };
 
-&i2c_ctrl1 {
-	status = "okay";
-};
-
 &i2c2_0 {
-	label = "I2C_USB_C1_PD";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST_PLUS>;
-	pinctrl-0 = <&i2c2_0_sda_scl_gp91_92>;
-	pinctrl-names = "default";
-
-	ppc_port1: sn5s330@40 {
-		compatible = "ti,sn5s330";
-		status = "okay";
-		reg = <0x40>;
-	};
-
 	tcpc_port1: ps8xxx@b {
 		compatible = "parade,ps8xxx";
 		reg = <0xb>;
 	};
 };
-
-&i2c_ctrl2 {
-	status = "okay";
-};
-
-&i2c3_0 {
-	/* Not used as no WLC connected */
-	clock-frequency = <I2C_BITRATE_FAST>;
-};
-
-&i2c4_1 {
-	label = "I2C_RTC";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST>;
-	pinctrl-0 = <&i2c4_1_sda_scl_gpf2_f3>;
-	pinctrl-names = "default";
-
-	pcf85063a: pcf85063a@51 {
-		compatible = "nxp,rtc-pcf85063a";
-		reg = <0x51>;
-		int-pin = <&gpio_rtc_ec_wake_odl>;
-	};
-};
-
-&i2c_ctrl4 {
-	status = "okay";
-};
-
-&i2c5_0 {
-	label = "I2C_EEPROM";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST>;
-	pinctrl-0 = <&i2c5_0_sda_scl_gp33_36>;
-	pinctrl-names = "default";
-
-	bc12_port1: pi3usb9201@5f {
-		compatible = "pericom,pi3usb9201";
-		status = "okay";
-		reg = <0x5f>;
-		irq = <&int_usb_c1_bc12>;
-	};
-};
-
-&i2c_ctrl5 {
-	status = "okay";
-};
-
-&i2c7_0 {
-	label = "I2C_SENSOR";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST>;
-	pinctrl-0 = <&i2c7_0_sda_scl_gpb2_b3>;
-	pinctrl-names = "default";
-};
-
-&i2c_ctrl7 {
-	status = "okay";
-};