diff options
| author | Tom Rini <trini@konsulko.com> | 2021-08-19 14:58:00 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-08-30 14:13:28 -0400 |
| commit | b21f965bb055cd7eede411e489d886122c63d04a (patch) | |
| tree | 1642f9412291039e5b5d7aa0e63dea89fb88ba0e | |
| parent | 7ae1b0804d8837ecec14538f18903793d187f328 (diff) | |
| download | u-boot-b21f965bb055cd7eede411e489d886122c63d04a.tar.gz u-boot-b21f965bb055cd7eede411e489d886122c63d04a.tar.bz2 u-boot-b21f965bb055cd7eede411e489d886122c63d04a.zip | |
i8042: Do not abuse CONFIG namespace
This driver uses the CONFIG namespace to set the chips internal CONFIG
namespace related bits. However, CONFIG is reserved for the top-level
Kconfig based configuration system. Use CFG as the namespace here
instead to avoid pollution.
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| -rw-r--r-- | drivers/input/i8042.c | 4 | ||||
| -rw-r--r-- | include/i8042.h | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/input/i8042.c b/drivers/input/i8042.c index 565d99e7e5..d3743dc37f 100644 --- a/drivers/input/i8042.c +++ b/drivers/input/i8042.c @@ -150,8 +150,8 @@ static int kbd_reset(int quirk) else if ((quirk & QUIRK_DUP_POR) && config == KBD_POR) config = kbd_cmd_read(CMD_RD_CONFIG); - config |= CONFIG_AT_TRANS; - config &= ~(CONFIG_KIRQ_EN | CONFIG_MIRQ_EN); + config |= CFG_AT_TRANS; + config &= ~(CFG_KIRQ_EN | CFG_MIRQ_EN); if (kbd_cmd_write(CMD_WR_CONFIG, config)) goto err; diff --git a/include/i8042.h b/include/i8042.h index 8d69fa13bc..687632058c 100644 --- a/include/i8042.h +++ b/include/i8042.h @@ -20,12 +20,12 @@ #define STATUS_IBF (1 << 1) /* Configuration byte bit defines */ -#define CONFIG_KIRQ_EN (1 << 0) -#define CONFIG_MIRQ_EN (1 << 1) -#define CONFIG_SET_BIST (1 << 2) -#define CONFIG_KCLK_DIS (1 << 4) -#define CONFIG_MCLK_DIS (1 << 5) -#define CONFIG_AT_TRANS (1 << 6) +#define CFG_KIRQ_EN (1 << 0) +#define CFG_MIRQ_EN (1 << 1) +#define CFG_SET_BIST (1 << 2) +#define CFG_KCLK_DIS (1 << 4) +#define CFG_MCLK_DIS (1 << 5) +#define CFG_AT_TRANS (1 << 6) /* i8042 commands */ #define CMD_RD_CONFIG 0x20 /* read configuration byte */ |