From 165b1f956491a1e8d57de375bdb25c3fce2bda0d Mon Sep 17 00:00:00 2001 From: Peter Marheine Date: Thu, 17 Mar 2022 13:53:11 +1100 Subject: nissa: use standard keyboard column 2 invert option On Nivviks this was being accomplished by driving the column 2 output with an active-low GPIO, but doing this portably requires setting the dedicated KEYBOARD_COL2_INVERTED option because Nereid's EC does not need to drive the signal as a GPIO in order to invert it and consequently cannot invert it in the device tree in the same way. BUG=b:225082447 TEST=Keyboard column 2 output now idles high on Nereid BRANCH=none Signed-off-by: Peter Marheine Change-Id: Ia3e5966d642b4ffb458cb1d91015869763ba00b4 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3529596 Reviewed-by: Andrew McRae Commit-Queue: Andrew McRae --- zephyr/projects/nissa/nissa.csv | 6 +++--- zephyr/projects/nissa/prj.conf | 2 ++ zephyr/projects/nissa/prj_nivviks.conf | 1 - 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/zephyr/projects/nissa/nissa.csv b/zephyr/projects/nissa/nissa.csv index 62fc5a912d..4db3c6dcce 100644 --- a/zephyr/projects/nissa/nissa.csv +++ b/zephyr/projects/nissa/nissa.csv @@ -30,7 +30,7 @@ KSI_06,Keyboard,Keyboard Input,IN,no,--,Y,3.30 V,,C4,C4,J14,OTHER,,, KSI_07,Keyboard,Keyboard Input,IN,no,--,Y,3.30 V,,C5,C5,H10,OTHER,,, KSO_00,Keyboard,Keyboard Output,OUT,,OD,N,3.30 V,,B5,B5,R9,OTHER,,, KSO_01,Keyboard,Keyboard Output,OUT,,OD,N,3.30 V,,B6,B6,K8,OTHER,,, -EC_KSO_02_INV,Keyboard,Keyboard Output,OUT,,TTL,N,3.30 V,,B7,B7,P10,OUTPUT_L,,, +EC_KSO_02_INV,Keyboard,Keyboard Output,OUT,,TTL,N,3.30 V,,B7,B7,P10,OUTPUT_L,,KEYBOARD_COL2_INVERTED, KSO_03,Keyboard,Keyboard Output,OUT,,OD,N,3.30 V,,B8,B8,R10,OTHER,,, KSO_04,Keyboard,Keyboard Output,OUT,,OD,N,3.30 V,,C7,C7,L9,OTHER,,, KSO_05,Keyboard,Keyboard Output,OUT,,OD,N,3.30 V,,C6,C6,K9,OTHER,,, @@ -57,8 +57,8 @@ TEMP_SENSOR_2,MISC,NTC 2 - near chassis hot spot,IN,no,ADC,N,ANA,,E3,E3,G10,ADC, TEMP_SENSOR_3,MISC,NTC 3 - Ambient/skin temp,IN,no,ADC,N,ANA,,,F4,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,E6,P1,INPUT_PU,,, USB_C0_PROT_FAULT_ODL,MISC,Fault out of the USB C0 protection IC,IN,falling,OD,Y,3.30 V,,,#N/A,,,,, -"SUB_USB_C1_INT_ODL -(HDMI: EN_SUB_RAILS_ODL)",MISC,"Interrupt for all ICs for Type-C port 1 or the sub-board +"SUB_USB_C1_INT_ODL +(HDMI: EN_SUB_RAILS_ODL)",MISC,"Interrupt for all ICs for Type-C port 1 or the sub-board HDMI: Enable 5V power rail/output/active low",IN,,--,Y,3.30 V,,F7,F7,N2,OTHER,,, HDMI_SEL,MISC,Configures AUX to be HDMI DDC,OUT,,TTL,N,3.30 V,,D10,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,A12,B9,INPUT,GPIO_CCD_MODE_ODL,, diff --git a/zephyr/projects/nissa/prj.conf b/zephyr/projects/nissa/prj.conf index b79f8869e9..cb011d2d08 100644 --- a/zephyr/projects/nissa/prj.conf +++ b/zephyr/projects/nissa/prj.conf @@ -57,6 +57,8 @@ CONFIG_PLATFORM_EC_KEYBOARD_PROTOCOL_8042=y CONFIG_PLATFORM_EC_VOLUME_BUTTONS=y CONFIG_PLATFORM_EC_CMD_BUTTON=n CONFIG_PLATFORM_EC_PWM_KBLIGHT=y +# Column 2 is driven through the GSC, which inverts the signal going through it +CONFIG_PLATFORM_EC_KEYBOARD_COL2_INVERTED=y # MKBP event CONFIG_PLATFORM_EC_MKBP_EVENT=y diff --git a/zephyr/projects/nissa/prj_nivviks.conf b/zephyr/projects/nissa/prj_nivviks.conf index 87d383e813..8d1fb5f506 100644 --- a/zephyr/projects/nissa/prj_nivviks.conf +++ b/zephyr/projects/nissa/prj_nivviks.conf @@ -16,7 +16,6 @@ CONFIG_PLATFORM_EC_ACCELGYRO_LSM6DSO_AS_BASE=y CONFIG_PLATFORM_EC_ACCEL_LIS2DW12=y # Keyboard -CONFIG_PLATFORM_EC_KEYBOARD_COL2_INVERTED=y CONFIG_CROS_KB_RAW_NPCX=y # TCPC+PPC: both C0 and C1 (if present) are RAA489000 -- cgit v1.2.1