nissa: Move sub_usb_a1_vbus to nivviks_overlay

Should be marked as no-auto-init since it is
only used for some sub-boards.

Also add nissa.csv as the source of the generated data.

BUG=none
TEST=zmake configure -b nivviks
BRANCH=none

Signed-off-by: Andrew McRae <amcrae@google.com>
Change-Id: I812019aaee7a386d29883f141839a9da2c34872d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3423616
Reviewed-by: Peter Marheine <pmarheine@chromium.org>

3 files changed, 128 insertions, 5 deletions

diff --git a/zephyr/projects/nissa/nissa.csv b/zephyr/projects/nissa/nissa.csv
new file mode 100644
index 0000000000..edcfc2afc2
--- /dev/null
+++ b/zephyr/projects/nissa/nissa.csv
@@ -0,0 +1,118 @@
+Signal Name,Subsystem,Description,DIR,Int,I/O Type,Internal PU,I/O Voltage,ICs attached,NPCX993,IT81302,Type,Enum,SW Notes,HW Notes
+ESPI_SOC_CLK,ESPI,ESPI clock,IN,no,--,N,1.80 V,,M1,L1,OTHER,,,
+ESPI_SOC_CS_EC_L,ESPI,ESPI chip select,IN,F,--,N,1.80 V,,L2,J2,OTHER,,,
+ESPI_SOC_D0_EC,ESPI,ESPI DATA0,I/O,,TTL,N,1.80 V,,H1,L2,OTHER,,,
+ESPI_SOC_D1_EC,ESPI,ESPI DATA1,I/O,,TTL,N,1.80 V,,J1,K1,OTHER,,,
+ESPI_SOC_D2_EC,ESPI,ESPI DATA2,I/O,,TTL,N,1.80 V,,K1,K2,OTHER,,,
+ESPI_SOC_D3_EC,ESPI,ESPI DATA3,I/O,,TTL,N,1.80 V,,L1,J1,OTHER,,,
+ESPI_SOC_RST_EC_L,ESPI,ESPI reset,IN,F,,N,1.80 V,,K3,R5,OTHER,,,
+ESPI_EC_ALERT_SOC_L,ESPI,ESPI Alert,OUT,,TTL,N,1.80 V,,L3,H1,OTHER,,,
+GSC_EC_PWR_BTN_ODL,GSC,Power Button input from GSC,IN,both,--,Y,3.30 V,,E7,B13,INPUT_PU,GPIO_POWER_BUTTON_L,GPIO00,
+EC_RST_ODL,GSC,Reset signal for EC from GSC,IN,no,--,N,3.30 V,GSC,K6,M2,OTHER,,,
+EC_GSC_PACKET_MODE,GSC,Wakes/interrupts GSC and (maybe) vice-versa,I/O,both,--,N,3.30 V,,J6,F9,INPUT,GPIO_PACKET_MODE_EN,,
+EC_I2C_EEPROM_SCL,I2C,"I2C clock for CBI, reading INAs, programming EC (ITE only)",I/O,,OD,N,3.30 V,"EEPROMs, INAs",C12,A5,I2C_CLOCK,I2C_PORT_EEPROM,,
+EC_I2C_EEPROM_SDA,I2C,"I2C data for CBI, reading INAs, programming EC (ITE only)",I/O,,OD,N,3.30 V,"EEPROMs, INAs",B12,B3,I2C_DATA,,,
+EC_I2C_BATT_SDA,I2C,I2C data for battery pack,I/O,,OD,N,3.30 V,Battery Pack,K10,A3,I2C_DATA,,,
+EC_I2C_BATT_SCL,I2C,I2C clock for battery pack,I/O,,OD,N,3.30 V,Battery Pack,J10,A4,I2C_CLOCK,I2C_PORT_BATTERY,,
+EC_I2C_SENSOR_SCL,I2C,I2C clock for sensors,I/O,,OD,N,3.30 V,"IMU, accel, lid accel, kb bl",K8,C2,I2C_CLOCK,I2C_PORT_SENSOR,,
+EC_I2C_SENSOR_SDA,I2C,I2C data for sensors,I/O,,OD,N,3.30 V,"IMU, accel, lid accel, kb bl",K7,D2,I2C_DATA,,,
+EC_I2C_USB_C0_SDA,I2C,I2C clock for USB-C C0 and USB-A A0 port ICs,I/O,,OD,N,3.30 V,"TCPC, BC1.2, Charger",F9,K7,I2C_DATA,,,
+EC_I2C_USB_C0_SCL,I2C,I2C data for USB-C C0 and USB-A A0 port ICs,I/O,,OD,N,3.30 V,"TCPC, BC1.2, Charger",F8,L7,I2C_CLOCK,I2C_PORT_USB_C0_TCPC,,
+EC_I2C_SUB_USB_C1_SDA,I2C,I2C clock for USB-C C1 and USB-A A1 port ICs (HDMI: HDMI_EN_SUB_ODL - enable HDMI retimer/output/active low),I/O,,OD,N,3.30 V,"TCPC, BC1.2, Charger",E9,R4,I2C_DATA,,,
+EC_I2C_SUB_USB_C1_SCL,I2C,"I2C data for USB-C C1 and USB-A A1 port ICs (HDMI_HPD_SUB_ODL, hot-plug detection/input (interrupt)/active low)",I/O,,OD,N,3.30 V,"TCPC, BC1.2, Charger",E8,P3,I2C_CLOCK,I2C_PORT_USB_C1_TCPC,,
+EC_KSI_00,Keyboard,Keyboard Input,IN,no,--,Y,3.30 V,,A2,K15,OTHER,,,
+KSI_01,Keyboard,Keyboard Input,IN,no,--,Y,3.30 V,,A3,K14,OTHER,,,
+EC_KSI_02,Keyboard,Keyboard Input,IN,no,--,Y,3.30 V,,A4,K10,OTHER,,,
+EC_KSI_03,Keyboard,Keyboard Input,IN,no,--,Y,3.30 V,,B3,J15,OTHER,,,Vivaldi Support
+KSI_04,Keyboard,Keyboard Input,IN,no,--,Y,3.30 V,,B4,J10,OTHER,,,
+KSI_05,Keyboard,Keyboard Input,IN,no,--,Y,3.30 V,,C3,J11,OTHER,,,
+KSI_06,Keyboard,Keyboard Input,IN,no,--,Y,3.30 V,,C4,J14,OTHER,,,
+KSI_07,Keyboard,Keyboard Input,IN,no,--,Y,3.30 V,,C5,H10,OTHER,,,
+KSO_00,Keyboard,Keyboard Output,OUT,,OD,N,3.30 V,,B5,R9,OTHER,,,
+KSO_01,Keyboard,Keyboard Output,OUT,,OD,N,3.30 V,,B6,K8,OTHER,,,
+EC_KSO_02_INV,Keyboard,Keyboard Output,OUT,,TTL,N,3.30 V,,B7,P10,OUTPUT,GPIO_KBD_KSO2,,
+KSO_03,Keyboard,Keyboard Output,OUT,,OD,N,3.30 V,,B8,R10,OTHER,,,
+KSO_04,Keyboard,Keyboard Output,OUT,,OD,N,3.30 V,,C7,L9,OTHER,,,
+KSO_05,Keyboard,Keyboard Output,OUT,,OD,N,3.30 V,,C6,K9,OTHER,,,
+KSO_06,Keyboard,Keyboard Output,OUT,,OD,N,3.30 V,,C8,P11,OTHER,,,
+KSO_07,Keyboard,Keyboard Output,OUT,,OD,N,3.30 V,,B9,R11,OTHER,,,
+KSO_08,Keyboard,Keyboard Output,OUT,,OD,N,3.30 V,,C9,P12,OTHER,,,
+KSO_09,Keyboard,Keyboard Output,OUT,,OD,N,3.30 V,,C10,L10,OTHER,,,
+KSO_10,Keyboard,Keyboard Output,OUT,,OD,N,3.30 V,,B11,P13,OTHER,,,
+KSO_11,Keyboard,Keyboard Output,OUT,,OD,N,3.30 V,,B10,P14,OTHER,,,
+KSO_12,Keyboard,Keyboard Output,OUT,,OD,N,3.30 V,,C11,N14,OTHER,,,
+KSO_13,Keyboard,Keyboard Output,OUT,,OD,N,3.30 V,,D11,M15,OTHER,,,Required only for NUM PAD
+KSO_14,Keyboard,Keyboard Output,OUT,,OD,N,3.30 V,,D6,M14,OTHER,,,Required only for NUM PAD
+EN_KB_BL,MISC,Enable Keyboard backlight,OUT,,TTL,N,3.30 V,,G11,D14,OUTPUT,GPIO_EN_KEYBOARD_BACKLIGHT,,
+VOLDN_BTN_ODL,MISC,Volume down signal,IN,both,--,Y,3.30 V,Button,E11,G15,INPUT_PU,GPIO_VOLUME_DOWN_L,,
+VOLUP_BTN_ODL,MISC,Volume up signal,IN,both,--,Y,3.30 V,Button,F12,F14,INPUT_PU,GPIO_VOLUME_UP_L,,
+LID_OPEN,MISC,Indicator from lid switch that lid is open,IN,both,--,N,3.30 V,,G7,A11,INPUT,GPIO_LID_OPEN,,
+TABLET_MODE_L,MISC,Indicator from lid switch that lid is flipped all the way around,IN,both,--,N,3.30 V,,M12,L8,INPUT,GPIO_TABLET_MODE_L,,Not required to connect to EC?
+IMU_INT_L,MISC,Interrupt from base intertial measurement unit,IN,falling,,N,1.80 V,IMU,M2,F15,INPUT,,,
+ACC_INT_L,MISC,Interrupt from lid accel (only in convertibles),IN,falling,,N,1.80 V,ACC,G10,E2,INPUT,,,Not required from Dedede?
+EC_WP_ODL,MISC,Write protection status from GSC,IN,no,--,N,3.30 V,GSC,L12,R8,INPUT,GPIO_WP_L,,
+EC_EDP_BL_EN_OD,MISC,EC override of backlight enable,OUT,,OD,N,3.30 V,,E10,R15,OUTPUT_ODR,GPIO_ENABLE_BACKLIGHT,,
+TEMP_SENSOR_1,MISC,NTC 1 - near memory,IN,no,ADC,N,ANA,,F2,H15,ADC,ADC_TEMP_SENSOR_1,,
+TEMP_SENSOR_2,MISC,NTC 2 - near chassis hot spot,IN,no,ADC,N,ANA,,E3,G10,ADC,ADC_TEMP_SENSOR_2,,
+TEMP_SENSOR_3,MISC,NTC 3 - Ambient/skin temp,IN,no,ADC,N,ANA,,#N/A,A13,ADC,ADC_TEMP_SENSOR_3,,
+USB_C0_INT_ODL,MISC,Interrupt for all ICs for Type-C port 0,IN,,--,Y,3.30 V,,E6,P1,INPUT_PU,,,
+"SUB_USB_C1_INT_OD
+(HDMI: EN_SUB_RAILS_ODL)",MISC,"Interrupt for all ICs for Type-C port 1 or the sub-boar
+HDMI: Enable 5V power rail/output/active low",IN,,--,Y,3.30 V,,F7,N2,OTHER,,,
+HDMI_SEL,MISC,Configures AUX to be HDMI DDC,OUT,,TTL,N,3.30 V,,D10,F2,OUTPUT,,,
+CCD_MODE_ODL,MISC,Indicates whether H1 is using SBU lines for debug. Also can trigger CCD if the EC decides to.,I/O,falling,--/OD,N,3.30 V,GSC,A12,B9,INPUT,GPIO_CCD_MODE_ODL,,
+EC_BATTERY_PRES_ODL,MISC,or BATT_TEMP - indication of battery presence,IN,,--,N,3.30 V,Battery pack,K12,G14,INPUT,GPIO_BATT_PRES_ODL,,
+EC_ENTERING_RW,MISC,Indicate when EC is transitioning to RW code,OUT,,TTL,N,3.30 V,GSC,D9,N1,OUTPUT,GPIO_ENTERING_RW,,
+EN_USB_A0_VBUS,MISC,,OUT,,TTL,N,3.30 V,,K9,B1,OUTPUT,,,
+USB_A0_ILIMIT_SDP,MISC,,OUT,,TTL,N,3.30 V,,J8,A1,OUTPUT,,??,
+EN_SUB_USB_A1_VBUS,MISC,,OUT,,TTL,N,3.30 V,,A9,B12,OTHER,,??,
+SUB_USB_A1_ILIMIT_SDP,MISC,,OUT,,TTL,N,3.30 V,,A10,A12,OUTPUT,,??,
+EC_CBI_WP,MISC,Updated EC WP method,OUT,,TTL,N,3.30 V,,#N/A,D15,OUTPUT,,??,
+IMVP91_VRRDY_OD,POWER SEQUENCE,,IN,,,,,,E2,C14,INPUT,,,
+EC_SOC_SYS_PWROK,POWER SEQUENCE,"Generic power good input to PCH (platform specific), system ready to exit reset.",OUT,,TTL,N,3.30 V,SOC,C1,B11,OUTPUT,,PCH_PWROK,
+EN_SLP_Z,POWER SEQUENCE,Enable Sleep State (Active high). For ITE only.,OUT,,TTL,N,3.30 V,,F3,R3,OUTPUT,,,
+EN_PP5000_S5,POWER SEQUENCE,"Enable PP5000_S5. Figure 523, states this has to come after 3.3V , why?",OUT,,TTL,N,3.30 V,,E5,R14,OUTPUT,,,
+EN_PP3300_S5,POWER SEQUENCE,Enable PP3300_S5.,OUT,,TTL,N,3.30 V,,L9,K11,OUTPUT,,,
+EC_SOC_DSW_PWROK,POWER SEQUENCE,DSW Power is OK to AP (diode logic with PP3300_PG),OUT,,TTL,N,3.30 V,SOC,K4,C1,OUTPUT,,,
+EC_SOC_RSMRST_L,POWER SEQUENCE,"Asserted after S5-rails are stable, buffered to SOC from EC",OUT,,TTL,N,3.30 V,SOC,F11,E9,OUTPUT,,,
+RSMRST_PWRGD_L,POWER SEQUENCE,,IN,both,--,Y,3.30 V,,M11,B14,INPUT_PU,,,
+SLP_SUS_L,POWER SEQUENCE,"If high, EC must keep S5 on, used in both DSx and non-DSx platforms.",IN,both,--,N,3.30 V,,H2,F8,INPUT,,,No virtual wire over eSPI
+SLP_S4_L,POWER SEQUENCE,"PCH S4 Sleep control. When low, shut-off power to all non critical systems in S4 and lower.",IN,both,--,N,3.30 V,,J4,G11,INPUT,,,This signal is also virtual wire on the eSPI interface.
+SLP_S3_L,POWER SEQUENCE,"PCH S3 Sleep control. When low, shut-off power to all non critical systems in S3 and lower.",IN,both,--,N,3.30 V,,K11,B10,INPUT,,,This signal is also virtual wire on the eSPI interface.
+SLP_S0_L,POWER SEQUENCE,"PCH S0 Sleep control, asserted when PCH = idle & CPU = C10",IN,both,--,N,3.30 V,,L10,F1,INPUT,,,No virtual wire over eSPI
+CPU_C10_GATE_L,POWER SEQUENCE,Asserted low when going into CPU_C10,IN,both,--,N,3.30 V,"SOC, VRs, LS",J3,B6,INPUT,,??,
+EC_VSENSE_PP3300_S5,POWER SEQUENCE,Voltage sense (or PGOOD) for PP3300_S5,IN,no,ADC,N,ANA,,B2,H11,ADC,ADC_PP3300_S5,??,"Nuvoton VREF=2.816V, ITE VREF = AVCC or AVCC/1.1 (3V)"
+PG_PP5000_S5_OD,POWER SEQUENCE,PP5000_S5 power good signal.,IN,,--,N,3.30 V,,D3,C15,INPUT,,,
+EC_SOC_VCCST_PWRGD_OD,POWER SEQUENCE,,OUT,,OD,N,1.05 V,,H11,P9,OUTPUT_ODR,,,
+EC_SOC_PCH_PWROK_OD,POWER SEQUENCE,,OUT,,OD,N,3.30 V,,M4,R12,OUTPUT_ODR,,,
+ALL_SYS_PWRGD,POWER SEQUENCE,,IN,both,,N,3.30 V,,J11,B2,INPUT,,,Figure 398 PDG 0.5
+PG_PP1050_MEM_S3_OD,POWER SEQUENCE,,IN,both,--,N,3.30 V,,D2,P5,INPUT,,??,
+PG_PP1050_PROC,POWER SEQUENCE,,IN,both,--,Y,3.30 V,,C2,A14,INPUT_PU,,??,
+SYS_RST_ODL,POWER SEQUENCE,Reset for SOC,OUT,,OD,N,3.30 V,SOC,H7,P4,OUTPUT_ODR,,,
+EC_SOC_WAKE_ODL,POWER SEQUENCE,"Allows EC to wake AP (e.g., keyboard out of S0ix)",OUT,,OD,N,3.30 V,SOC,L11,E1,OUTPUT_ODL,GPIO_EC_PCH_WAKE_ODL,,
+EC_SOC_RTCRST,POWER SEQUENCE,Allows EC to reset logic on the AP's RTC well,OUT,,TTL,N,3.30 V,SOC,J5,R2,OUTPUT,,,
+VCCIN_AUX_VID0,POWER SEQUENCE,Debug purposes,IN,both,,N,1.80 V,,L8,P2,INPUT,,,
+VCCIN_AUX_VID1,POWER SEQUENCE,Debug purposes,IN,both,,N,1.80 V,,L7,R1,INPUT,,,
+PWM_KB_BL,PWM,Keyboard backlight PWM control signal,OUT,,PWM,N,3.30 V,,H8,R6,PWM,,,
+PWM_LED_1_ODL,PWM,LED 1,OUT,,PWM,N,3.30 V,,G8,P6,PWM_INVERT,,,
+PWM_LED_2_ODL,PWM,LED 2,OUT,,PWM,N,3.30 V,,G9,R7,PWM_INVERT,,,
+PWM_LED_3_ODL,PWM,LED 3,OUT,,PWM,N,3.30 V,,H10,P7,PWM_INVERT,,,
+EC_PSYS,PWM,System power monitoring output,OUT,,PWM,N,ANA,"Charger, IMVP9.1",G6,E15,OTHER,,,
+EC_SOC_PWR_BTN_ODL,SOC,Buffered power button signal from EC to SOC,OUT,,OD,N,3.30 V,SOC,H9,J5,OUTPUT_ODL,GPIO_PCH_PWRBTN_L,,
+EC_SOC_HDMI_HPD,SOC,HPD buffer output for HDMI,OUT,,TTL,N,3.30 V,,L6,P15,OUTPUT,,,
+EC_PROCHOT_ODL,SOC,Allows us to send/read PROCHOT,I/O,both,OD,N,1.05 V,SOC,G3,H14,INPUT,,,
+EC_PCHHOT_ODL,SOC,Allows us to send/read PCHHOT,,,,,,,#N/A,#N/A,OTHER,,,Intel confirmed that this feature is not used.
+EC_SOC_INT_ODL,SOC,EC interrupt to SOC,OUT,,OD,N,,,K5,P8,OUTPUT_ODL,GPIO_EC_INT_L,,Is this needed?
+UART_GSC_DBG_RX_EC_TX,UART,UART signal from EC to debugger,OUT,,TTL,N,3.30 V,,H4,B4,OTHER,,,
+UART_GSC_DBG_TX_EC_RX,UART,UART signal from debugger to EC,IN,,--,N,3.30 V,,G4,B5,OTHER,,,
+EN_PP5000_PEN_X,MISC,Enable signal for 5V PEN charging rail,OUT,,TTL,N,3.30 V,,A11,G2,OUTPUT,,,
+PEN_DETECT_ODL,MISC,"PEN detect signal. Internal debouncing, if required.",IN,both,--,Y,3.30 V,,G12,E14,INPUT_PU,,,
+USB_C0_CC1,USB-PD,CC1 for IT81302 only,I/O,,CC,PD,ANA,,#N/A,E10,OTHER,,,
+USB_C0_CC2,USB-PD,CC2 for IT81302 only,I/O,,CC,PD,ANA,,#N/A,A10,OTHER,,,
+USB_C0_FRS,USB-PD,FRS for IT81302 only,OUT,,TTL,N,3.30 V,,#N/A,D1,OUTPUT,,,
+EN_USB_C0_CC1_VCONN,USB-PD,CC1 vconn en for IT81302 only,OUT,,TTL,N,3.30 V,,#N/A,A9,OUTPUT,,,
+EN_USB_C0_CC2_VCONN,USB-PD,CC2 vconn en for IT81302 only,OUT,,TTL,N,3.30 V,,#N/A,A8,OUTPUT,,,
+EC_TRIS_L,DEBUG,Debug for NPCX993,,,,,,,E4,#N/A,OTHER,,,
+EC_TEST_L,DEBUG,Debug for NPCX994,,,,,,,K2,#N/A,OTHER,,,
+EC_32KXOUT,DEBUG,Debug for NPCX995,,,,,,,M5,#N/A,OTHER,,,
+EC_SHDF_ESPI_L,DEBUG,Debug for NPCX996,,,,,,,H3,#N/A,OTHER,,
diff --git a/zephyr/projects/nissa/nivviks_generated.dts b/zephyr/projects/nissa/nivviks_generated.dts
index d1f3b2b160..c5e6c38b34 100644
--- a/zephyr/projects/nissa/nivviks_generated.dts
+++ b/zephyr/projects/nissa/nivviks_generated.dts
@@ -145,10 +145,6 @@
 			#gpio-cells = <0>;
 			gpios = <&gpioe 1 GPIO_OUTPUT>;
 		};
