Hi Marek,
於 一,2012-05-28 於 01:44 +0200,Marek Vasut 提到:
> This device is present on Iconia Tab W500.
>
> Signed-off-by: Marek Vasut <[email protected]>
> Cc: joeyli <[email protected]>
> ---
> drivers/platform/x86/acer-wmi.c | 110
> +++++++++++++++++++++++++++++++++++++++
> 1 file changed, 110 insertions(+)
>
> diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
> index c1a3fd8..2df0673 100644
> --- a/drivers/platform/x86/acer-wmi.c
> +++ b/drivers/platform/x86/acer-wmi.c
> @@ -95,6 +95,7 @@ MODULE_ALIAS("wmi:676AA15E-6A47-4D9F-A2CC-1E6D18D14026");
>
> enum acer_wmi_event_ids {
> WMID_HOTKEY_EVENT = 0x1,
> + WMID_ACCEL_EVENT = 0x5,
> };
>
> static const struct key_entry acer_wmi_keymap[] = {
> @@ -130,6 +131,7 @@ static const struct key_entry acer_wmi_keymap[] = {
> };
>
> static struct input_dev *acer_wmi_input_dev;
> +static struct input_dev *acer_wmi_accel_dev;
>
> struct event_return_value {
> u8 function;
> @@ -145,6 +147,7 @@ struct event_return_value {
> #define ACER_WMID3_GDS_THREEG (1<<6) /* 3G */
> #define ACER_WMID3_GDS_WIMAX (1<<7) /* WiMAX */
> #define ACER_WMID3_GDS_BLUETOOTH (1<<11) /* BT */
> +#define ACER_WMID3_GDS_ACCEL (1<<2) /* Accelerometer */
>
Please kindly share your dmidecode information:
# dmidecode > dmidecode.log
How did you know '1<<2' reflects to G-sensor? As I know this is a
reserved bit did not use before.
> struct lm_input_params {
> u8 function_num; /* Function Number */
> @@ -200,6 +203,7 @@ struct hotkey_function_type_aa {
> #define ACER_CAP_BLUETOOTH (1<<2)
> #define ACER_CAP_BRIGHTNESS (1<<3)
> #define ACER_CAP_THREEG (1<<4)
> +#define ACER_CAP_ACCEL (1<<5)
> #define ACER_CAP_ANY (0xFFFFFFFF)
>
> /*
> @@ -1150,6 +1154,8 @@ static void type_aa_dmi_decode(const struct dmi_header
> *header, void *dummy)
> interface->capability |= ACER_CAP_THREEG;
> if (type_aa->commun_func_bitmap & ACER_WMID3_GDS_BLUETOOTH)
> interface->capability |= ACER_CAP_BLUETOOTH;
> + if (type_aa->others_func_bitmap & ACER_WMID3_GDS_ACCEL)
> + interface->capability |= ACER_CAP_ACCEL;
>
> commun_fn_key_number = type_aa->commun_fn_key_number;
> }
> @@ -1375,6 +1381,61 @@ static void acer_backlight_exit(void)
> }
>
> /*
> + * Accelerometer device
> + */
> +#define ACER_GSENSOR_HANDLE "\\_SB.PCI0.LPC0.SENR"
> +#define ACER_GSENSOR_INIT "\\_SB.PCI0.LPC0.SENR._INI"
> +#define ACER_GSENSOR_RDVL "\\_SB.PCI0.LPC0.SENR.RDVL"
I think that will be better don't hard code the path of device in
driver, because different models have different path naming.
IMHO, please reference thinkpad_acpi driver like the following:
vi drivers/platform/x86/thinkpad_acpi.c
#define TPACPI_ACPI_EC_HID "PNP0C09"
...
static acpi_handle ec_handle;
...
static int __init probe_for_thinkpad(void)
{
...
/* The EC handler is required */
tpacpi_acpi_handle_locate("ec", TPACPI_ACPI_EC_HID, &ec_handle);
static void __init tpacpi_acpi_handle_locate(const char *name,
{
...
memset(&device_found, 0, sizeof(device_found));
status = acpi_get_devices(hid, tpacpi_acpi_handle_locate_callback,
(void *)name, &device_found);
> +static int __devinit acer_gsensor_open(struct input_dev *input)
> +{
> + acpi_handle handle;
> + acpi_status status;
> + struct acpi_buffer output;
> + union acpi_object out_obj;
> +
> + status = acpi_get_handle(NULL, ACER_GSENSOR_HANDLE, &handle);
> + if (ACPI_FAILURE(status))
> + return -1;
> +
> + output.length = sizeof(out_obj);
> + output.pointer = &out_obj;
> + status = acpi_evaluate_object(NULL, ACER_GSENSOR_INIT, NULL, &output);
> + if (ACPI_FAILURE(status))
> + return -1;
> +
> + return 0;
> +}
> +
> +static int acer_gsensor_event(void)
> +{
> + acpi_status status;
> + struct acpi_buffer output;
> + union acpi_object out_obj[5];
> +
> + if (!has_cap(ACER_CAP_ACCEL))
> + return -1;
> +
> + output.length = sizeof(out_obj);
> + output.pointer = out_obj;
> +
> + status = acpi_evaluate_object(NULL, ACER_GSENSOR_RDVL, NULL, &output);
> + if (ACPI_FAILURE(status))
> + return -1;
> +
> + if (out_obj->package.count != 4)
> + return -1;
> +
> + input_report_abs(acer_wmi_accel_dev, ABS_X,
> + (s16)out_obj->package.elements[0].integer.value);
> + input_report_abs(acer_wmi_accel_dev, ABS_Y,
> + (s16)out_obj->package.elements[1].integer.value);
> + input_report_abs(acer_wmi_accel_dev, ABS_Z,
> + (s16)out_obj->package.elements[2].integer.value);
> + input_sync(acer_wmi_accel_dev);
> + return 0;
> +}
> +
> +/*
> * Rfkill devices
> */
> static void acer_rfkill_update(struct work_struct *ignored);
> @@ -1649,6 +1710,9 @@ static void acer_wmi_notify(u32 value, void *context)
> 1, true);
> }
> break;
> + case WMID_ACCEL_EVENT:
> + acer_gsensor_event();
> + break;
> default:
> pr_warn("Unknown function number - %d - %d\n",
> return_value.function, return_value.key_num);
> @@ -1734,6 +1798,41 @@ static int acer_wmi_enable_lm(void)
> return status;
> }
>
> +static int __init acer_wmi_accel_setup(void)
> +{
> + int err;
> +
> + acer_wmi_accel_dev = input_allocate_device();
> + if (!acer_wmi_accel_dev)
> + return -ENOMEM;
> +
> + acer_wmi_accel_dev->open = acer_gsensor_open;
> +
> + acer_wmi_accel_dev->name = "Acer BMA150 accelerometer";
> + acer_wmi_accel_dev->phys = "wmi/input1";
> + acer_wmi_accel_dev->id.bustype = BUS_HOST;
> + acer_wmi_accel_dev->evbit[0] = BIT_MASK(EV_ABS);
> + input_set_abs_params(acer_wmi_accel_dev, ABS_X, -16384, 16384, 0, 0);
> + input_set_abs_params(acer_wmi_accel_dev, ABS_Y, -16384, 16384, 0, 0);
> + input_set_abs_params(acer_wmi_accel_dev, ABS_Z, -16384, 16384, 0, 0);
> +
> + err = input_register_device(acer_wmi_accel_dev);
> + if (err)
> + goto err_free_dev;
> +
> + return 0;
> +
> +err_free_dev:
> + input_free_device(acer_wmi_accel_dev);
> + return err;
> +}
> +
> +static void acer_wmi_accel_destroy(void)
> +{
> + input_unregister_device(acer_wmi_accel_dev);
> + input_free_device(acer_wmi_accel_dev);
> +}
> +
> static int __init acer_wmi_input_setup(void)
> {
> acpi_status status;
> @@ -2066,6 +2165,12 @@ static int __init acer_wmi_init(void)
> return err;
> }
>
> + if (has_cap(ACER_CAP_ACCEL)) {
> + err = acer_wmi_accel_setup();
> + if (err)
> + goto error_platform_register;
> + }
> +
> err = platform_driver_register(&acer_platform_driver);
> if (err) {
> pr_err("Unable to register platform driver\n");
> @@ -2109,6 +2214,8 @@ error_device_alloc:
> error_platform_register:
> if (wmi_has_guid(ACERWMID_EVENT_GUID))
> acer_wmi_input_destroy();
> + if (has_cap(ACER_CAP_ACCEL))
> + acer_wmi_accel_destroy();
>
> return err;
> }
> @@ -2118,6 +2225,9 @@ static void __exit acer_wmi_exit(void)
> if (wmi_has_guid(ACERWMID_EVENT_GUID))
> acer_wmi_input_destroy();
>
> + if (has_cap(ACER_CAP_ACCEL))
> + acer_wmi_accel_destroy();
> +
> remove_sysfs(acer_platform_device);
> remove_debugfs();
> platform_device_unregister(acer_platform_device);
other stuff looks good to me.
Thanks a lot!
Joey Lee
--
To unsubscribe from this list: send the line "unsubscribe platform-driver-x86"
in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html