Skip to content

Commit

Permalink
Input: i8042 - add LoongArch support in i8042-acpipnpio.h
Browse files Browse the repository at this point in the history
LoongArch uses ACPI and nearly the same as X86/IA64 for 8042. So modify
i8042-acpipnpio.h slightly and enable it for LoongArch in i8042.h. Then
i8042 driver can work well under the ACPI firmware with PNP typed key-
board and mouse configured in DSDT.

Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Link: https://lore.kernel.org/r/20220917064020.1639709-2-chenhuacai@loongson.cn
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Huacai Chen authored and Dmitry Torokhov committed Oct 10, 2022
1 parent 8761b9b commit fdd7c96
Showing 2 changed files with 7 additions and 1 deletion.
6 changes: 6 additions & 0 deletions drivers/input/serio/i8042-acpipnpio.h
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@
#ifndef _I8042_ACPIPNPIO_H
#define _I8042_ACPIPNPIO_H

#include <linux/acpi.h>

#ifdef CONFIG_X86
#include <asm/x86_init.h>
@@ -1453,9 +1454,14 @@ static int __init i8042_pnp_init(void)
return -ENODEV;
#else
pr_info("PNP: No PS/2 controller found.\n");
#if defined(__loongarch__)
if (acpi_disabled == 0)
return -ENODEV;
#else
if (x86_platform.legacy.i8042 !=
X86_LEGACY_I8042_EXPECTED_PRESENT)
return -ENODEV;
#endif
pr_info("Probing ports directly.\n");
return 0;
#endif
2 changes: 1 addition & 1 deletion drivers/input/serio/i8042.h
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
#include "i8042-snirm.h"
#elif defined(CONFIG_SPARC)
#include "i8042-sparcio.h"
#elif defined(CONFIG_X86) || defined(CONFIG_IA64)
#elif defined(CONFIG_X86) || defined(CONFIG_IA64) || defined(CONFIG_LOONGARCH)
#include "i8042-acpipnpio.h"
#else
#include "i8042-io.h"

0 comments on commit fdd7c96

Please sign in to comment.