diff options
author | Caveh Jalali <caveh@chromium.org> | 2023-03-30 19:36:01 -0700 |
---|---|---|
committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-04-20 01:00:40 +0000 |
commit | 27e7f6bf17675d6a2a0a2f3d8bf4b7426d851630 (patch) | |
tree | 8580c6e57f3ea4624f90cfd70a406b1dea8be8d5 | |
parent | c4a67f5298a5a3f402bf9f4bc5505b5c4f02f557 (diff) | |
download | chrome-ec-27e7f6bf17675d6a2a0a2f3d8bf4b7426d851630.tar.gz |
rex: Update GPIOs
Regenerate rex GPIO definitions from spreadsheet+arbitrage.
gpio.csv and generated.dtsi are purely auto-generated.
rex.dtsi contains overrides to generated.dtsi to correct the cases that
the automated process doesn't handle correctly, yet.
the workflow is:
1. run arbitrage to generate gpio.csv
2. run util/pinmap/pinmap/pinmap to generate generated.dtsi
BRANCH=none
BUG=b:276384581
TEST=42/45 passes on suite:faft_ec (no worse than before)
Change-Id: Ia43fe20f2c7e422902deb107b39814cf499b2790
Signed-off-by: Caveh Jalali <caveh@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4392209
Reviewed-by: Yuval Peress <peress@google.com>
-rw-r--r-- | zephyr/program/rex/generated.dtsi | 33 | ||||
-rw-r--r-- | zephyr/program/rex/gpio.csv | 145 | ||||
-rw-r--r-- | zephyr/program/rex/interrupts.dtsi | 2 | ||||
-rw-r--r-- | zephyr/program/rex/motionsense.dtsi | 8 | ||||
-rw-r--r-- | zephyr/program/rex/power_signals.dtsi | 2 | ||||
-rw-r--r-- | zephyr/program/rex/rex-sans-sensors/project.overlay | 2 | ||||
-rw-r--r-- | zephyr/program/rex/rex.dtsi | 21 | ||||
-rw-r--r-- | zephyr/program/rex/temp_sensors.dtsi | 8 |
8 files changed, 122 insertions, 99 deletions
diff --git a/zephyr/program/rex/generated.dtsi b/zephyr/program/rex/generated.dtsi index 3d26579bd2..3a878f9bc7 100644 --- a/zephyr/program/rex/generated.dtsi +++ b/zephyr/program/rex/generated.dtsi @@ -10,19 +10,19 @@ named-adc-channels { compatible = "named-adc-channels"; - adc_ddr_soc: ddr_soc { + adc_temp_sensor_1: temp_sensor_1 { enum-name = "ADC_TEMP_SENSOR_1_DDR_SOC"; io-channels = <&adc0 0>; }; - adc_ambient: ambient { + adc_temp_sensor_2: temp_sensor_2 { enum-name = "ADC_TEMP_SENSOR_2_AMBIENT"; io-channels = <&adc0 1>; }; - adc_charger: charger { + adc_temp_sensor_3: temp_sensor_3 { enum-name = "ADC_TEMP_SENSOR_3_CHARGER"; io-channels = <&adc0 8>; }; - adc_wwan: wwan { + adc_temp_sensor_4: temp_sensor_4 { enum-name = "ADC_TEMP_SENSOR_4_WWAN"; io-channels = <&adc0 7>; }; @@ -36,7 +36,7 @@ enum-name = "GPIO_AC_PRESENT"; }; gpio_ccd_mode_odl: ccd_mode_odl { - gpios = <&gpioe 5 GPIO_ODR_HIGH>; + gpios = <&gpioe 5 GPIO_INPUT>; enum-name = "GPIO_CCD_MODE_ODL"; }; gpio_cpu_c10_gate_l: cpu_c10_gate_l { @@ -56,7 +56,7 @@ gpios = <&gpio7 3 GPIO_OUTPUT>; }; gpio_ec_edp_bl_en: ec_edp_bl_en { - gpios = <&gpiod 3 GPIO_OUTPUT_LOW>; + gpios = <&gpiod 3 GPIO_OUTPUT>; enum-name = "GPIO_ENABLE_BACKLIGHT"; }; gpio_ec_gsc_packet_mode: ec_gsc_packet_mode { @@ -72,7 +72,7 @@ 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 { + gpio_ec_mech_pwr_btn_l: ec_mech_pwr_btn_l { gpios = <&gpio0 2 GPIO_INPUT>; enum-name = "GPIO_POWER_BUTTON_L"; }; @@ -102,7 +102,7 @@ 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 { + gpio_ec_spare_gpio01: ec_spare_gpio01 { gpios = <&gpio0 1 GPIO_INPUT_PULL_UP>; }; gpio_ec_spare_gpio42: ec_spare_gpio42 { @@ -120,7 +120,7 @@ gpio_ec_spare_gpioa4: ec_spare_gpioa4 { gpios = <&gpioa 4 GPIO_OUTPUT>; }; - gpio_ec_imvp92_en_smb: ec_imvp92_en_smb { + gpio_ec_spare_gpiob1: ec_spare_gpiob1 { gpios = <&gpiob 1 GPIO_OUTPUT>; }; gpio_ec_spare_gpioc7: ec_spare_gpioc7 { @@ -144,7 +144,7 @@ gpios = <&gpioa 1 (GPIO_INPUT | GPIO_ACTIVE_LOW)>; }; gpio_en_pp5000_fan: en_pp5000_fan { - gpios = <&gpio6 1 GPIO_OUTPUT_LOW>; + gpios = <&gpio6 1 GPIO_OUTPUT>; }; gpio_en_pp5000_usba_r: en_pp5000_usba_r { gpios = <&gpiod 7 GPIO_OUTPUT>; @@ -172,10 +172,10 @@ gpios = <&gpio6 0 GPIO_OUTPUT>; }; gpio_lid_open: lid_open { - gpios = <&gpiod 2 GPIO_INPUT_PULL_UP>; + gpios = <&gpiod 2 GPIO_INPUT>; enum-name = "GPIO_LID_OPEN"; }; - gpio_seq_ec_all_sys_pg: seq_ec_all_sys_pg { + gpio_seq_ec_all_sys_pg_od: seq_ec_all_sys_pg_od { gpios = <&gpiof 4 GPIO_INPUT>; }; gpio_seq_ec_rsmrst_odl: seq_ec_rsmrst_odl { @@ -212,7 +212,7 @@ enum-name = "GPIO_USB_C0_PPC_INT_ODL"; }; gpio_usb_c0_rt_3p3_sx_en: usb_c0_rt_3p3_sx_en { - gpios = <&gpio0 3 GPIO_OUTPUT_LOW>; + gpios = <&gpio0 3 GPIO_ODR_LOW>; }; gpio_usb_c0_rt_int_odl: usb_c0_rt_int_odl { gpios = <&gpioa 0 GPIO_INPUT>; @@ -222,7 +222,7 @@ 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 | GPIO_ACTIVE_LOW)>; + gpios = <&gpio6 7 GPIO_ODR_HIGH>; }; gpio_usb_c1_bc12_int_odl: usb_c1_bc12_int_odl { gpios = <&gpio5 0 GPIO_INPUT>; @@ -242,7 +242,7 @@ 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 | GPIO_ACTIVE_LOW)>; + gpios = <&gpio7 4 GPIO_ODR_HIGH>; }; gpio_usb_c1_tcpc_int_odl: usb_c1_tcpc_int_odl { gpios = <&gpio3 4 (GPIO_INPUT | GPIO_ACTIVE_LOW)>; @@ -253,7 +253,7 @@ named-i2c-ports { compatible = "named-i2c-ports"; - i2c_ec_i2c_sensor: ec_i2c_sensor { + i2c_ec_i2c_sensor_scl_r: ec_i2c_sensor_scl_r { i2c-port = <&i2c0_0>; enum-names = "I2C_PORT_SENSOR"; }; @@ -272,7 +272,6 @@ i2c_ec_i2c_usb_c1_tcp: ec_i2c_usb_c1_tcp { i2c-port = <&i2c4_1>; enum-names = "I2C_PORT_USB_C1_TCPC"; - dynamic-speed; }; i2c_ec_i2c_bat: ec_i2c_bat { i2c-port = <&i2c5_0>; diff --git a/zephyr/program/rex/gpio.csv b/zephyr/program/rex/gpio.csv index 5c20f6fb00..26f09181ee 100644 --- a/zephyr/program/rex/gpio.csv +++ b/zephyr/program/rex/gpio.csv @@ -1,44 +1,90 @@ Signal Name,Pin Number,Type,Enum -USB_C1_BC12_INT_ODL,G10,INPUT,GPIO_USB_C1_BC12_INT_ODL -ESPI_SOC_CS0_L,L2,OTHER, -ESPI_SOC_RESET_L,K3,OTHER, -ESPI_SOC_CLK,M1,OTHER, -EC_IMU_INT_R_L,M2,INPUT_PU, ESPI_SOC_IO0,H1,OTHER, ESPI_SOC_IO1,J1,OTHER, ESPI_SOC_IO2,K1,OTHER, ESPI_SOC_IO3,L1,OTHER, +ESPI_SOC_CS0_L,L2,OTHER, +ESPI_SOC_RESET_L,K3,OTHER, +ESPI_SOC_CLK,M1,OTHER, ESPI_SOC_ALERT_L_R,L3,OTHER, +USB_C1_BC12_INT_ODL,G10,INPUT,GPIO_USB_C1_BC12_INT_ODL +EC_IMU_INT_R_L,M2,INPUT_PU, EC_VOLDN_BTN_ODL,E11,INPUT_PU,GPIO_VOLUME_DOWN_L TABLET_MODE_L,M12,INPUT_PU,GPIO_TABLET_MODE_L SOCHOT_ODL,G12,INPUT, EC_VOLUP_BTN_ODL,L10,INPUT_PU,GPIO_VOLUME_UP_L USB_C0_RT_INT_ODL,G11,INPUT, -EC_WP_L,L12,INPUT, +EC_WP_L,L12,INPUT_L, EC_BATT_PRES_ODL,K12,INPUT,GPIO_BATT_PRES_ODL -CPU_C10_GATE_L,J11,INPUT, SOC_PWROK,K11,OUTPUT, EC_SOC_RSMRST_L,F11,OUTPUT, +CPU_C10_GATE_L,J11,INPUT, SYS_PWROK,L11,OUTPUT, EC_SPARE_GPIO94,M11,OUTPUT, EC_SPARE_GPIOA2,F12,OUTPUT, EC_SPARE_GPIOA4,H11,OUTPUT, EC_ACCEL_INT_R_L,M7,INPUT, +TEMP_SENSOR_2,E3,ADC,ADC_TEMP_SENSOR_2_AMBIENT +TEMP_SENSOR_1,F2,ADC,ADC_TEMP_SENSOR_1_DDR_SOC +TEMP_SENSOR_4,F3,ADC,ADC_TEMP_SENSOR_4_WWAN +TEMP_SENSOR_3,G3,ADC,ADC_TEMP_SENSOR_3_CHARGER SLP_S3_LS_L,C2,INPUT, IMVP92_VRRDY_OD,E2,INPUT, EC_PROCHOT_IN_L,D2,INPUT, EC_SPARE_GPIO42,D3,OUTPUT, -TEMP_SENSOR_2,E3,ADC,ADC_TEMP_SENSOR_2 -TEMP_SENSOR_1,F2,ADC,ADC_TEMP_SENSOR_1 -TEMP_SENSOR_4,F3,ADC,ADC_TEMP_SENSOR_4 -TEMP_SENSOR_3,G3,ADC,ADC_TEMP_SENSOR_3 -SYS_RST_ODL,H7,INPUT, -EC_SOC_WAKE_R_ODL,H8,OUTPUT_ODL, +USB_C0_RT_3P3_SX_EN,D9,OUTPUT_ODL, +USB_C1_RST_ODL,C1,OUTPUT_ODL, +EN_PP5000_FAN,K4,OUTPUT, EC_PROCHOT_ODL,J2,OUTPUT_ODR, +USB_C0_TCPC_RST_ODL,J3,OUTPUT_ODR, EC_SOC_INT_ODL,J4,OUTPUT_ODL,GPIO_EC_INT_L +USB_C1_RT_RST_R_ODL,H5,OUTPUT_ODR, +EC_GSC_PACKET_MODE,J6,OUTPUT,GPIO_PACKET_MODE_EN EC_SOC_RTCRST,J5,OUTPUT_ODR, +USB_C1_FRS_EN,D7,OUTPUT_ODR, +EN_S5_RAILS,L9,OUTPUT_ODR,GPIO_TEMP_SENSOR_POWER +EC_SOC_WAKE_R_ODL,H8,OUTPUT_ODL, EC_SOC_PWR_BTN_ODL,H9,OUTPUT_ODL,GPIO_PCH_PWRBTN_L -USB_C0_RT_3P3_SX_EN,D9,OUTPUT_ODR, +SYS_RST_ODL,H7,INPUT, +EC_EDP_BL_EN,E10,OUTPUT,GPIO_ENABLE_BACKLIGHT +SYS_SLP_S0IX_3V3_L,A10,INPUT, +SEQ_EC_RSMRST_ODL,A11,INPUT, +CCD_MODE_ODL,A12,INPUT,GPIO_CCD_MODE_ODL +EC_KB_BL_EN_L,J9,OUTPUT, +EC_SHDF_ESPI_L,H3,OTHER, +USB_C1_TCPC_INT_ODL,B2,INPUT_L,GPIO_USB_C1_TCPC_INT_ODL +EC_FAN_TACH,E5,TACH, +USB_C0_PPC_INT_ODL,H2,INPUT,GPIO_USB_C0_PPC_INT_ODL +USB_C1_RT_INT_ODL,M4,INPUT_PU, +USB_C0_BC12_INT_ODL,D10,INPUT,GPIO_USB_C0_BC12_INT_ODL +EC_ALS_RGB_INT_R_L,A9,INPUT_PU, +USB_C0_TCPC_INT_ODL,F4,INPUT_L,GPIO_USB_C0_TCPC_INT_ODL +SEQ_EC_ALL_SYS_PG_OD,E9,INPUT, +USB_C1_PPC_INT_ODL,E8,INPUT,GPIO_USB_C1_PPC_INT_ODL +EC_I2C_SENSOR_SDA_R,B12,I2C_DATA, +EC_I2C_SENSOR_SCL_R,C12,I2C_CLOCK,I2C_PORT_SENSOR +EC_I2C_USB_C0_TCPC_SDA,K7,I2C_DATA, +EC_I2C_USB_C0_TCPC_SCL,K8,I2C_CLOCK,I2C_PORT_USB_C0_TCPC +EC_I2C_USB_C0_PPC_BC_SDA,K9,I2C_DATA, +EC_I2C_USB_C0_PPC_BC_SCL,L8,I2C_CLOCK,I2C_PORT_PPC0 +EC_I2C_USB_C0_RT_SDA,F9,I2C_DATA, +EC_I2C_USB_C0_RT_SCL,F8,I2C_CLOCK,I2C_PORT_USB_C0_RT +EC_I2C_USB_C1_TCPC_SDA,F6,I2C_DATA, +EC_I2C_USB_C1_TCPC_SCL,F5,I2C_CLOCK,I2C_PORT_USB_C1_TCPC +EC_I2C_BAT_SCL,D5,I2C_CLOCK,I2C_PORT_BATTERY +EC_I2C_BAT_SDA,D4,I2C_DATA, +EC_I2C_USB_C1_MIX_SDA,L7,I2C_DATA, +EC_I2C_USB_C1_MIX_SCL,L6,I2C_CLOCK,I2C_PORT_USB_1_MIX +EC_I2C_MISC_SDA,K10,I2C_DATA, +EC_I2C_MISC_SCL,J10,I2C_CLOCK,I2C_PORT_EEPROM +KSI_07,C5,OTHER, +KSI_06,C4,OTHER, +KSI_05,C3,OTHER, +KSI_04,B4,OTHER, +EC_KSI_03,B3,OTHER, +EC_KSI_02,A4,OTHER, +KSI_01,A3,OTHER, +EC_KSI_00,A2,OTHER, KSO_13,D11,OTHER, KSO_12,C11,OTHER, KSO_11,B10,OTHER, @@ -51,72 +97,29 @@ KSO_03,B8,OTHER, EC_KSO_02_INV,B7,OUTPUT_L, KSO_01,B6,OTHER, KSO_00,B5,OTHER, -KSI_07,C5,OTHER, -KSI_06,C4,OTHER, -KSI_05,C3,OTHER, -KSI_04,B4,OTHER, -EC_KSI_03,B3,OTHER, -EC_KSI_02,A4,OTHER, -KSI_01,A3,OTHER, -EC_KSI_00,A2,OTHER, -EC_I2C_BAT_SCL,D5,I2C_CLOCK,I2C_PORT_BATTERY -USB_C1_TCPC_INT_ODL,B2,INPUT,GPIO_USB_C1_TCPC_INT_ODL -EC_I2C_BAT_SDA,D4,I2C_DATA, -USB_C1_RST_ODL,C1,OUTPUT_ODL, -EC_FAN_TACH,E5,TACH, +KSO_14,D6,OTHER, +EC_KSO_07_JEN_L,B9,OTHER, +EC_KSO_06_GP_SEL_L,C8,OTHER, LED_4_L,G6,OUTPUT, -EN_PP5000_FAN,K4,OUTPUT_ODR, -USB_C0_PPC_INT_ODL,H2,INPUT,GPIO_USB_C0_PPC_INT_ODL -UART_GSC_DBG_TX_EC_RX_R,G4,OTHER, -EC_SPARE_GPIO66,G2,OUTPUT, -USB_C0_TCPC_RST_ODL,J3,OUTPUT_ODL, -USB_C1_RT_INT_ODL,M4,INPUT_PU, -EC_CBI_WP,G5,OUTPUT, -USB_C1_RT_RST_R_ODL,H5,OUTPUT_ODL, -EC_GSC_PACKET_MODE,J6,OUTPUT_ODR,GPIO_PACKET_MODE_EN EC_KB_BL_PWM,K5,PWM,GPIO_EN_KEYBOARD_BACKLIGHT -KSO_14,D6,OTHER, -USB_C1_FRS_EN,D7,OUTPUT_ODR, -EC_I2C_USB_C0_TCPC_SDA,K7,I2C_DATA, -EC_I2C_USB_C0_TCPC_SCL,K8,I2C_CLOCK,I2C_PORT_USB_C0_TCPC -EC_I2C_USB_C0_PPC_BC_SDA,K9,I2C_DATA, -EC_I2C_USB_C0_PPC_BC_SCL,L8,I2C_CLOCK,I2C_PORT_PPC0 -EC_IMVP92_EN_SMB,D8,OUTPUT, -EC_I2C_MISC_SDA,K10,I2C_DATA, -EC_I2C_MISC_SCL,J10,I2C_CLOCK,I2C_PORT_EEPROM -EC_I2C_SENSOR_SDA,B12,I2C_DATA, -EC_I2C_SENSOR_SCL,C12,I2C_CLOCK,I2C_PORT_SENSOR -EN_S5_RAILS,L9,OUTPUT_ODR, FAN_PWM,J7,PWM, LED_3_L,H10,OUTPUT, LED_2_L,G9,OUTPUT, LED_1_L,G8,OUTPUT, -USB_C0_BC12_INT_ODL,D10,INPUT,GPIO_USB_C0_BC12_INT_ODL +EC_RST_R_ODL,K6,INPUT, +UART_GSC_DBG_TX_EC_RX_R,G4,OTHER, +UART_GSC_DBG_RX_EC_TX_R,H4,OTHER, +EC_SPARE_GPIO66,G2,OUTPUT, +EC_CBI_WP,G5,OUTPUT, +EC_SPARE_GPIOB1,D8,OUTPUT, EC_SPARE_GPIOC7,F10,OUTPUT, -EC_I2C_USB_C0_RT_SDA,F9,I2C_DATA, -EC_I2C_USB_C0_RT_SCL,F8,I2C_CLOCK,I2C_PORT_USB_C0_RT -EC_EDP_BL_EN,E10,OUTPUT_ODR,GPIO_ENABLE_BACKLIGHT -EC_ALS_RGB_INT_R_L,A9,INPUT_PU, -SYS_SLP_S0IX_3V3_L,A10,INPUT, -USB_C0_TCPC_INT_ODL,F4,INPUT,GPIO_USB_C0_TCPC_INT_ODL -SEQ_EC_RSMRST_ODL,A11,INPUT, -EC_I2C_USB_C1_MIX_SDA,L7,I2C_DATA, -EC_I2C_USB_C1_MIX_SCL,L6,I2C_CLOCK,I2C_PORT_USB_1_MIX -CCD_MODE_ODL,A12,OUTPUT_ODL,GPIO_CCD_MODE_ODL -EC_I2C_USB_C1_TCPC_SDA,F6,I2C_DATA, -EC_I2C_USB_C1_TCPC_SCL,F5,I2C_CLOCK,I2C_PORT_USB_C1_TCPC -SEQ_EC_ALL_SYS_PG,E9,INPUT, -USB_C1_PPC_INT_ODL,E8,INPUT,GPIO_USB_C1_PPC_INT_ODL -EC_KSO_07_JEN_L,B9,OTHER, -EC_KSO_06_GP_SEL_L,C8,OTHER, EC_SPARE_GPO32,E4,OUTPUT, EC_SPARE_GPO35,K2,OUTPUT, -UART_GSC_DBG_RX_EC_TX_R,H4,OTHER, -EC_RST_R_ODL,K6,INPUT, -EC_KB_BL_EN_L,J9,OUTPUT, +EC_32KXIN,L5,INPUT, +EC_32KXOUT,M5,OUTPUT, ACOK_OD,E7,INPUT,GPIO_AC_PRESENT -GSC_EC_PWR_BTN_ODL,E6,INPUT_PU,GPIO_POWER_BUTTON_L -MECH_PWR_BTN_ODL,F7,INPUT, -LID_OPEN,G7,INPUT_PU,GPIO_LID_OPEN +EC_SPARE_GPIO01,E6,INPUT_PU, +EC_MECH_PWR_BTN_L,F7,INPUT,GPIO_POWER_BUTTON_L +LID_OPEN,G7,INPUT,GPIO_LID_OPEN EN_Z1_RAILS,J8,OUTPUT, EN_PP5000_USBA_R,H6,OUTPUT, diff --git a/zephyr/program/rex/interrupts.dtsi b/zephyr/program/rex/interrupts.dtsi index f8cd156720..0f1100b18d 100644 --- a/zephyr/program/rex/interrupts.dtsi +++ b/zephyr/program/rex/interrupts.dtsi @@ -13,7 +13,7 @@ handler = "extpower_interrupt"; }; int_power_button: power_button { - irq-pin = <&gpio_mech_pwr_btn_odl>; + irq-pin = <&gpio_ec_mech_pwr_btn_l>; flags = <GPIO_INT_EDGE_BOTH>; handler = "power_button_interrupt"; }; diff --git a/zephyr/program/rex/motionsense.dtsi b/zephyr/program/rex/motionsense.dtsi index 6af7cd2b12..6d30209a12 100644 --- a/zephyr/program/rex/motionsense.dtsi +++ b/zephyr/program/rex/motionsense.dtsi @@ -153,7 +153,7 @@ active-mask = "SENSOR_ACTIVE_S0_S3"; location = "MOTIONSENSE_LOC_LID"; mutex = <&mutex_lis2dw12>; - port = <&i2c_ec_i2c_sensor>; + port = <&i2c_ec_i2c_sensor_scl_r>; rot-standard-ref = <&lid_rot_ref>; default-range = <2>; drv-data = <&lis2dw12_data>; @@ -177,7 +177,7 @@ active-mask = "SENSOR_ACTIVE_S0_S3"; location = "MOTIONSENSE_LOC_BASE"; mutex = <&mutex_lsm6dso>; - port = <&i2c_ec_i2c_sensor>; + port = <&i2c_ec_i2c_sensor_scl_r>; rot-standard-ref = <&base_rot_ref>; default-range = <4>; drv-data = <&lsm6dso_accel_data>; @@ -203,7 +203,7 @@ active-mask = "SENSOR_ACTIVE_S0_S3"; location = "MOTIONSENSE_LOC_BASE"; mutex = <&mutex_lsm6dso>; - port = <&i2c_ec_i2c_sensor>; + port = <&i2c_ec_i2c_sensor_scl_r>; rot-standard-ref = <&base_rot_ref>; default-range = <(1000 | ROUND_UP_FLAG)>; /* dps */ drv-data = <&lsm6dso_gyro_data>; @@ -216,7 +216,7 @@ active-mask = "SENSOR_ACTIVE_S0_S3"; location = "MOTIONSENSE_LOC_CAMERA"; - port = <&i2c_ec_i2c_sensor>; + port = <&i2c_ec_i2c_sensor_scl_r>; default-range = <0x10000>; drv-data = <&tcs_clear_data>; i2c-spi-addr-flags = "TCS3400_I2C_ADDR_FLAGS"; diff --git a/zephyr/program/rex/power_signals.dtsi b/zephyr/program/rex/power_signals.dtsi index 09c84b8558..448c233746 100644 --- a/zephyr/program/rex/power_signals.dtsi +++ b/zephyr/program/rex/power_signals.dtsi @@ -146,7 +146,7 @@ }; /* pwr-all-sys-pwrgd */ -&gpio_seq_ec_all_sys_pg { +&gpio_seq_ec_all_sys_pg_od { no-auto-init; }; diff --git a/zephyr/program/rex/rex-sans-sensors/project.overlay b/zephyr/program/rex/rex-sans-sensors/project.overlay index 59f3f5ae6d..d292714a25 100644 --- a/zephyr/program/rex/rex-sans-sensors/project.overlay +++ b/zephyr/program/rex/rex-sans-sensors/project.overlay @@ -9,7 +9,7 @@ &i2c0_0 { status = "disabled"; }; -&i2c_ec_i2c_sensor { +&i2c_ec_i2c_sensor_scl_r { status = "disabled"; }; &int_imu { diff --git a/zephyr/program/rex/rex.dtsi b/zephyr/program/rex/rex.dtsi index 8fd9565980..52e5cfe1a5 100644 --- a/zephyr/program/rex/rex.dtsi +++ b/zephyr/program/rex/rex.dtsi @@ -43,6 +43,27 @@ ec-i2c-c0-rt-sda { gpios = <&gpiod 0 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>; }; + + /* Overrides for generated.dtsi */ + ec_edp_bl_en { + gpios = <&gpiod 3 GPIO_OUTPUT_LOW>; + }; + en_pp5000_fan { + gpios = <&gpio6 1 GPIO_OUTPUT_LOW>; + }; + usb_c0_tcpc_rst_odl { + gpios = <&gpio6 7 (GPIO_ODR_HIGH | GPIO_ACTIVE_LOW)>; + }; + usb_c1_rt_rst_r_odl { + gpios = <&gpio7 4 (GPIO_ODR_HIGH | GPIO_ACTIVE_LOW)>; + }; + }; + + /* Special I2C port attribute */ + named-i2c-ports { + ec_i2c_usb_c1_tcp { + dynamic-speed; + }; }; usba-port-enable-list { diff --git a/zephyr/program/rex/temp_sensors.dtsi b/zephyr/program/rex/temp_sensors.dtsi index 680ebc8954..3c90dc9d8d 100644 --- a/zephyr/program/rex/temp_sensors.dtsi +++ b/zephyr/program/rex/temp_sensors.dtsi @@ -9,22 +9,22 @@ temp_ddr_soc: ddr_soc { compatible = "cros-ec,temp-sensor-thermistor"; thermistor = <&thermistor_3V3_30K9_47K_4050B>; - adc = <&adc_ddr_soc>; + adc = <&adc_temp_sensor_1>; }; temp_ambient: ambient { compatible = "cros-ec,temp-sensor-thermistor"; thermistor = <&thermistor_3V3_30K9_47K_4050B>; - adc = <&adc_ambient>; + adc = <&adc_temp_sensor_2>; }; temp_charger: charger { compatible = "cros-ec,temp-sensor-thermistor"; thermistor = <&thermistor_3V3_30K9_47K_4050B>; - adc = <&adc_charger>; + adc = <&adc_temp_sensor_3>; }; temp_wwan: wwan { compatible = "cros-ec,temp-sensor-thermistor"; thermistor = <&thermistor_3V3_30K9_47K_4050B>; - adc = <&adc_wwan>; + adc = <&adc_temp_sensor_4>; }; named-temp-sensors { |