rex: Update the auto-generated .dts file

Previously, there were some inconsistencies and missing values in the
columns that are used by the pinmap utility to created
generated.dts. This CL replaces the previous generated.dts so that
there are no longer any manual edits required. In addition, the input
.csv file has been updated and renamed to rex0_gpio.csv.

BRANCH=none
BUG=b:240434243
TEST=zmake build rex

Signed-off-by: Scott Collyer <scollyer@google.com>
Change-Id: I73700d5358a2edf33b8c28eebaebeb6dc117dda9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3823910
Tested-by: Scott Collyer <scollyer@chromium.org>
Reviewed-by: Li1 Feng <li1.feng@intel.com>
Reviewed-by: Fabio Baltieri <fabiobaltieri@google.com>
Commit-Queue: Fabio Baltieri <fabiobaltieri@google.com>

2 files changed, 81 insertions, 17 deletions

diff --git a/zephyr/projects/rex/generated.dts b/zephyr/projects/rex/generated.dts
index 5d1c6e3eb8..2f9a3bbfc0 100644
--- a/zephyr/projects/rex/generated.dts
+++ b/zephyr/projects/rex/generated.dts
@@ -42,6 +42,9 @@
 		gpio_cpu_c10_gate_l: cpu_c10_gate_l {
 			gpios = <&gpioa 7 GPIO_INPUT>;
 		};
+		gpio_ec_accel_int_r_l: ec_accel_int_r_l {
+			gpios = <&gpio8 1 GPIO_INPUT>;
+		};
 		gpio_ec_als_rgb_int_r_l: ec_als_rgb_int_r_l {
 			gpios = <&gpiod 4 GPIO_INPUT_PULL_UP>;
 		};
@@ -49,6 +52,9 @@
 			gpios = <&gpioa 3 GPIO_INPUT>;
 			enum-name = "GPIO_BATT_PRES_ODL";
 		};
+		gpio_ec_cbi_wp: ec_cbi_wp {
+			gpios = <&gpio7 3 GPIO_OUTPUT>;
+		};
 		gpio_ec_edp_bl_en: ec_edp_bl_en {
 			gpios = <&gpiod 3 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_ENABLE_BACKLIGHT";
@@ -60,6 +66,12 @@
 		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)>;
 		};
@@ -89,6 +101,30 @@
 		gpio_ec_soc_wake_r_odl: ec_soc_wake_r_odl {
 			gpios = <&gpioc 0 GPIO_ODR_LOW>;
 		};
+		gpio_ec_spare_gpio42: ec_spare_gpio42 {
+			gpios = <&gpio4 2 GPIO_OUTPUT>;
+		};
+		gpio_ec_spare_gpio66: ec_spare_gpio66 {
+			gpios = <&gpio6 6 GPIO_OUTPUT>;
+		};
+		gpio_ec_spare_gpio94: ec_spare_gpio94 {
+			gpios = <&gpio9 4 GPIO_OUTPUT>;
+		};
+		gpio_ec_spare_gpioa2: ec_spare_gpioa2 {
+			gpios = <&gpioa 2 GPIO_OUTPUT>;
+		};
+		gpio_ec_spare_gpioa4: ec_spare_gpioa4 {
+			gpios = <&gpioa 4 GPIO_OUTPUT>;
+		};
+		gpio_ec_spare_gpioc7: ec_spare_gpioc7 {
+			gpios = <&gpioc 7 GPIO_OUTPUT>;
+		};
+		gpio_ec_spare_gpo32: ec_spare_gpo32 {
+			gpios = <&gpio3 2 GPIO_OUTPUT>;
+		};
+		gpio_ec_spare_gpo35: ec_spare_gpo35 {
+			gpios = <&gpio3 5 GPIO_OUTPUT>;
+		};
 		gpio_ec_voldn_btn_odl: ec_voldn_btn_odl {
 			gpios = <&gpio9 3 GPIO_INPUT_PULL_UP>;
 			enum-name = "GPIO_VOLUME_DOWN_L";
@@ -119,6 +155,18 @@
 		gpio_imvp92_vrrdy_od: imvp92_vrrdy_od {
 			gpios = <&gpio4 3 GPIO_INPUT>;
 		};
+		gpio_led_1_l: led_1_l {
+			gpios = <&gpioc 4 GPIO_OUTPUT>;
+		};
+		gpio_led_2_l: led_2_l {
+			gpios = <&gpioc 3 GPIO_OUTPUT>;
+		};
+		gpio_led_3_l: led_3_l {
+			gpios = <&gpioc 2 GPIO_OUTPUT>;
+		};
+		gpio_led_4_l: led_4_l {
+			gpios = <&gpio6 0 GPIO_OUTPUT>;
+		};
 		gpio_lid_open: lid_open {
 			gpios = <&gpiod 2 GPIO_INPUT_PULL_UP>;
 			enum-name = "GPIO_LID_OPEN";
@@ -177,12 +225,14 @@
 		};
 		gpio_usb_c1_bc12_int_odl: usb_c1_bc12_int_odl {
 			gpios = <&gpio5 0 GPIO_INPUT>;
+			enum-name = "GPIO_USB_C1_BC12_INT_ODL";
 		};
 		gpio_usb_c1_frs_en: usb_c1_frs_en {
 			gpios = <&gpio8 3 GPIO_ODR_HIGH>;
 		};
 		gpio_usb_c1_ppc_int_odl: usb_c1_ppc_int_odl {
 			gpios = <&gpiof 5 GPIO_INPUT>;
+			enum-name = "GPIO_USB_C1_PPC_INT_ODL";
 		};
 		gpio_usb_c1_rst_odl: usb_c1_rst_odl {
 			gpios = <&gpio3 7 GPIO_ODR_LOW>;
@@ -195,6 +245,7 @@
 		};
 		gpio_usb_c1_tcpc_int_odl: usb_c1_tcpc_int_odl {
 			gpios = <&gpio3 4 GPIO_INPUT>;
+			enum-name = "GPIO_USB_C1_TCPC_INT_ODL";
 		};
 	};
 
