zephyr: dts: fix a bunch of duplicate node name

Upstream Zephyr recently introduced a change to detect duplicate dts
node names, as that is against the devicetree specs.

Fix various internal dts files by deduplicating few nodes and merging
some aliases blocks.

BRANCH=none
BUG=none
TEST=zmake build <board>

Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
Change-Id: I8697a8dfc93748d90d11cada6b0b0b9bb3a74fe9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3916394
Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org>

8 files changed, 86 insertions, 112 deletions

diff --git a/zephyr/projects/brya/motionsense.dts b/zephyr/projects/brya/motionsense.dts
index 78b5d2387e..08994e30cc 100644
--- a/zephyr/projects/brya/motionsense.dts
+++ b/zephyr/projects/brya/motionsense.dts
@@ -65,12 +65,12 @@
 			status = "okay";
 		};
 
-		lsm6dso_accel_data: lsm6dso-drv-data {
+		lsm6dso_accel_data: lsm6dso-accel-drv-data {
 			compatible = "cros-ec,drvdata-lsm6dso";
 			status = "okay";
 		};
 
-		lsm6dso_gyro_data: lsm6dso-drv-data {
+		lsm6dso_gyro_data: lsm6dso-gyro-drv-data {
 			compatible = "cros-ec,drvdata-lsm6dso";
 			status = "okay";
 		};
diff --git a/zephyr/projects/corsola/gpio_krabby.dts b/zephyr/projects/corsola/gpio_krabby.dts
index 32498ab606..eb2314cec0 100644
--- a/zephyr/projects/corsola/gpio_krabby.dts
+++ b/zephyr/projects/corsola/gpio_krabby.dts
@@ -9,6 +9,12 @@
 	aliases {
 		gpio-cbi-wp = &gpio_ec_cbi_wp;
 		gpio-wp = &ec_flash_wp_odl;
+		gpio-en-hdmi-pwr = &gpio_ec_x_gpio1;
+		gpio-usb-c1-frs-en = &gpio_ec_x_gpio1;
+		gpio-usb-c1-ppc-int-odl = &gpio_x_ec_gpio2;
+		gpio-ps185-ec-dp-hpd = &gpio_x_ec_gpio2;
+		gpio-usb-c1-dp-in-hpd = &gpio_ec_x_gpio3;
+		gpio-ps185-pwrdn-odl = &gpio_ec_x_gpio3;
 	};
 
 	named-gpios {
@@ -151,18 +157,6 @@
 		};
 	};
 
-	/*
-	 * aliases for sub-board GPIOs
-	 */
-	aliases {
-		gpio-en-hdmi-pwr = &gpio_ec_x_gpio1;
-		gpio-usb-c1-frs-en = &gpio_ec_x_gpio1;
-		gpio-usb-c1-ppc-int-odl = &gpio_x_ec_gpio2;
-		gpio-ps185-ec-dp-hpd = &gpio_x_ec_gpio2;
-		gpio-usb-c1-dp-in-hpd = &gpio_ec_x_gpio3;
-		gpio-ps185-pwrdn-odl = &gpio_ec_x_gpio3;
-	};
-
 	hibernate-wake-pins {
 		compatible = "cros-ec,hibernate-wake-pins";
 		wakeup-irqs = <&int_ac_present
diff --git a/zephyr/projects/corsola/gpio_magikarp.dts b/zephyr/projects/corsola/gpio_magikarp.dts
index aeaeab2431..d1862ed75c 100644
--- a/zephyr/projects/corsola/gpio_magikarp.dts
+++ b/zephyr/projects/corsola/gpio_magikarp.dts
@@ -9,6 +9,12 @@
 	aliases {
 		gpio-cbi-wp = &gpio_ec_cbi_wp;
 		gpio-wp = &ec_flash_wp_odl;
+		gpio-en-hdmi-pwr = &gpio_ec_x_gpio1;
+		gpio-usb-c1-frs-en = &gpio_ec_x_gpio1;
+		gpio-usb-c1-ppc-int-odl = &gpio_x_ec_gpio2;
+		gpio-ps185-ec-dp-hpd = &gpio_x_ec_gpio2;
+		gpio-usb-c1-dp-in-hpd = &gpio_ec_x_gpio3;
+		gpio-ps185-pwrdn-odl = &gpio_ec_x_gpio3;
 	};
 
 	named-gpios {
@@ -155,18 +161,6 @@
 		};
 	};
 
-	/*
-	 * aliases for sub-board GPIOs
-	 */
-	aliases {
-		gpio-en-hdmi-pwr = &gpio_ec_x_gpio1;
-		gpio-usb-c1-frs-en = &gpio_ec_x_gpio1;
-		gpio-usb-c1-ppc-int-odl = &gpio_x_ec_gpio2;
-		gpio-ps185-ec-dp-hpd = &gpio_x_ec_gpio2;
-		gpio-usb-c1-dp-in-hpd = &gpio_ec_x_gpio3;
-		gpio-ps185-pwrdn-odl = &gpio_ec_x_gpio3;
-	};
-
 	hibernate-wake-pins {
 		compatible = "cros-ec,hibernate-wake-pins";
 		wakeup-irqs = <&int_ac_present
diff --git a/zephyr/projects/corsola/gpio_tentacruel.dts b/zephyr/projects/corsola/gpio_tentacruel.dts
index 75607cb561..8c2e67ecb4 100644
--- a/zephyr/projects/corsola/gpio_tentacruel.dts
+++ b/zephyr/projects/corsola/gpio_tentacruel.dts
@@ -9,6 +9,12 @@
 	aliases {
 		gpio-cbi-wp = &gpio_ec_cbi_wp;
 		gpio-wp = &ec_flash_wp_odl;
+		gpio-en-hdmi-pwr = &gpio_ec_x_gpio1;
+		gpio-usb-c1-frs-en = &gpio_ec_x_gpio1;
+		gpio-usb-c1-ppc-int-odl = &gpio_x_ec_gpio2;
+		gpio-ps185-ec-dp-hpd = &gpio_x_ec_gpio2;
+		gpio-usb-c1-dp-in-hpd = &gpio_ec_x_gpio3;
+		gpio-ps185-pwrdn-odl = &gpio_ec_x_gpio3;
 	};
 
 	named-gpios {
@@ -157,18 +163,6 @@
 		};
 	};
 
-	/*
-	 * aliases for sub-board GPIOs
-	 */
-	aliases {
-		gpio-en-hdmi-pwr = &gpio_ec_x_gpio1;
-		gpio-usb-c1-frs-en = &gpio_ec_x_gpio1;
-		gpio-usb-c1-ppc-int-odl = &gpio_x_ec_gpio2;
-		gpio-ps185-ec-dp-hpd = &gpio_x_ec_gpio2;
-		gpio-usb-c1-dp-in-hpd = &gpio_ec_x_gpio3;
-		gpio-ps185-pwrdn-odl = &gpio_ec_x_gpio3;
-	};
-
 	hibernate-wake-pins {
 		compatible = "cros-ec,hibernate-wake-pins";
 		wakeup-irqs = <&int_ac_present
diff --git a/zephyr/projects/nissa/joxer/overlay.dts b/zephyr/projects/nissa/joxer/overlay.dts
index a72072b5a3..0ae3dfc825 100644
--- a/zephyr/projects/nissa/joxer/overlay.dts
+++ b/zephyr/projects/nissa/joxer/overlay.dts
@@ -10,6 +10,27 @@
 		gpio-cbi-wp = &gpio_ec_cbi_wp;
 		gpio-wp = &gpio_ec_wp_odl;
 		int-wp = &int_wp_l;
+		/*
+		 * USB-C: interrupt input.
+		 * I2C pins are on i2c_ec_i2c_sub_usb_c1
+		 */
+		gpio-usb-c1-int-odl = &gpio_sb_1;
+		/*
+		 * USB-A: VBUS enable output
+		 * LTE: power enable output
+		 */
+		gpio-en-usb-a1-vbus = &gpio_sb_2;
+		/*
+		 * HDMI: power enable output, HDMI enable output,
+		 * and HPD input
+		 */
+		gpio-en-rails-odl = &gpio_sb_1;
+		gpio-hdmi-en-odl = &gpio_sb_4;
+		gpio-hpd-odl = &gpio_sb_3;
+		/*
+		 * Enable S5 rails for LTE sub-board
+		 */
+		gpio-en-sub-s5-rails = &gpio_sb_2;
 	};
 
 	ec-console {
@@ -148,30 +169,6 @@
 		};
 	};
 
