diff options
author | Caveh Jalali <caveh@chromium.org> | 2023-03-30 17:33:17 -0700 |
---|---|---|
committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-04-19 23:37:02 +0000 |
commit | 806b88d2cd803e2f3ff8b10ef5aed1e265bbebf8 (patch) | |
tree | 78bf308b104e21485d11dc44d50b88e4a23176e8 | |
parent | 9819b0c34f7eb736460578c9973c4f6374a5c6a2 (diff) | |
download | chrome-ec-806b88d2cd803e2f3ff8b10ef5aed1e265bbebf8.tar.gz |
rex: Shuffle GPIOs for easier review
The next round of auto generated GPIOs includes updates for overrides
currently in rex.dtsi, so move them over so changes are easier to
review.
BRANCH=none
BUG=b:276384581
TEST=rex boots
Change-Id: Ibdc3bd94e6cf7134169bee75e406b7a105820fbe
Signed-off-by: Caveh Jalali <caveh@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4392208
Reviewed-by: Madhu 🌱 <mparuchuri@google.com>
Reviewed-by: Boris Mittelberg <bmbm@google.com>
-rw-r--r-- | zephyr/program/rex/generated.dtsi | 43 | ||||
-rw-r--r-- | zephyr/program/rex/rex.dtsi | 26 |
2 files changed, 19 insertions, 50 deletions
diff --git a/zephyr/program/rex/generated.dtsi b/zephyr/program/rex/generated.dtsi index 5b6f9cd708..3d26579bd2 100644 --- a/zephyr/program/rex/generated.dtsi +++ b/zephyr/program/rex/generated.dtsi @@ -1,13 +1,8 @@ -/* Copyright 2022 The ChromiumOS Authors +/* 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. * * This file is auto-generated - do not edit! - * - * TODO(b:/244441996): There are some errors in the main Rex EC GPIO spreadsheet - * which is used as input to create this device tree file. Until that issue is - * resolved, there are some edits required to this file to support EC - * functionality. */ / { @@ -20,15 +15,15 @@ io-channels = <&adc0 0>; }; adc_ambient: ambient { - enum-name = "ADC_TEMP_SENSOR_2"; + enum-name = "ADC_TEMP_SENSOR_2_AMBIENT"; io-channels = <&adc0 1>; }; adc_charger: charger { - enum-name = "ADC_TEMP_SENSOR_3"; + enum-name = "ADC_TEMP_SENSOR_3_CHARGER"; io-channels = <&adc0 8>; }; adc_wwan: wwan { - enum-name = "ADC_TEMP_SENSOR_4"; + enum-name = "ADC_TEMP_SENSOR_4_WWAN"; io-channels = <&adc0 7>; }; }; @@ -71,15 +66,16 @@ gpio_ec_imu_int_r_l: ec_imu_int_r_l { gpios = <&gpio5 6 GPIO_INPUT_PULL_UP>; }; - gpio_ec_imvp92_en_smb: ec_imvp92_en_smb { - gpios = <&gpiob 1 GPIO_OUTPUT>; - }; gpio_ec_kb_bl_en_l: ec_kb_bl_en_l { gpios = <&gpio8 6 GPIO_OUTPUT>; }; gpio_ec_kso_02_inv: ec_kso_02_inv { gpios = <&gpio1 7 (GPIO_OUTPUT | GPIO_ACTIVE_LOW)>; }; + gpio_mech_pwr_btn_odl: mech_pwr_btn_odl { + gpios = <&gpio0 2 GPIO_INPUT>; + enum-name = "GPIO_POWER_BUTTON_L"; + }; gpio_ec_prochot_in_l: ec_prochot_in_l { gpios = <&gpiof 0 GPIO_INPUT>; }; @@ -106,6 +102,9 @@ gpio_ec_soc_wake_r_odl: ec_soc_wake_r_odl { gpios = <&gpioc 0 GPIO_ODR_LOW>; }; + gpio_gsc_ec_pwr_btn_odl: gsc_ec_pwr_btn_odl { + gpios = <&gpio0 1 GPIO_INPUT_PULL_UP>; + }; gpio_ec_spare_gpio42: ec_spare_gpio42 { gpios = <&gpio4 2 GPIO_OUTPUT>; }; @@ -121,6 +120,9 @@ gpio_ec_spare_gpioa4: ec_spare_gpioa4 { gpios = <&gpioa 4 GPIO_OUTPUT>; }; + gpio_ec_imvp92_en_smb: ec_imvp92_en_smb { + gpios = <&gpiob 1 GPIO_OUTPUT>; + }; gpio_ec_spare_gpioc7: ec_spare_gpioc7 { gpios = <&gpioc 7 GPIO_OUTPUT>; }; @@ -139,7 +141,7 @@ enum-name = "GPIO_VOLUME_UP_L"; }; gpio_ec_wp_l: ec_wp_l { - gpios = <&gpioa 1 GPIO_INPUT>; + gpios = <&gpioa 1 (GPIO_INPUT | GPIO_ACTIVE_LOW)>; }; gpio_en_pp5000_fan: en_pp5000_fan { gpios = <&gpio6 1 GPIO_OUTPUT_LOW>; @@ -154,9 +156,6 @@ gpio_en_z1_rails: en_z1_rails { gpios = <&gpio8 5 GPIO_OUTPUT>; }; - gpio_gsc_ec_pwr_btn_odl: gsc_ec_pwr_btn_odl { - gpios = <&gpio0 1 GPIO_INPUT_PULL_UP>; - }; gpio_imvp92_vrrdy_od: imvp92_vrrdy_od { gpios = <&gpio4 3 GPIO_INPUT>; }; @@ -176,10 +175,6 @@ gpios = <&gpiod 2 GPIO_INPUT_PULL_UP>; enum-name = "GPIO_LID_OPEN"; }; - gpio_mech_pwr_btn_odl: mech_pwr_btn_odl { - gpios = <&gpio0 2 GPIO_INPUT>; - enum-name = "GPIO_POWER_BUTTON_L"; - }; gpio_seq_ec_all_sys_pg: seq_ec_all_sys_pg { gpios = <&gpiof 4 GPIO_INPUT>; }; @@ -223,11 +218,11 @@ gpios = <&gpioa 0 GPIO_INPUT>; }; gpio_usb_c0_tcpc_int_odl: usb_c0_tcpc_int_odl { - gpios = <&gpioe 0 GPIO_INPUT>; + gpios = <&gpioe 0 (GPIO_INPUT | GPIO_ACTIVE_LOW)>; enum-name = "GPIO_USB_C0_TCPC_INT_ODL"; }; gpio_usb_c0_tcpc_rst_odl: usb_c0_tcpc_rst_odl { - gpios = <&gpio6 7 GPIO_ODR_HIGH>; + gpios = <&gpio6 7 (GPIO_ODR_HIGH | GPIO_ACTIVE_LOW)>; }; gpio_usb_c1_bc12_int_odl: usb_c1_bc12_int_odl { gpios = <&gpio5 0 GPIO_INPUT>; @@ -247,10 +242,10 @@ gpios = <&gpio7 2 GPIO_INPUT_PULL_UP>; }; gpio_usb_c1_rt_rst_r_odl: usb_c1_rt_rst_r_odl { - gpios = <&gpio7 4 GPIO_ODR_HIGH>; + gpios = <&gpio7 4 (GPIO_ODR_HIGH | GPIO_ACTIVE_LOW)>; }; gpio_usb_c1_tcpc_int_odl: usb_c1_tcpc_int_odl { - gpios = <&gpio3 4 GPIO_INPUT>; + gpios = <&gpio3 4 (GPIO_INPUT | GPIO_ACTIVE_LOW)>; enum-name = "GPIO_USB_C1_TCPC_INT_ODL"; }; }; diff --git a/zephyr/program/rex/rex.dtsi b/zephyr/program/rex/rex.dtsi index 83d10b95d1..8fd9565980 100644 --- a/zephyr/program/rex/rex.dtsi +++ b/zephyr/program/rex/rex.dtsi @@ -43,32 +43,6 @@ ec-i2c-c0-rt-sda { gpios = <&gpiod 0 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>; }; - - /* - * The pinmap utility does not currently support ACTIVE_LOW - * flag. So it is set here. - */ - /delete-node/ usb_c0_tcpc_int_odl; - /delete-node/ usb_c1_tcpc_int_odl; - gpio_usb_c0_tcpc_int_odl: usb_c0_tcpc_int_odl { - gpios = <&gpioe 0 (GPIO_INPUT | GPIO_ACTIVE_LOW)>; - enum-name = "GPIO_USB_C0_TCPC_INT_ODL"; - }; - gpio_usb_c1_tcpc_int_odl: usb_c1_tcpc_int_odl { - gpios = <&gpio3 4 (GPIO_INPUT | GPIO_ACTIVE_LOW)>; - enum-name = "GPIO_USB_C1_TCPC_INT_ODL"; - }; - /delete-node/ usb_c0_tcpc_rst_odl; - /delete-node/ usb_c1_rt_rst_r_odl; - gpio_usb_c0_tcpc_rst_odl: usb_c0_tcpc_rst_odl { - gpios = <&gpio6 7 (GPIO_ODR_HIGH | GPIO_ACTIVE_LOW)>; - }; - gpio_usb_c1_rt_rst_r_odl: usb_c1_rt_rst_r_odl { - gpios = <&gpio7 4 (GPIO_ODR_HIGH | GPIO_ACTIVE_LOW)>; - }; - ec_wp_l { - gpios = <&gpioa 1 (GPIO_INPUT | GPIO_ACTIVE_LOW)>; - }; }; usba-port-enable-list { |