Add device detecton for the ACPI accelerometer interface on Pegatron Lucid tablets. Signed-off-by: Andy Ross <andy.ross@xxxxxxxxxxxxx> --- drivers/platform/x86/asus-laptop.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c index d235f44..6ee7eca 100644 --- a/drivers/platform/x86/asus-laptop.c +++ b/drivers/platform/x86/asus-laptop.c @@ -4,6 +4,7 @@ * * Copyright (C) 2002-2005 Julien Lerouge, 2003-2006 Karol Kozimor * Copyright (C) 2006-2007 Corentin Chary + * Copyright (C) 2011 Wind River Systems * * 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 @@ -31,6 +32,7 @@ * Josh Green - Light Sens support * Thomas Tuttle - His first patch for led support was very helpfull * Sam Lin - GPS support + * Andy Ross - Pegatron Lucid accelerometer */ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt @@ -246,6 +248,7 @@ struct asus_laptop { int wireless_status; bool have_rsts; + bool have_pega_accel; int lcd_state; struct rfkill *gps_rfkill; @@ -1352,6 +1355,7 @@ static const struct attribute_group asus_attr_group = { .attrs = asus_attributes, }; + static int asus_platform_init(struct asus_laptop *asus) { int result; @@ -1556,6 +1560,29 @@ static int __devinit asus_acpi_init(struct asus_laptop *asus) return result; } +static void pega_accel_noop_release(struct device *d) { } + +static struct platform_device pega_accel_dev = { + .name = "pega_accel", + .id = -1, + .dev = { + .release = pega_accel_noop_release, + }, +}; + +static void __devinit asus_pega_accel_init(struct asus_laptop *asus) +{ + /* Pegatron Lucid tablets expose their accelerometer through ACPI. + * Check for XLR{X,Y,Z} methods */ + if (acpi_check_handle(asus->handle, "XLRX", NULL) || + acpi_check_handle(asus->handle, "XLRY", NULL) || + acpi_check_handle(asus->handle, "XLRZ", NULL)) + return; + + if (!platform_device_register(&pega_accel_dev)) + asus->have_pega_accel = true; +} + static bool asus_device_present; static int __devinit asus_acpi_add(struct acpi_device *device) @@ -1605,6 +1632,8 @@ static int __devinit asus_acpi_add(struct acpi_device *device) if (result) goto fail_rfkill; + asus_pega_accel_init(asus); + asus_device_present = true; return 0; @@ -1627,6 +1656,9 @@ static int asus_acpi_remove(struct acpi_device *device, int type) { struct asus_laptop *asus = acpi_driver_data(device); + if (asus->have_pega_accel) + platform_device_unregister(&pega_accel_dev); + asus_backlight_exit(asus); asus_rfkill_exit(asus); asus_led_exit(asus); -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html