-	/*
-	 * Aliases used for sub-board GPIOs.
-	 */
-	aliases {
-	  /* USB-C: interrupt input. I2C pins are on i2c_ec_i2c_sub_usb_c1 */
-		gpio-usb-c1-int-odl = &gpio_sb_1;
-		/*
-		 * USB-A: VBUS enable output
-		 * LTE: power enable output
-		 */
-		gpio-en-usb-a1-vbus = &gpio_sb_2;
-		/*
-		 * HDMI: power enable output, HDMI enable output,
-		 * and HPD input
-		 */
-		gpio-en-rails-odl = &gpio_sb_1;
-		gpio-hdmi-en-odl = &gpio_sb_4;
-		gpio-hpd-odl = &gpio_sb_3;
-		/*
-		 * Enable S5 rails for LTE sub-board
-		 */
-		gpio-en-sub-s5-rails = &gpio_sb_2;
-	};
-
 	temp_memory: memory {
 		compatible = "cros-ec,temp-sensor-thermistor";
 		thermistor = <&thermistor_3V3_51K1_47K_4050B>;
diff --git a/zephyr/projects/nissa/nereid/overlay.dts b/zephyr/projects/nissa/nereid/overlay.dts
index 76f6b197be..1bb398e63d 100644
--- a/zephyr/projects/nissa/nereid/overlay.dts
+++ b/zephyr/projects/nissa/nereid/overlay.dts
@@ -10,8 +10,30 @@
 		gpio-cbi-wp = &gpio_ec_cbi_wp;
 		gpio-wp = &gpio_ec_wp_odl;
 		int-wp = &int_wp_l;
+		/*
+		 * USB-C: interrupt input.
+		 * I2C pins are on i2c_ec_i2c_sub_usb_c1
+		 */
+		gpio-usb-c1-int-odl = &gpio_sb_1;
+		/*
+		 * USB-A: VBUS enable output
+		 * LTE: power enable output
+		 */
+		gpio-en-usb-a1-vbus = &gpio_sb_2;
+		/*
+		 * HDMI: power enable output, HDMI enable output,
+		 * and HPD input
+		 */
+		gpio-en-rails-odl = &gpio_sb_1;
+		gpio-hdmi-en-odl = &gpio_sb_4;
+		gpio-hpd-odl = &gpio_sb_3;
+		/*
+		 * Enable S5 rails for LTE sub-board
+		 */
+		gpio-en-sub-s5-rails = &gpio_sb_2;
 	};
 
