Merge pull request #22 from pop-os/touchpad

Update the way touchpad and airplane mode is handled

debian/system76-dkms.install

@@ -1 +1,2 @@
+lib/udev/hwdb.d
 usr/share/initramfs-tools

lib/udev/hwdb.d/99-system76-dkms.hwdb

@@ -0,0 +1,3 @@
+evdev:atkbd:dmi:bvn*:bvr*:bd*:svnSystem76*:pn*
+ KEYBOARD_KEY_f7=f21
+ KEYBOARD_KEY_f8=f21

system76.c

@@ -58,6 +58,38 @@
 /* method IDs for S76_GET */
 #define GET_EVENT               0x01  /*   1 */
 
+struct s76_driver_data {
+	bool ap_led;
+	bool input;
+	bool kb_led;
+};
+
+static struct s76_driver_data driver_data_white_kb = {
+	.ap_led = true,
+	.input = true,
+	.kb_led = false,
+};
+
+static struct s76_driver_data driver_data_white_kb_hid = {
+	.ap_led = true,
+	.input = false,
+	.kb_led = false,
+};
+
+static struct s76_driver_data driver_data_color_kb = {
+	.ap_led = true,
+	.input = true,
+	.kb_led = true,
+};
+
+static struct s76_driver_data driver_data_color_kb_hid = {
+	.ap_led = true,
+	.input = false,
+	.kb_led = true,
+};
+
+static struct s76_driver_data *driver_data = NULL;
+
 struct platform_device *s76_platform_device;
 
 static int s76_wmbb(u32 method_id, u32 arg, u32 *retval) {
@@ -113,13 +145,19 @@ static void s76_wmi_notify(u32 value, void *context) {
 
 	switch (event) {
 	case 0x81:
-		kb_wmi_dec();
+		if (driver_data->kb_led) {
+			kb_wmi_dec();
+		}
 		break;
 	case 0x82:
-		kb_wmi_inc();
+		if (driver_data->kb_led) {
+			kb_wmi_inc();
+		}
 		break;
 	case 0x83:
-		kb_wmi_color();
+		if (driver_data->kb_led) {
+			kb_wmi_color();
+		}
 		break;
 	case 0x7b:
 		//TODO: Fn+Backspace
@@ -128,16 +166,20 @@ static void s76_wmi_notify(u32 value, void *context) {
 		//TODO: Fn+ESC
 		break;
 	case 0x9F:
-		kb_wmi_toggle();
+		if (driver_data->kb_led) {
+			kb_wmi_toggle();
+		}
 		break;
 	case 0xF4:
-		s76_input_airplane_wmi();
+		if (driver_data->input) {
+			s76_input_airplane_wmi();
+		}
 		break;
 	case 0xFC:
-		s76_input_touchpad_wmi(false);
+		// Touchpad WMI (disable)
 		break;
 	case 0xFD:
-		s76_input_touchpad_wmi(true);
+		// Touchpad WMI (enable)
 		break;
 	default:
 		S76_DEBUG("Unknown WMI event code (%x)\n", event);
@@ -148,19 +190,25 @@ static void s76_wmi_notify(u32 value, void *context) {
 static int s76_probe(struct platform_device *dev) {
 	int err;
 
-	err = ap_led_init(&dev->dev);
+	if (driver_data->ap_led) {
-	if (unlikely(err)) {
+		err = ap_led_init(&dev->dev);
-		S76_ERROR("Could not register LED device\n");
+		if (unlikely(err)) {
+			S76_ERROR("Could not register LED device\n");
+		}
 	}
 
-	err = kb_led_init(&dev->dev);
+	if (driver_data->kb_led) {
-	if (unlikely(err)) {
+		err = kb_led_init(&dev->dev);
-		S76_ERROR("Could not register LED device\n");
+		if (unlikely(err)) {
+			S76_ERROR("Could not register LED device\n");
+		}
 	}
 
-	err = s76_input_init(&dev->dev);
+	if (driver_data->input) {
-	if (unlikely(err)) {
+		err = s76_input_init(&dev->dev);
-		S76_ERROR("Could not register input device\n");
+		if (unlikely(err)) {
+			S76_ERROR("Could not register input device\n");
+		}
 	}
 
 #ifdef S76_HAS_HWMON
@@ -196,9 +244,15 @@ static int s76_remove(struct platform_device *dev) {
 	#ifdef S76_HAS_HWMON
 		s76_hwmon_fini(&dev->dev);
 	#endif
-	s76_input_exit();
+	if (driver_data->input) {
-	kb_led_exit();
+		s76_input_exit();
-	ap_led_exit();
+	}
+	if (driver_data->kb_led) {
+		kb_led_exit();
+	}
+	if (driver_data->ap_led) {
+		ap_led_exit();
+	}
 
 	return 0;
 }
@@ -206,7 +260,9 @@ static int s76_remove(struct platform_device *dev) {
 static int s76_suspend(struct platform_device *dev, pm_message_t status) {
 	S76_DEBUG("s76_suspend\n");
 
-	kb_led_suspend();
+	if (driver_data->kb_led) {
+		kb_led_suspend();
+	}
 
 	return 0;
 }
@@ -216,8 +272,12 @@ static int s76_resume(struct platform_device *dev) {
 
 	msleep(2000);
 
-	ap_led_resume();
+	if (driver_data->ap_led) {
-	kb_led_resume();
+		ap_led_resume();
+	}
+	if (driver_data->kb_led) {
+		kb_led_resume();
+	}
 
 	// Enable hotkey support
 	s76_wmbb(0x46, 0, NULL);
@@ -242,12 +302,12 @@ static struct platform_driver s76_platform_driver = {
 
 static int __init s76_dmi_matched(const struct dmi_system_id *id) {
 	S76_INFO("Model %s found\n", id->ident);
-
+	driver_data = id->driver_data;
 	return 1;
 }
 
 // Devices that did launch with DKMS support but have been updated with it
-#define DMI_TABLE_LEGACY(PRODUCT) { \
+#define DMI_TABLE_LEGACY(PRODUCT, DATA) { \
 	.ident = "System76 " PRODUCT, \
 	.matches = { \
 		DMI_MATCH(DMI_SYS_VENDOR, "System76"), \
@@ -259,31 +319,31 @@ static int __init s76_dmi_matched(const struct dmi_system_id *id) {
 }
 
 // Devices that launched with DKMS support
-#define DMI_TABLE(PRODUCT) { \
+#define DMI_TABLE(PRODUCT, DATA) { \
 	.ident = "System76 " PRODUCT, \
 	.matches = { \
 		DMI_MATCH(DMI_SYS_VENDOR, "System76"), \
 		DMI_MATCH(DMI_PRODUCT_VERSION, PRODUCT), \
 	}, \
 	.callback = s76_dmi_matched, \
-	.driver_data = NULL, \
+	.driver_data = &driver_data_ ## DATA, \
 }
 
 static struct dmi_system_id s76_dmi_table[] __initdata = {
-	DMI_TABLE_LEGACY("bonw13"),
+	DMI_TABLE_LEGACY("bonw13", color_kb),
-	DMI_TABLE_LEGACY("galp2"),
+	DMI_TABLE_LEGACY("galp2", white_kb),
-	DMI_TABLE_LEGACY("galp3"),
+	DMI_TABLE_LEGACY("galp3", white_kb),
-	DMI_TABLE_LEGACY("serw11"),
+	DMI_TABLE_LEGACY("serw11", color_kb),
-	DMI_TABLE("darp5"),
+	DMI_TABLE("darp5", white_kb_hid),
-	DMI_TABLE("galp3-b"),
+	DMI_TABLE("galp3-b", white_kb),
-	DMI_TABLE("galp3-c"),
+	DMI_TABLE("galp3-c", white_kb_hid),
-	DMI_TABLE("gaze13"),
+	DMI_TABLE("gaze13", white_kb),
-	DMI_TABLE("kudu5"),
+	DMI_TABLE("kudu5", white_kb),
-	DMI_TABLE("oryp3-jeremy"),
+	DMI_TABLE("oryp3-jeremy", color_kb),
-	DMI_TABLE("oryp4"),
+	DMI_TABLE("oryp4", color_kb),
-	DMI_TABLE("oryp4-b"),
+	DMI_TABLE("oryp4-b", color_kb),
-	DMI_TABLE("oryp5"),
+	DMI_TABLE("oryp5", color_kb_hid),
-	DMI_TABLE("serw11-b"),
+	DMI_TABLE("serw11-b", color_kb),
 	{}
 };
 
@@ -295,6 +355,11 @@ static int __init s76_init(void) {
 		return -ENODEV;
 	}
 
+	if (!driver_data) {
+		S76_INFO("Driver data not defined");
+		return -ENODEV;
+	}
+
 	if (!wmi_has_guid(S76_EVENT_GUID)) {
 		S76_INFO("No known WMI event notification GUID found\n");
 		return -ENODEV;

system76_input.c

@@ -20,8 +20,6 @@
  */
 
 #define AIRPLANE_KEY KEY_WLAN
-#define TOUCHPAD_ON_KEY KEY_F21
-#define TOUCHPAD_OFF_KEY KEY_F21
 
 static struct input_dev *s76_input_device;
 static DEFINE_MUTEX(s76_input_report_mutex);
@@ -107,16 +105,6 @@ static void s76_input_airplane_wmi(void) {
 	s76_input_key(AIRPLANE_KEY);
 }
 
-static void s76_input_touchpad_wmi(bool enabled) {
-	S76_DEBUG("Touchpad Hotkey pressed (WMI) %d\n", enabled);
-
-	if (enabled) {
-		s76_input_key(TOUCHPAD_ON_KEY);
-	} else {
-		s76_input_key(TOUCHPAD_OFF_KEY);
-	}
-}
-
 static int s76_input_open(struct input_dev *dev) {
 	s76_input_polling_task = kthread_run(
 		s76_input_polling_thread,
@@ -156,8 +144,6 @@ static int __init s76_input_init(struct device *dev) {
 	s76_input_device->dev.parent = dev;
 	set_bit(EV_KEY, s76_input_device->evbit);
 	set_bit(AIRPLANE_KEY, s76_input_device->keybit);
-	set_bit(TOUCHPAD_ON_KEY, s76_input_device->keybit);
-	set_bit(TOUCHPAD_OFF_KEY, s76_input_device->keybit);
 
 	s76_input_device->open  = s76_input_open;
 	s76_input_device->close = s76_input_close;