summaryrefslogtreecommitdiffstats
path: root/src/drivers/pc80
diff options
context:
space:
mode:
authorJonathon Hall <jonathon.hall@puri.sm>2023-07-14 15:32:28 -0400
committerFelix Held <felix-coreboot@felixheld.de>2023-10-02 16:22:23 +0000
commit89aee538a950a64b96a6470df07f04c08a05c450 (patch)
treea1c26d60ad674bf916b4f299dd99807d44670f39 /src/drivers/pc80
parent614568ec5876372e0acb0120e5f397074b0115c8 (diff)
downloadcoreboot-89aee538a950a64b96a6470df07f04c08a05c450.tar.gz
coreboot-89aee538a950a64b96a6470df07f04c08a05c450.tar.bz2
coreboot-89aee538a950a64b96a6470df07f04c08a05c450.zip
drivers/pc80/pc: Split up PS/2 keyboard/mouse ACPI definitions
Separate these so a mainboard can describe a PS/2 keyboard without a PS/2 mouse or vice-versa. Librem 11 has a PS/2 keyboard for the volume keys, but does not have a PS/2 mouse, and the presence of a mouse device can cause the cursor to appear on the desktop incorrectly. ps2_controller.asl remains since many boards include it, it now just includes the two new files. Change-Id: I13a4c2caf8dc9e5004b775dc0a9ac2488e39f184 Signed-off-by: Jonathon Hall <jonathon.hall@puri.sm> Reviewed-on: https://review.coreboot.org/c/coreboot/+/78096 Reviewed-by: Matt DeVillier <matt.devillier@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/drivers/pc80')
-rw-r--r--src/drivers/pc80/pc/ps2_controller.asl34
-rw-r--r--src/drivers/pc80/pc/ps2_keyboard.asl18
-rw-r--r--src/drivers/pc80/pc/ps2_mouse.asl15
3 files changed, 35 insertions, 32 deletions
diff --git a/src/drivers/pc80/pc/ps2_controller.asl b/src/drivers/pc80/pc/ps2_controller.asl
index 48ddeb4a5c8a..28e337073e08 100644
--- a/src/drivers/pc80/pc/ps2_controller.asl
+++ b/src/drivers/pc80/pc/ps2_controller.asl
@@ -1,33 +1,3 @@
/* SPDX-License-Identifier: GPL-2.0-only */
- Device (PS2K) // Keyboard
- {
- Name(_HID, EISAID(CONFIG_PS2K_EISAID))
- Name(_CID, EISAID("PNP030B"))
-
- Name(_CRS, ResourceTemplate()
- {
- IO (Decode16, 0x60, 0x60, 0x01, 0x01)
- IO (Decode16, 0x64, 0x64, 0x01, 0x01)
- IRQ (Edge, ActiveHigh, Exclusive) { 0x01 } // IRQ 1
- })
-
- Method (_STA, 0)
- {
- Return (0xf)
- }
- }
-
- Device (PS2M) // Mouse
- {
- Name(_HID, EISAID(CONFIG_PS2M_EISAID))
- Name(_CID, EISAID("PNP0F13"))
- Name(_CRS, ResourceTemplate()
- {
- IRQ (Edge, ActiveHigh, Exclusive) { 0x0c } // IRQ 12
- })
-
- Method(_STA, 0)
- {
- Return (0xf)
- }
- }
+#include "ps2_keyboard.asl"
+#include "ps2_mouse.asl"
diff --git a/src/drivers/pc80/pc/ps2_keyboard.asl b/src/drivers/pc80/pc/ps2_keyboard.asl
new file mode 100644
index 000000000000..b3d5efada339
--- /dev/null
+++ b/src/drivers/pc80/pc/ps2_keyboard.asl
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+ Device (PS2K) // Keyboard
+ {
+ Name(_HID, EISAID(CONFIG_PS2K_EISAID))
+ Name(_CID, EISAID("PNP030B"))
+
+ Name(_CRS, ResourceTemplate()
+ {
+ IO (Decode16, 0x60, 0x60, 0x01, 0x01)
+ IO (Decode16, 0x64, 0x64, 0x01, 0x01)
+ IRQ (Edge, ActiveHigh, Exclusive) { 0x01 } // IRQ 1
+ })
+
+ Method (_STA, 0)
+ {
+ Return (0xf)
+ }
+ }
diff --git a/src/drivers/pc80/pc/ps2_mouse.asl b/src/drivers/pc80/pc/ps2_mouse.asl
new file mode 100644
index 000000000000..f9ac4159b2a6
--- /dev/null
+++ b/src/drivers/pc80/pc/ps2_mouse.asl
@@ -0,0 +1,15 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+ Device (PS2M) // Mouse
+ {
+ Name(_HID, EISAID(CONFIG_PS2M_EISAID))
+ Name(_CID, EISAID("PNP0F13"))
+ Name(_CRS, ResourceTemplate()
+ {
+ IRQ (Edge, ActiveHigh, Exclusive) { 0x0c } // IRQ 12
+ })
+
+ Method(_STA, 0)
+ {
+ Return (0xf)
+ }
+ }