5 files changed, 92 insertions, 20 deletions

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index eb2ee11b6412..fe3a59e2a5ba 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -729,7 +729,7 @@ static int hid_scan_report(struct hid_device *hid)
                         item.type == HID_ITEM_TYPE_MAIN &&
                         item.tag == HID_MAIN_ITEM_TAG_BEGIN_COLLECTION &&
                         (item_udata(&item) & 0xff) == HID_COLLECTION_PHYSICAL &&
-                        hid->bus == BUS_USB)
+                        (hid->bus == BUS_USB || hid->bus == BUS_I2C))
                         hid->group = HID_GROUP_SENSOR_HUB;
         }
 
diff --git a/drivers/hid/hid-picolcd_cir.c b/drivers/hid/hid-picolcd_cir.c
index 13ca9191b630..a79e95bb9fb6 100644
--- a/drivers/hid/hid-picolcd_cir.c
+++ b/drivers/hid/hid-picolcd_cir.c
@@ -116,7 +116,7 @@ int picolcd_init_cir(struct picolcd_data *data, struct hid_report *report)
 
         rdev->priv             = data;
         rdev->driver_type      = RC_DRIVER_IR_RAW;
-        rdev->allowed_protos   = RC_TYPE_ALL;
+        rdev->allowed_protos   = RC_BIT_ALL;
         rdev->open             = picolcd_cir_open;
         rdev->close            = picolcd_cir_close;
         rdev->input_name       = data->hdev->name;
diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c
index 0bc58bd8d4f5..7d96db367477 100644
--- a/drivers/hid/hid-sensor-hub.c
+++ b/drivers/hid/hid-sensor-hub.c
@@ -605,16 +605,12 @@ static void sensor_hub_remove(struct hid_device *hdev)
 }
 
 static const struct hid_device_id sensor_hub_devices[] = {
-        { HID_DEVICE(BUS_USB, HID_GROUP_SENSOR_HUB, HID_ANY_ID, HID_ANY_ID) },
+        { HID_DEVICE(HID_BUS_ANY, HID_GROUP_SENSOR_HUB, HID_ANY_ID,
+                     HID_ANY_ID) },
         { }
 };
 MODULE_DEVICE_TABLE(hid, sensor_hub_devices);
 