@@ -215,7 +266,7 @@
 		};
 		i2c_ec_i2c_usb_c0_rt: ec_i2c_usb_c0_rt {
 			i2c-port = <&i2c3_0>;
-			enum-names = "I2C_PORT_USB_C0_C2_MUX";
+			enum-names = "I2C_PORT_USB_C0_RT";
 		};
 		i2c_ec_i2c_usb_c1_tcp: ec_i2c_usb_c1_tcp {
 			i2c-port = <&i2c4_1>;
diff --git a/zephyr/projects/rex/rex_gpio.csv b/zephyr/projects/rex/rex0_gpio.csv
index c12862509e..f8d48bf398 100644
--- a/zephyr/projects/rex/rex_gpio.csv
+++ b/zephyr/projects/rex/rex0_gpio.csv
@@ -1,5 +1,5 @@
 Signal Name,Pin Number,Type,Enum
-USB_C1_BC12_INT_ODL,G10,INPUT,
+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,
@@ -20,9 +20,14 @@ CPU_C10_GATE_L,J11,INPUT,
 SOC_PWROK,K11,OUTPUT,
 EC_SOC_RSMRST_L,F11,OUTPUT,
 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,
 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
@@ -55,56 +60,64 @@ 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,
+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,
-LED_4_L,G6,PWM_INVERT,
+LED_4_L,G6,OUTPUT,
 EN_PP5000_FAN,K4,OUTPUT_ODR,
-USB_C0_PPC_INT_ODL,H2,INPUT,
+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,
+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,
+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,PWM_INVERT,
-LED_2_L,G9,PWM_INVERT,
-LED_1_L,G8,PWM_INVERT,
-USB_C0_BC12_INT_ODL,D10,INPUT,
+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_SPARE_GPIOC7,F10,OUTPUT,
 EC_I2C_USB_C0_RT_SDA,F9,I2C_DATA,
-EC_I2C_USB_C0_RT_SCL,F8,I2C_CLOCK,
+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,
+USB_C0_TCPC_INT_ODL,F4,INPUT,GPIO_USB_C0_TCPC_INT_ODL
 SEQ_EC_RSMRST_ODL,A11,OUTPUT_ODL,
 EC_I2C_USB_C1_MIX_SDA,L7,I2C_DATA,
-EC_I2C_USB_C1_MIX_SCL,L6,I2C_CLOCK,
+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,
+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,
+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,
-ACOK_OD,E7,INPUT,
+EC_KB_BL_EN_L,J9,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
 EN_Z1_RAILS,J8,OUTPUT,
 EN_PP5000_USBA_R,H6,OUTPUT,
+