From c40d690b781fc1fb91f9c1029e6d9f6f039b6907 Mon Sep 17 00:00:00 2001 From: Daniel Kurtz Date: Fri, 12 Jan 2018 12:22:25 -0800 Subject: google/kahlee/grunt: Add grunt touchpad ASL Grunt and Kahlee touchpads are on different i2c busses; I2CC and I2CD, respectively. Since grunt is the 'baseboard', put its configuration under baseboard, and include it from the grunt variant. BUG=b:71820409 TEST=Boot grunt to kernel, use evtest to test trackpad. TEST=Boot kahlee to kernel, use evtest to test trackpad. Change-Id: I1aeacf9a840342e73c1e219a825b39a124b4dd57 Signed-off-by: Daniel Kurtz Reviewed-on: https://review.coreboot.org/23232 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- .../baseboard/include/baseboard/acpi/mainboard.asl | 24 -------------- .../baseboard/include/baseboard/acpi/touchpad.asl | 38 ++++++++++++++++++++++ .../grunt/include/variant/acpi/mainboard.asl | 1 + .../kahlee/include/variant/acpi/mainboard.asl | 1 + .../kahlee/include/variant/acpi/touchpad.asl | 38 ++++++++++++++++++++++ 5 files changed, 78 insertions(+), 24 deletions(-) create mode 100644 src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/touchpad.asl create mode 100644 src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/touchpad.asl (limited to 'src') diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/mainboard.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/mainboard.asl index 242eb92e6b..8bee63af58 100644 --- a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/mainboard.asl +++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/mainboard.asl @@ -31,27 +31,3 @@ Name (HPBA, 0xFED00000) Name (OSVR, 3) /* WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name (OSV, Ones) /* Assume nothing */ Name (PMOD, One) /* Assume APIC */ - -Device (ETPA) -{ - Name (_HID, "ELAN0000") - Name (_DDN, "Elan Touchpad") - Name (_UID, 1) - Name (ISTP, 1) /* Touchpad */ - - Name (_CRS, ResourceTemplate() - { - I2cSerialBus ( - 0x15, /* SlaveAddress */ - ControllerInitiated, /* SlaveMode */ - 400000, /* ConnectionSpeed */ - AddressingMode7Bit, /* AddressingMode */ - "\\_SB.I2CD", /* ResourceSource */ - ) - GpioInt (Level, ActiveLow, ExclusiveAndWake, PullNone,, - "\\_SB.GPIO") { 0x5 } - }) - - /* Allow device to power off in S0 */ - Name (_S0W, 3) -} diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/touchpad.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/touchpad.asl new file mode 100644 index 0000000000..11ec26fab2 --- /dev/null +++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/touchpad.asl @@ -0,0 +1,38 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2018 Google Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +Device (ETPA) +{ + Name (_HID, "ELAN0000") + Name (_DDN, "Elan Touchpad") + Name (_UID, 1) + Name (ISTP, 1) /* Touchpad */ + + Name (_CRS, ResourceTemplate() + { + I2cSerialBus ( + 0x15, /* SlaveAddress */ + ControllerInitiated, /* SlaveMode */ + 400000, /* ConnectionSpeed */ + AddressingMode7Bit, /* AddressingMode */ + "\\_SB.I2CC", /* ResourceSource */ + ) + GpioInt (Level, ActiveLow, ExclusiveAndWake, PullNone,, + "\\_SB.GPIO") { 0x5 } + }) + + /* Allow device to power off in S0 */ + Name (_S0W, 3) +} diff --git a/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/mainboard.asl b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/mainboard.asl index 4f91d72822..900a83888d 100644 --- a/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/mainboard.asl +++ b/src/mainboard/google/kahlee/variants/grunt/include/variant/acpi/mainboard.asl @@ -15,3 +15,4 @@ #include #include +#include diff --git a/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/mainboard.asl b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/mainboard.asl index ab1fa7a080..159f935c62 100644 --- a/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/mainboard.asl +++ b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/mainboard.asl @@ -15,3 +15,4 @@ #include #include +#include diff --git a/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/touchpad.asl b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/touchpad.asl new file mode 100644 index 0000000000..2babaf292c --- /dev/null +++ b/src/mainboard/google/kahlee/variants/kahlee/include/variant/acpi/touchpad.asl @@ -0,0 +1,38 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2018 Google Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +Device (ETPA) +{ + Name (_HID, "ELAN0000") + Name (_DDN, "Elan Touchpad") + Name (_UID, 1) + Name (ISTP, 1) /* Touchpad */ + + Name (_CRS, ResourceTemplate() + { + I2cSerialBus ( + 0x15, /* SlaveAddress */ + ControllerInitiated, /* SlaveMode */ + 400000, /* ConnectionSpeed */ + AddressingMode7Bit, /* AddressingMode */ + "\\_SB.I2CD", /* ResourceSource */ + ) + GpioInt (Level, ActiveLow, ExclusiveAndWake, PullNone,, + "\\_SB.GPIO") { 0x5 } + }) + + /* Allow device to power off in S0 */ + Name (_S0W, 3) +} -- cgit v1.2.3