nybble
/
system76-dkms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10 from pop-os/fix-matches 

Fix matching of DMI
This commit is contained in:
Jeremy Soller 2018-09-07 14:14:30 -06:00 committed by GitHub
parent c523cdb570 2b4bb890cb
commit 93caafa56a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
system76-dkms (1.0.0) bionic; urgency=medium
* 1.0.0 release
-- Jeremy Soller <jeremy@system76.com> Tue, 04 Sep 2018 10:23:09 -0600
system76-dkms (0.0.3) bionic; urgency=medium system76-dkms (0.0.3) bionic; urgency=medium
* Add oryp4-b * Add oryp4-b

31
system76.c
View File

@ -216,11 +216,16 @@ static int s76_resume(struct platform_device *dev) {
msleep(2000); msleep(2000);
ap_led_resume();
kb_led_resume();
// Enable hotkey support // Enable hotkey support
s76_wmbb(0x46, 0, NULL); s76_wmbb(0x46, 0, NULL);
ap_led_resume(); // Enable touchpad lock
kb_led_resume(); i8042_lock_chip();
i8042_command(NULL, 0x97);
i8042_unlock_chip();
return 0; return 0;
} }
@ -241,6 +246,19 @@ static int __init s76_dmi_matched(const struct dmi_system_id *id) {
return 1; return 1;
} }
// Devices that did launch with DKMS support but have been updated with it
#define DMI_TABLE_LEGACY(PRODUCT) { \
.ident = "System76 " PRODUCT, \
.matches = { \
DMI_MATCH(DMI_SYS_VENDOR, "System76"), \
DMI_MATCH(DMI_PRODUCT_VERSION, PRODUCT), \
DMI_MATCH(DMI_BIOS_VENDOR, "System76"), \
}, \
.callback = s76_dmi_matched, \
.driver_data = NULL, \
}
// Devices that launched with DKMS support
#define DMI_TABLE(PRODUCT) { \ #define DMI_TABLE(PRODUCT) { \
.ident = "System76 " PRODUCT, \ .ident = "System76 " PRODUCT, \
.matches = { \ .matches = { \
@ -252,6 +270,8 @@ static int __init s76_dmi_matched(const struct dmi_system_id *id) {
} }
static struct dmi_system_id s76_dmi_table[] __initdata = { static struct dmi_system_id s76_dmi_table[] __initdata = {
DMI_TABLE_LEGACY("galp2"),
DMI_TABLE_LEGACY("serw11"),
DMI_TABLE("galp3-b"), DMI_TABLE("galp3-b"),
DMI_TABLE("gaze13"), DMI_TABLE("gaze13"),
DMI_TABLE("kudu5"), DMI_TABLE("kudu5"),
@ -264,7 +284,10 @@ static struct dmi_system_id s76_dmi_table[] __initdata = {
MODULE_DEVICE_TABLE(dmi, s76_dmi_table); MODULE_DEVICE_TABLE(dmi, s76_dmi_table);
static int __init s76_init(void) { static int __init s76_init(void) {
dmi_check_system(s76_dmi_table); if (!dmi_check_system(s76_dmi_table)) {
S76_INFO("Model does not utilize this driver");
return -ENODEV;
}
if (!wmi_has_guid(S76_EVENT_GUID)) { if (!wmi_has_guid(S76_EVENT_GUID)) {
S76_INFO("No known WMI event notification GUID found\n"); S76_INFO("No known WMI event notification GUID found\n");
@ -297,4 +320,4 @@ module_exit(s76_exit);
MODULE_AUTHOR("Jeremy Soller <jeremy@system76.com>"); MODULE_AUTHOR("Jeremy Soller <jeremy@system76.com>");
MODULE_DESCRIPTION("System76 laptop driver"); MODULE_DESCRIPTION("System76 laptop driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION("0.0.3"); MODULE_VERSION("1.0.0");