mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 07:04:28 +00:00
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>
This commit is contained in:
parent
7ae1b0804d
commit
b21f965bb0
2 changed files with 8 additions and 8 deletions
|
@ -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;
|
||||
|
||||
|
|
|
@ -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 */
|
||||
|
|
Loading…
Reference in a new issue