-static const struct hid_usage_id sensor_hub_grabbed_usages[] = {
-        { HID_ANY_ID, HID_ANY_ID, HID_ANY_ID },
-        { HID_ANY_ID - 1, HID_ANY_ID - 1, HID_ANY_ID - 1 }
-};
-
 static struct hid_driver sensor_hub_driver = {
         .name = "hid-sensor-hub",
         .id_table = sensor_hub_devices,
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c
index 413a73187d33..f3bbbce8353b 100644
--- a/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
@@ -581,6 +581,7 @@ int __init hidraw_init(void)
         if (result < 0)
                 goto error_class;
 
+        printk(KERN_INFO "hidraw: raw HID events driver (C) Jiri Kosina\n");
 out:
         return result;
 
diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c
index 5774ebf4298c..ec7930217a6d 100644
--- a/drivers/hid/i2c-hid/i2c-hid.c
+++ b/drivers/hid/i2c-hid/i2c-hid.c
@@ -34,6 +34,7 @@
 #include <linux/kernel.h>
 #include <linux/hid.h>
 #include <linux/mutex.h>
+#include <linux/acpi.h>
 
 #include <linux/i2c/i2c-hid.h>
 
@@ -139,6 +140,8 @@ struct i2c_hid {
         unsigned long           flags;          /* device flags */
 
         wait_queue_head_t       wait;           /* For waiting the interrupt */
+
+        struct i2c_hid_platform_data pdata;
 };
 
 static int __i2c_hid_command(struct i2c_client *client,
@@ -742,7 +745,7 @@ static struct hid_ll_driver i2c_hid_ll_driver = {
         .hidinput_input_event = i2c_hid_hidinput_input_event,
 };
 
-static int __devinit i2c_hid_init_irq(struct i2c_client *client)
+static int i2c_hid_init_irq(struct i2c_client *client)
 {
         struct i2c_hid *ihid = i2c_get_clientdata(client);
         int ret;
@@ -764,7 +767,7 @@ static int __devinit i2c_hid_init_irq(struct i2c_client *client)
         return 0;
 }
 
-static int __devinit i2c_hid_fetch_hid_descriptor(struct i2c_hid *ihid)
+static int i2c_hid_fetch_hid_descriptor(struct i2c_hid *ihid)
 {
         struct i2c_client *client = ihid->client;
         struct i2c_hid_desc *hdesc = &ihid->hdesc;
@@ -821,8 +824,72 @@ static int __devinit i2c_hid_fetch_hid_descriptor(struct i2c_hid *ihid)
         return 0;
 }
 
-static int __devinit i2c_hid_probe(struct i2c_client *client,
-                const struct i2c_device_id *dev_id)
+#ifdef CONFIG_ACPI
+static int i2c_hid_acpi_pdata(struct i2c_client *client,
+                struct i2c_hid_platform_data *pdata)
+{
+        static u8 i2c_hid_guid[] = {
+                0xF7, 0xF6, 0xDF, 0x3C, 0x67, 0x42, 0x55, 0x45,
+                0xAD, 0x05, 0xB3, 0x0A, 0x3D, 0x89, 0x38, 0xDE,
+        };
+        struct acpi_buffer buf = { ACPI_ALLOCATE_BUFFER, NULL };
+        union acpi_object params[4], *obj;
+        struct acpi_object_list input;
+        struct acpi_device *adev;
+        acpi_handle handle;
+
+        handle = ACPI_HANDLE(&client->dev);
+        if (!handle || acpi_bus_get_device(handle, &adev))
+                return -ENODEV;
+
+        input.count = ARRAY_SIZE(params);
+        input.pointer = params;
+
+        params[0].type = ACPI_TYPE_BUFFER;
+        params[0].buffer.length = sizeof(i2c_hid_guid);
+        params[0].buffer.pointer = i2c_hid_guid;
+        params[1].type = ACPI_TYPE_INTEGER;
+        params[1].integer.value = 1;
+        params[2].type = ACPI_TYPE_INTEGER;
+        params[2].integer.value = 1; /* HID function */
+        params[3].type = ACPI_TYPE_INTEGER;
+        params[3].integer.value = 0;
+
+        if (ACPI_FAILURE(acpi_evaluate_object(handle, "_DSM", &input, &buf))) {
+                dev_err(&client->dev, "device _DSM execution failed\n");
+                return -ENODEV;
+        }
+
+        obj = (union acpi_object *)buf.pointer;
+        if (obj->type != ACPI_TYPE_INTEGER) {
+                dev_err(&client->dev, "device _DSM returned invalid type: %d\n",
+                        obj->type);
+                kfree(buf.pointer);
+                return -EINVAL;
+        }
+
+        pdata->hid_descriptor_address = obj->integer.value;
+
+        kfree(buf.pointer);
+        return 0;
+}
+
+static const struct acpi_device_id i2c_hid_acpi_match[] = {
+        {"ACPI0C50", 0 },
+        {"PNP0C50", 0 },
+        { },
+};
+MODULE_DEVICE_TABLE(acpi, i2c_hid_acpi_match);
+#else
+static inline int i2c_hid_acpi_pdata(struct i2c_client *client,
+                struct i2c_hid_platform_data *pdata)
+{
+        return -ENODEV;
+}
+#endif
+
+static int i2c_hid_probe(struct i2c_client *client,
+                         const struct i2c_device_id *dev_id)
 {
         int ret;
         struct i2c_hid *ihid;
@@ -832,11 +899,6 @@ static int __devinit i2c_hid_probe(struct i2c_client *client,
 
         dbg_hid("HID probe called for i2c 0x%02x\n", client->addr);
 
-        if (!platform_data) {
-                dev_err(&client->dev, "HID register address not provided\n");
-                return -EINVAL;
-        }
-
         if (!client->irq) {
                 dev_err(&client->dev,
                         "HID over i2c has not been provided an Int IRQ\n");
@@ -847,11 +909,22 @@ static int __devinit i2c_hid_probe(struct i2c_client *client,
         if (!ihid)
                 return -ENOMEM;
 
+        if (!platform_data) {
+                ret = i2c_hid_acpi_pdata(client, &ihid->pdata);
+                if (ret) {
+                        dev_err(&client->dev,
+                                "HID register address not provided\n");
+                        goto err;
+                }
+        } else {
+                ihid->pdata = *platform_data;
+        }
+
         i2c_set_clientdata(client, ihid);
 
         ihid->client = client;
 
-        hidRegister = platform_data->hid_descriptor_address;
+        hidRegister = ihid->pdata.hid_descriptor_address;
         ihid->wHIDDescRegister = cpu_to_le16(hidRegister);
 
         init_waitqueue_head(&ihid->wait);
@@ -884,6 +957,7 @@ static int __devinit i2c_hid_probe(struct i2c_client *client,
         hid->hid_get_raw_report = i2c_hid_get_raw_report;
         hid->hid_output_raw_report = i2c_hid_output_raw_report;
         hid->dev.parent = &client->dev;
+        ACPI_HANDLE_SET(&hid->dev, ACPI_HANDLE(&client->dev));
         hid->bus = BUS_I2C;
         hid->version = le16_to_cpu(ihid->hdesc.bcdVersion);
         hid->vendor = le16_to_cpu(ihid->hdesc.wVendorID);
@@ -913,7 +987,7 @@ err:
         return ret;
 }
 
-static int __devexit i2c_hid_remove(struct i2c_client *client)
+static int i2c_hid_remove(struct i2c_client *client)
 {
         struct i2c_hid *ihid = i2c_get_clientdata(client);
         struct hid_device *hid;
@@ -975,10 +1049,11 @@ static struct i2c_driver i2c_hid_driver = {
                 .name   = "i2c_hid",
                 .owner  = THIS_MODULE,
                 .pm     = &i2c_hid_pm,
+                .acpi_match_table = ACPI_PTR(i2c_hid_acpi_match),
         },
 
         .probe          = i2c_hid_probe,
-        .remove         = __devexit_p(i2c_hid_remove),
+        .remove         = i2c_hid_remove,
 
         .id_table       = i2c_hid_id_table,
 };