Fujitsu tablet pc extras driver

+/*** HELPER *******************************************************************/

+static int fujitsu_busywait(void)

drivers/platform/x86/fujitsu-tablet.c line 36

Quoted 2 lines · Robert Gerlach

drivers/platform/x86/fujitsu-tablet.c new file +2 -0

+#define INTERRUPT 5
+#define IO_BASE 0xfd70

You're binding to an ACPI device here - does it have a _CRS method? If so, you should retrieve the resource information from acpipnp rather than hardcoding it. That'll involve reworking it as an acpi driver rather than a platform one, but that should be easy enough.

Quoted 1 line

+/*** HELPER *******************************************************************/

Does checkpatch really not complain about that? I don't think it's a terribly helpful comment in any case :)

Quoted 1 line

+static int fujitsu_busywait(void)

You're sleeping, so it's not really a busywait...

drivers/platform/x86/fujitsu-tablet.c line 299

Quoted 6 lines

drivers/platform/x86/fujitsu-tablet.c new file +6 -0

+static void fujitsu_reset(void)
+{
+	fujitsu_ack();
+	if (fujitsu_busywait())
+		printk(KERN_WARNING MODULENAME ": timeout, real reset needed!\n");
+}

We have no idea how to do a "real" reset, I guess?

drivers/platform/x86/fujitsu-tablet.c line 321

Quoted 2 lines

drivers/platform/x86/fujitsu-tablet.c new file +2 -0

+	error = request_irq(INTERRUPT, fujitsu_isr,
+			IRQF_SHARED, MODULENAME, fujitsu_isr);

Any risk of the irq firing between you doing setup and requesting the IRQ?

Other than the above, this looks fine from the driver point of view - Cc:ing Dmitry so he can have a quick look at the input side of things.

Signature · 1 line

Matthew Garrett | [email protected]

Quoted 4 lines · Matthew Garrett

You're binding to an ACPI device here - does it have a _CRS method? If so, you should retrieve the resource information from acpipnp rather than hardcoding it. That'll involve reworking it as an acpi driver rather than a platform one, but that should be easy enough.

Yes, it have a _CRS, but I removed the code because it is always the same IRQ and IO range. I'll reimplement with the first device it make it necessary.

This patch adds support for the tablet buttons und the "tablet mode" detection for many Fujitsu tablets and convertable notebooks.

Signed-off-by Robert Gerlach <[email protected]>

Reviewed-by Ryan H. Lewis <[email protected]>

drivers/platform/x86/fujitsu-tablet.c new file +7 -0