-		gpio_en_sub_usb_a1_vbus: en_sub_usb_a1_vbus {
-			#gpio-cells = <0>;
-			gpios = <&gpiod 4 GPIO_OUTPUT>;
-		};
 		gpio_en_usb_a0_vbus: en_usb_a0_vbus {
 			#gpio-cells = <0>;
 			gpios = <&gpio9 1 GPIO_OUTPUT>;
@@ -217,7 +213,7 @@
 		};
 		gpio_sys_rst_odl: sys_rst_odl {
 			#gpio-cells = <0>;
-			gpios = <&gpioc 5 GPIO_ODR_LOW>;
+			gpios = <&gpioc 5 GPIO_ODR_HIGH>;
 		};
 		gpio_tablet_mode_l: tablet_mode_l {
 			#gpio-cells = <0>;
diff --git a/zephyr/projects/nissa/nivviks_overlay.dts b/zephyr/projects/nissa/nivviks_overlay.dts
index c10de438b7..83374cf6fe 100644
--- a/zephyr/projects/nissa/nivviks_overlay.dts
+++ b/zephyr/projects/nissa/nivviks_overlay.dts
@@ -92,6 +92,15 @@
 		};
 
 		/*
+		 * Enable USB-A port 1 vbus (on sub-board)
+		 */
+		gpio_en_sub_usb_a1_vbus: en_sub_usb_a1_vbus {
+			#gpio-cells = <0>;
+			gpios = <&gpiod 4 GPIO_OUTPUT>;
+			no-auto-init;
+		};
+
+		/*
 		 * Alternative use for I2C_PORT_USB_C1_TCPC
 		 * when HDMI sub-board connected.
 		 */