diff options
| author | Fabio Baltieri <fabiobaltieri@google.com> | 2022-09-23 14:29:48 +0000 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-09-26 14:46:46 +0000 |
| commit | 5b0fed0b4fff68953684aba27c4388b719709293 (patch) | |
| tree | 6f4219c114ae2c6874d27b612c2c874507bb01c7 /zephyr/projects/corsola | |
| parent | 215ad89d95b0187527da2407ffdb2beebb33b0c1 (diff) | |
| download | chrome-ec-5b0fed0b4fff68953684aba27c4388b719709293.tar.gz | |
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>
Diffstat (limited to 'zephyr/projects/corsola')
| -rw-r--r-- | zephyr/projects/corsola/gpio_krabby.dts | 18 | ||||
| -rw-r--r-- | zephyr/projects/corsola/gpio_magikarp.dts | 18 | ||||
| -rw-r--r-- | zephyr/projects/corsola/gpio_tentacruel.dts | 18 |
3 files changed, 18 insertions, 36 deletions
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 |