+	.keymap = {
+		KEY_RESERVED,
+		KEY_RESERVED,
+		KEY_RESERVED,
+		KEY_RESERVED,
+		KEY_SCROLLDOWN,
+		KEY_SCROLLUP,

drivers/platform/x86/fujitsu-tablet.c new file +83 -0

+
+/*** INPUT ********************************************************************/
+
+static int __devinit input_fujitsu_setup(struct device *dev)
+{
+	struct input_dev *idev;
+	int error;
+	int x;
+
+	idev = input_allocate_device();
+	if (!idev)
+		return -ENOMEM;
+
+	idev->dev.parent = dev;
+	idev->phys = KBUILD_MODNAME "/input0";
+	idev->name = "Fujitsu tablet buttons";
+	idev->id.bustype = BUS_HOST;
+	idev->id.vendor  = 0x1734;	/* Fujitsu Siemens Computer GmbH */
+	idev->id.product = 0x0001;
+	idev->id.version = 0x0101;
+
+	idev->keycode = fujitsu.config.keymap;
+	idev->keycodesize = sizeof(fujitsu.config.keymap[0]);
+	idev->keycodemax = ARRAY_SIZE(fujitsu.config.keymap);
+
+	__set_bit(EV_REP, idev->evbit);
+	__set_bit(EV_KEY, idev->evbit);
+
+	for (x = 0; x < ARRAY_SIZE(fujitsu.config.keymap); x++)
+		if (fujitsu.config.keymap[x])
+			__set_bit(fujitsu.config.keymap[x], idev->keybit);
+
+	__set_bit(EV_MSC, idev->evbit);
+	__set_bit(MSC_SCAN, idev->mscbit);
+
+	__set_bit(EV_SW, idev->evbit);
+	__set_bit(SW_TABLET_MODE, idev->swbit);
+
+	error = input_register_device(idev);
+	if (error) {
+		input_free_device(idev);
+		return error;
+	}
+
+	fujitsu.idev = idev;
+	return 0;
+}
+
+static void input_fujitsu_remove(void)
+{
+	if (fujitsu.idev)
+		input_unregister_device(fujitsu.idev);
+}
+
+static void fujitsu_report_orientation(void)
+{
+	struct input_dev *idev = fujitsu.idev;
+	int orientation = fujitsu_read_register(0xdd);
+
+	if (orientation & 0x02) {
+		orientation ^= fujitsu.config.invert_orientation_bit;
+		orientation &= 0x01;
+
+		if (orientation != fujitsu.orientation) {
+			input_report_switch(idev, SW_TABLET_MODE,
+					fujitsu.orientation = orientation);
+			input_sync(idev);
+		}
+	}
+}
+
+static void fujitsu_report_key(void)
+{
+	unsigned long keymask;
+	unsigned long changed;
+
+	keymask  = fujitsu_read_register(0xde);
+	keymask |= fujitsu_read_register(0xdf) << 8;
+	keymask ^= 0xffff;
+
+	changed = keymask ^ fujitsu.prev_keymask;
+
+	if (changed) {

drivers/platform/x86/fujitsu-tablet.c new file +89 -0

+		keycode = fujitsu.config.keymap[x];
+		pressed = !!(keymask & changed);
+
+		if (pressed)
+			input_event(fujitsu.idev, EV_MSC, MSC_SCAN, x);
+
+		input_report_key(fujitsu.idev, keycode, pressed);
+		input_sync(fujitsu.idev);
+	}
+}
+
+
+/*** INTERRUPT ****************************************************************/
+
+static irqreturn_t fujitsu_isr(int irq, void *dev_id)
+{
+	if (!(fujitsu_status() & 0x01))
+		return IRQ_NONE;
+
+	fujitsu_report_orientation();
+	fujitsu_report_key();
+	fujitsu_ack();
+
+	return IRQ_HANDLED;
+}
+
+
+/*** DEVICE *******************************************************************/
+
+static int fujitsu_busywait(void)
+{
+	int timeout_counter = 50;
+
+	while (fujitsu_status() & 0x02 && --timeout_counter)
+		msleep(20);
+
+	return !timeout_counter;
+}
+
+static void fujitsu_reset(void)
+{
+	fujitsu_ack();
+	if (fujitsu_busywait())
+		printk(KERN_WARNING MODULENAME ": timeout, real reset needed!\n");
+}
+
+static int __devinit fujitsu_probe(struct platform_device *pdev)
+{
+	int error;
+
+	error = input_fujitsu_setup(&pdev->dev);
+	if (error)
+		goto err_input;
+
+	if (!request_region(IO_BASE, 8, MODULENAME)) {
+		dev_err(&pdev->dev, "region 0x%04x busy\n", IO_BASE);
+		error = -EBUSY;
+		goto err_input;
+	}
+
+	fujitsu_reset();
+
+	fujitsu_report_orientation();
+	input_sync(fujitsu.idev);
+
+	error = request_irq(INTERRUPT, fujitsu_isr,
+			IRQF_SHARED, MODULENAME, fujitsu_isr);
+	if (error) {
+		dev_err(&pdev->dev, "unable to get irq %d\n", INTERRUPT);
+		goto err_io;
+	}
+
+	return 0;
+
+err_io:
+	release_region(IO_BASE, 8);
+err_input:
+	input_fujitsu_remove();
+	return error;
+}
+
+static int __devexit fujitsu_remove(struct platform_device *pdev)
+{
+	free_irq(INTERRUPT, fujitsu_isr);
+	release_region(IO_BASE, 8);
+	input_fujitsu_remove();
+	return 0;
+}
+

drivers/platform/x86/fujitsu-tablet.c new file +87 -0

+
+static struct platform_driver fujitsu_platform_driver = {
+	.driver		= {
+		.name	= MODULENAME,
+		.owner	= THIS_MODULE,
+	},
+	.probe		= fujitsu_probe,
+	.remove		= __devexit_p(fujitsu_remove),
+	.resume		= fujitsu_resume,
+};
+
+
+/*** DMI **********************************************************************/
+
+static int __init fujitsu_dmi_matched(const struct dmi_system_id *dmi)
+{
+	printk(KERN_INFO MODULENAME ": %s detected\n", dmi->ident);
+	memcpy(&fujitsu.config, dmi->driver_data,
+			sizeof(struct fujitsu_config));
+	return 1;
+}
+
+static struct dmi_system_id dmi_ids[] __initdata = {
+	{
+		.callback = fujitsu_dmi_matched,
+		.ident = "Fujitsu Siemens P/T Series",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK")
+		},
+		.driver_data = &config_Lifebook_Tseries
+	},
+	{
+		.callback = fujitsu_dmi_matched,
+		.ident = "Fujitsu Lifebook T Series",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook T")
+		},
+		.driver_data = &config_Lifebook_Tseries
+	},
+	{
+		.callback = fujitsu_dmi_matched,
+		.ident = "Fujitsu Siemens Stylistic T Series",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "Stylistic T")
+		},
+		.driver_data = &config_Stylistic_Tseries
+	},
+	{
+		.callback = fujitsu_dmi_matched,
+		.ident = "Fujitsu LifeBook U810",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook U810")
+		},
+		.driver_data = &config_Lifebook_U810
+	},
+	{
+		.callback = fujitsu_dmi_matched,
+		.ident = "Fujitsu Siemens Stylistic ST5xxx Series",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "STYLISTIC ST5")
+		},
+		.driver_data = &config_Stylistic_ST5xxx
+	},
+	{
+		.callback = fujitsu_dmi_matched,
+		.ident = "Fujitsu Siemens Stylistic ST5xxx Series",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "Stylistic ST5")
+		},
+		.driver_data = &config_Stylistic_ST5xxx
+	},
+	{
+		.callback = fujitsu_dmi_matched,
+		.ident = "Unknown (using defaults)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, ""),
+			DMI_MATCH(DMI_PRODUCT_NAME, "")
+		},
+		.driver_data = &config_Lifebook_Tseries
+	},
+	{ NULL }

drivers/platform/x86/fujitsu-tablet.c new file +20 -0

+
+	error = platform_driver_register(&fujitsu_platform_driver);
+	if (error)
+		return error;
+
+	fujitsu.pdev = platform_device_register_simple(MODULENAME, -1, NULL, 0);
+	if (IS_ERR(fujitsu.pdev)) {
+		error = PTR_ERR(fujitsu.pdev);
+		platform_driver_unregister(&fujitsu_platform_driver);
+		return error;
+	}
+
+	return 0;
+}
+
+static void __exit fujitsu_module_exit(void)
+{
+	platform_device_unregister(fujitsu.pdev);
+	platform_driver_unregister(&fujitsu_platform_driver);
+}