diff options
| author | Jun Lin <CHLin56@nuvoton.com> | 2022-09-28 13:39:30 +0800 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-10-04 18:20:57 +0000 |
| commit | 582fe20f727caa7aa5083cb1f35e9ac936b00485 (patch) | |
| tree | 7cbe26eed17e170fdb0be4f5b49cadcf7e1f3b93 | |
| parent | 4ade7e9939ef73141413eee2cd5fd068cda58dbf (diff) | |
| download | chrome-ec-582fe20f727caa7aa5083cb1f35e9ac936b00485.tar.gz | |
zephyr: kscan: npcx: remove register define and delete kscan node
The register definition and devicetree node of the keyboard scan module
are added to the upstream. This CL removes the duplicate register
definition to avoid a compiler error: redefinition of 'struct kbs_reg'
Also, add "/delete-node/ kscan@400a3000" to arm/board/*/npcx*.dtsi to
suppress the compiler warning: soc/kscan@400a3000: duplicate
unit-address (also used in node /soc/cros-kb-raw@400a3000).
This CL has dependency on PR:
https://github.com/zephyrproject-rtos/zephyr/pull/50457
BUG=none
BRANCH=none
TEST=With PR:50457 and this CL, zmake npcx9/nivviks/steelix/skyrim,
there is no compiler error or warning related to kscan.
Cq-Depend: chromium:3932808
Signed-off-by: Jun Lin <CHLin56@nuvoton.com>
Change-Id: I259ef6b2d1119dcb67a20292d21f20bfc12aca1c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3924929
Commit-Queue: Yuval Peress <peress@google.com>
Tested-by: Yuval Peress <peress@google.com>
Code-Coverage: Yuval Peress <peress@google.com>
Reviewed-by: Yuval Peress <peress@google.com>
Reviewed-by: Fabio Baltieri <fabiobaltieri@google.com>
| -rw-r--r-- | zephyr/boards/arm/npcx7/npcx7.dts | 5 | ||||
| -rw-r--r-- | zephyr/boards/arm/npcx9/npcx9.dtsi | 5 | ||||
| -rw-r--r-- | zephyr/boards/arm/npcx_evb/npcx_evb.dtsi | 5 | ||||
| -rw-r--r-- | zephyr/include/soc/nuvoton_npcx/reg_def_cros.h | 44 |
4 files changed, 15 insertions, 44 deletions
diff --git a/zephyr/boards/arm/npcx7/npcx7.dts b/zephyr/boards/arm/npcx7/npcx7.dts index 99e152c260..c1e548c62b 100644 --- a/zephyr/boards/arm/npcx7/npcx7.dts +++ b/zephyr/boards/arm/npcx7/npcx7.dts @@ -38,6 +38,11 @@ named-adc-channels { compatible = "named-adc-channels"; }; + + /* Override keyboard scanning */ + soc { + /delete-node/ kscan@400a3000; + }; }; &uart1 { diff --git a/zephyr/boards/arm/npcx9/npcx9.dtsi b/zephyr/boards/arm/npcx9/npcx9.dtsi index d253928dea..15547d5802 100644 --- a/zephyr/boards/arm/npcx9/npcx9.dtsi +++ b/zephyr/boards/arm/npcx9/npcx9.dtsi @@ -33,6 +33,11 @@ named-adc-channels { compatible = "named-adc-channels"; }; + + /* Override keyboard scanning */ + soc { + /delete-node/ kscan@400a3000; + }; }; &uart1 { diff --git a/zephyr/boards/arm/npcx_evb/npcx_evb.dtsi b/zephyr/boards/arm/npcx_evb/npcx_evb.dtsi index 615df09a64..5debb86381 100644 --- a/zephyr/boards/arm/npcx_evb/npcx_evb.dtsi +++ b/zephyr/boards/arm/npcx_evb/npcx_evb.dtsi @@ -66,6 +66,11 @@ io-channels = <&adc0 4>; }; }; + + /* Override keyboard scanning */ + soc { + /delete-node/ kscan@400a3000; + }; }; &i2c0_0 { diff --git a/zephyr/include/soc/nuvoton_npcx/reg_def_cros.h b/zephyr/include/soc/nuvoton_npcx/reg_def_cros.h index 180c2e50a3..7d8fda4811 100644 --- a/zephyr/include/soc/nuvoton_npcx/reg_def_cros.h +++ b/zephyr/include/soc/nuvoton_npcx/reg_def_cros.h @@ -13,50 +13,6 @@ #define _NUVOTON_NPCX_REG_DEF_CROS_H /* - * KBS (Keyboard Scan) device registers - */ -struct kbs_reg { - volatile uint8_t reserved1[4]; - /* 0x004: Keyboard Scan In */ - volatile uint8_t KBSIN; - /* 0x005: Keyboard Scan In Pull-Up Enable */ - volatile uint8_t KBSINPU; - /* 0x006: Keyboard Scan Out 0 */ - volatile uint16_t KBSOUT0; - /* 0x008: Keyboard Scan Out 1 */ - volatile uint16_t KBSOUT1; - /* 0x00A: Keyboard Scan Buffer Index */ - volatile uint8_t KBS_BUF_INDX; - /* 0x00B: Keyboard Scan Buffer Data */ - volatile uint8_t KBS_BUF_DATA; - /* 0x00C: Keyboard Scan Event */ - volatile uint8_t KBSEVT; - /* 0x00D: Keyboard Scan Control */ - volatile uint8_t KBSCTL; - /* 0x00E: Keyboard Scan Configuration Index */ - volatile uint8_t KBS_CFG_INDX; - /* 0x00F: Keyboard Scan Configuration Data */ - volatile uint8_t KBS_CFG_DATA; -}; - -/* KBS register fields */ -#define NPCX_KBSBUFINDX 0 -#define NPCX_KBSEVT_KBSDONE 0 -#define NPCX_KBSEVT_KBSERR 1 -#define NPCX_KBSCTL_START 0 -#define NPCX_KBSCTL_KBSMODE 1 -#define NPCX_KBSCTL_KBSIEN 2 -#define NPCX_KBSCTL_KBSINC 3 -#define NPCX_KBSCTL_KBHDRV_FIELD FIELD(6, 2) -#define NPCX_KBSCFGINDX 0 -/* Index of 'Automatic Scan' configuration register */ -#define KBS_CFG_INDX_DLY1 0 /* Keyboard Scan Delay T1 Byte */ -#define KBS_CFG_INDX_DLY2 1 /* Keyboard Scan Delay T2 Byte */ -#define KBS_CFG_INDX_RTYTO 2 /* Keyboard Scan Retry Timeout */ -#define KBS_CFG_INDX_CNUM 3 /* Keyboard Scan Columns Number */ -#define KBS_CFG_INDX_CDIV 4 /* Keyboard Scan Clock Divisor */ - -/* * Monotonic Counter (MTC) device registers */ struct mtc_reg { |