+
 	ec-console {
 		compatible = "ec-console";
 		disabled = "events", "lpc", "hostcmd";
@@ -119,30 +141,6 @@
 		};
 	};
 
-	/*
-	 * Aliases used for sub-board GPIOs.
-	 */
-	aliases {
-	  /* USB-C: interrupt input. I2C pins are on i2c_ec_i2c_sub_usb_c1 */
-		gpio-usb-c1-int-odl = &gpio_sb_1;
-		/*
-		 * USB-A: VBUS enable output
-		 * LTE: power enable output
-		 */
-		gpio-en-usb-a1-vbus = &gpio_sb_2;
-		/*
-		 * HDMI: power enable output, HDMI enable output,
-		 * and HPD input
-		 */
-		gpio-en-rails-odl = &gpio_sb_1;
-		gpio-hdmi-en-odl = &gpio_sb_4;
-		gpio-hpd-odl = &gpio_sb_3;
-		/*
-		 * Enable S5 rails for LTE sub-board
-		 */
-		gpio-en-sub-s5-rails = &gpio_sb_2;
-	};
-
 	temp_memory: memory {
 		compatible = "cros-ec,temp-sensor-thermistor";
 		thermistor = <&thermistor_3V3_51K1_47K_4050B>;
diff --git a/zephyr/projects/nissa/yaviks/overlay.dts b/zephyr/projects/nissa/yaviks/overlay.dts
index 599d91acc5..e9c80b7f0c 100644
--- a/zephyr/projects/nissa/yaviks/overlay.dts
+++ b/zephyr/projects/nissa/yaviks/overlay.dts
@@ -10,6 +10,27 @@
 		gpio-cbi-wp = &gpio_ec_cbi_wp;
 		gpio-wp = &gpio_ec_wp_odl;
 		int-wp = &int_wp_l;
+		/*
+		 * USB-C: interrupt input.
+		 * I2C pins are on i2c_ec_i2c_sub_usb_c1
+		 */
+		gpio-usb-c1-int-odl = &gpio_sb_1;
+		/*
+		 * USB-A: VBUS enable output
+		 * LTE: power enable output
+		 */
+		gpio-en-usb-a1-vbus = &gpio_sb_2;
+		/*
+		 * HDMI: power enable output, HDMI enable output,
+		 * and HPD input
+		 */
+		gpio-en-rails-odl = &gpio_sb_1;
+		gpio-hdmi-en-odl = &gpio_sb_4;
+		gpio-hpd-odl = &gpio_sb_3;
+		/*
+		 * Enable S5 rails for LTE sub-board
+		 */
+		gpio-en-sub-s5-rails = &gpio_sb_2;
 	};
 
 	ec-console {
@@ -122,30 +143,6 @@
 		};
 	};
 
