diff options
author | Andrew McRae <amcrae@google.com> | 2022-01-19 14:48:03 +1100 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2022-01-19 06:48:33 +0000 |
commit | 40c885d4cf1c8149ad03c3b698ebb2f0fc6d1688 (patch) | |
tree | 4300fd60b9cb257a84fde615d558f88f6c487980 | |
parent | 19d3f435b93c6c93d9cea34a40b3ccfdf9c02e5b (diff) | |
download | chrome-ec-40c885d4cf1c8149ad03c3b698ebb2f0fc6d1688.tar.gz |
nissa: Use no-auto-init for optional GPIOs
For GPIOs that are specific to sub-boards, mark them as
no-auto-init so that they are not initialised.
They will be initialised depending on which sub-board is
configured.
BUG=b:212490923
TEST=zmake configure -b nivviks
BRANCH=none
Signed-off-by: Andrew McRae <amcrae@google.com>
Change-Id: I3a6e47b90951cfd7e3ffa5a1da4fcd8875353f74
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3398221
Reviewed-by: Peter Marheine <pmarheine@chromium.org>
-rw-r--r-- | zephyr/projects/nissa/nereid_overlay.dts | 8 | ||||
-rw-r--r-- | zephyr/projects/nissa/nivviks_overlay.dts | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/zephyr/projects/nissa/nereid_overlay.dts b/zephyr/projects/nissa/nereid_overlay.dts index 7cf6c9e205..62990e7700 100644 --- a/zephyr/projects/nissa/nereid_overlay.dts +++ b/zephyr/projects/nissa/nereid_overlay.dts @@ -19,17 +19,17 @@ * Input GPIO when used with type-C port 1 */ gpio_usb_c1_int_odl: usb_c1_int_odl { - status = "disabled"; #gpio-cells = <0>; gpios = <&gpioe 6 GPIO_INPUT_PULL_UP>; + no-auto-init; }; /* * Output GPIO when used with HDMI port */ gpio_en_sub_rails_odl: en_sub_rails_odl { - status = "disabled"; #gpio-cells = <0>; gpios = <&gpioe 6 GPIO_OUTPUT>; + no-auto-init; }; /* @@ -37,14 +37,14 @@ * when HDMI sub-board connected. */ gpio_hdmi_en_sub_odl: hdmi_en_sub_odl { - status = "disabled"; #gpio-cells = <0>; gpios = <&gpioe 7 GPIO_OPEN_DRAIN>; + no-auto-init; }; gpio_hpd_sub_odl: hdmi_hpd_sub_odl { - status = "disabled"; #gpio-cells = <0>; gpios = <&gpioe 0 GPIO_INPUT>; + no-auto-init; }; }; diff --git a/zephyr/projects/nissa/nivviks_overlay.dts b/zephyr/projects/nissa/nivviks_overlay.dts index 98b62a7915..19975c4740 100644 --- a/zephyr/projects/nissa/nivviks_overlay.dts +++ b/zephyr/projects/nissa/nivviks_overlay.dts @@ -28,17 +28,17 @@ * Input GPIO when used with type-C port 1 */ gpio_usb_c1_int_odl: usb_c1_int_odl { - status = "disabled"; #gpio-cells = <0>; gpios = <&gpio0 2 GPIO_INPUT_PULL_UP>; + no-auto-init; }; /* * Output GPIO when used with HDMI port */ gpio_en_sub_rails_odl: en_sub_rails_odl { - status = "disabled"; #gpio-cells = <0>; gpios = <&gpio0 2 GPIO_OUTPUT>; + no-auto-init; }; /* @@ -46,14 +46,14 @@ * when HDMI sub-board connected. */ gpio_hdmi_en_sub_odl: hdmi_en_sub_odl { - status = "disabled"; #gpio-cells = <0>; gpios = <&gpiof 4 GPIO_OPEN_DRAIN>; + no-auto-init; }; gpio_hpd_sub_odl: hdmi_hpd_sub_odl { - status = "disabled"; #gpio-cells = <0>; gpios = <&gpiof 5 GPIO_INPUT>; + no-auto-init; }; }; |