diff options
| author | Andrew McRae <amcrae@google.com> | 2022-03-17 14:09:01 +1100 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2022-03-17 06:17:50 +0000 |
| commit | d0e55de8b2a3b088576abf84a8beb33fe14c1e05 (patch) | |
| tree | 6afbf8b05d96ca77fb50e567f97b651a60f21789 | |
| parent | f267998011f1a30c5b4e488245c6d8be218702c2 (diff) | |
| download | chrome-ec-d0e55de8b2a3b088576abf84a8beb33fe14c1e05.tar.gz | |
nissa: Swap nivviks volume up/down buttons
Changes to reflect actual button layout.
BUG=b:224884220
TEST=zmake build nivviks; flash and run and check buttons
BRANCH=none
Signed-off-by: Andrew McRae <amcrae@google.com>
Change-Id: I33eca0b0ebcf05a7792dccf4fad1d5a4544bed81
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3529595
Reviewed-by: Peter Marheine <pmarheine@chromium.org>
Commit-Queue: Peter Marheine <pmarheine@chromium.org>
| -rw-r--r-- | zephyr/projects/nissa/nissa.csv | 4 | ||||
| -rw-r--r-- | zephyr/projects/nissa/nivviks_generated.dts | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/zephyr/projects/nissa/nissa.csv b/zephyr/projects/nissa/nissa.csv index f2fa710ad7..62fc5a912d 100644 --- a/zephyr/projects/nissa/nissa.csv +++ b/zephyr/projects/nissa/nissa.csv @@ -44,8 +44,8 @@ KSO_12,Keyboard,Keyboard Output,OUT,,OD,N,3.30 V,,C11,C11,N14,OTHER,,, KSO_13,Keyboard,Keyboard Output,OUT,,OD,N,3.30 V,,D11,D11,M15,OTHER,,,Required only for NUM PAD
KSO_14,Keyboard,Keyboard Output,OUT,,OD,N,3.30 V,,D6,D6,M14,OTHER,,,Required only for NUM PAD
EN_KB_BL,MISC,Enable Keyboard backlight,OUT,,TTL,N,3.30 V,,G11,G11,D14,OUTPUT,GPIO_EN_KEYBOARD_BACKLIGHT,,
-VOLDN_BTN_ODL,MISC,Volume down signal,IN,both,--,Y,3.30 V,Button,E11,E11,G15,INPUT_PU,GPIO_VOLUME_DOWN_L,,
-VOLUP_BTN_ODL,MISC,Volume up signal,IN,both,--,Y,3.30 V,Button,F12,F12,F14,INPUT_PU,GPIO_VOLUME_UP_L,,
+VOLDN_BTN_ODL,MISC,Volume down signal,IN,both,--,Y,3.30 V,Button,F12,E11,G15,INPUT_PU,GPIO_VOLUME_DOWN_L,,
+VOLUP_BTN_ODL,MISC,Volume up signal,IN,both,--,Y,3.30 V,Button,E11,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,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,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,M2,F15,INPUT,,,
diff --git a/zephyr/projects/nissa/nivviks_generated.dts b/zephyr/projects/nissa/nivviks_generated.dts index a67062eb36..ad8d2de0d1 100644 --- a/zephyr/projects/nissa/nivviks_generated.dts +++ b/zephyr/projects/nissa/nivviks_generated.dts @@ -194,11 +194,11 @@ gpios = <&gpioe 3 GPIO_INPUT>; }; gpio_voldn_btn_odl: voldn_btn_odl { - gpios = <&gpio9 3 GPIO_INPUT_PULL_UP>; + gpios = <&gpioa 2 GPIO_INPUT_PULL_UP>; enum-name = "GPIO_VOLUME_DOWN_L"; }; gpio_volup_btn_odl: volup_btn_odl { - gpios = <&gpioa 2 GPIO_INPUT_PULL_UP>; + gpios = <&gpio9 3 GPIO_INPUT_PULL_UP>; enum-name = "GPIO_VOLUME_UP_L"; }; }; |