-	/*
-	 * Aliases used for sub-board GPIOs.
-	 */
-	aliases {
-	  /* USB-C: interrupt input. I2C pins are on i2c_ec_i2c_sub_usb_c1 */
-		gpio-usb-c1-int-odl = &gpio_sb_1;
-		/*
-		 * USB-A: VBUS enable output
-		 * LTE: power enable output
-		 */
-		gpio-en-usb-a1-vbus = &gpio_sb_2;
-		/*
-		 * HDMI: power enable output, HDMI enable output,
-		 * and HPD input
-		 */
-		gpio-en-rails-odl = &gpio_sb_1;
-		gpio-hdmi-en-odl = &gpio_sb_4;
-		gpio-hpd-odl = &gpio_sb_3;
-		/*
-		 * Enable S5 rails for LTE sub-board
-		 */
-		gpio-en-sub-s5-rails = &gpio_sb_2;
-	};
-
 	temp_cpu: cpu {
 		compatible = "cros-ec,temp-sensor-thermistor";
 		thermistor = <&thermistor_3V3_51K1_47K_4050B>;
diff --git a/zephyr/projects/rex/motionsense.dts b/zephyr/projects/rex/motionsense.dts
index 8b1c80921b..6af7cd2b12 100644
--- a/zephyr/projects/rex/motionsense.dts
+++ b/zephyr/projects/rex/motionsense.dts
@@ -65,12 +65,12 @@
 			status = "okay";
 		};
 
-		lsm6dso_accel_data: lsm6dso-drv-data {
+		lsm6dso_accel_data: lsm6dso-accel-drv-data {
 			compatible = "cros-ec,drvdata-lsm6dso";
 			status = "okay";
 		};
 
-		lsm6dso_gyro_data: lsm6dso-drv-data {
+		lsm6dso_gyro_data: lsm6dso-gyro-drv-data {
 			compatible = "cros-ec,drvdata-lsm6dso";
 			status = "okay";
 		};