]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'staging/staging-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 26 Sep 2012 04:27:56 +0000 (14:27 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 26 Sep 2012 04:28:01 +0000 (14:28 +1000)
Conflicts:
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/android/binder.c
drivers/staging/ipack/devices/ipoctal.c
drivers/staging/omap-thermal/omap-thermal-common.c
drivers/staging/serqt_usb2/serqt_usb2.c

16 files changed:
1  2 
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-sensor-hub.c
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/android/binder.c
drivers/staging/ccg/Kconfig
drivers/staging/ccg/ccg.c
drivers/staging/et131x/et131x.c
drivers/staging/ipack/devices/ipoctal.c
drivers/staging/omap-thermal/omap-thermal-common.c
drivers/staging/omapdrm/omap_gem.c
drivers/staging/serqt_usb2/serqt_usb2.c
drivers/staging/usbip/usbip_common.c

Simple merge
Simple merge
Simple merge
Simple merge
index 0000000000000000000000000000000000000000,34a35ba95fc173f6b01d5a26c579ce2dcd2c91a0..4ac759c1fe225c9f9e4d6cf27f9d0f2fd7805ce1
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,695 +1,695 @@@
 -              sd->hid_sensor_client_cnt, NULL, 0);
+ /*
+  * HID Sensors Driver
+  * Copyright (c) 2012, Intel Corporation.
+  *
+  * This program is free software; you can redistribute it and/or modify it
+  * under the terms and conditions of the GNU General Public License,
+  * version 2, as published by the Free Software Foundation.
+  *
+  * This program is distributed in the hope it will be useful, but WITHOUT
+  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+  * more details.
+  *
+  * You should have received a copy of the GNU General Public License along with
+  * this program; if not, write to the Free Software Foundation, Inc.,
+  * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+  *
+  */
+ #include <linux/device.h>
+ #include <linux/hid.h>
+ #include <linux/usb.h>
+ #include "usbhid/usbhid.h"
+ #include <linux/module.h>
+ #include <linux/slab.h>
+ #include <linux/mfd/core.h>
+ #include <linux/list.h>
+ #include <linux/hid-sensor-ids.h>
+ #include <linux/hid-sensor-hub.h>
+ #include "hid-ids.h"
+ /**
+  * struct sensor_hub_pending - Synchronous read pending information
+  * @status:           Pending status true/false.
+  * @ready:            Completion synchronization data.
+  * @usage_id:         Usage id for physical device, E.g. Gyro usage id.
+  * @attr_usage_id:    Usage Id of a field, E.g. X-AXIS for a gyro.
+  * @raw_size:         Response size for a read request.
+  * @raw_data:         Place holder for received response.
+  */
+ struct sensor_hub_pending {
+       bool status;
+       struct completion ready;
+       u32 usage_id;
+       u32 attr_usage_id;
+       int raw_size;
+       u8  *raw_data;
+ };
+ /**
+  * struct sensor_hub_data - Hold a instance data for a HID hub device
+  * @hsdev:            Stored hid instance for current hub device.
+  * @mutex:            Mutex to serialize synchronous request.
+  * @lock:             Spin lock to protect pending request structure.
+  * @pending:          Holds information of pending sync read request.
+  * @dyn_callback_list:        Holds callback function
+  * @dyn_callback_lock:        spin lock to protect callback list
+  * @hid_sensor_hub_client_devs:       Stores all MFD cells for a hub instance.
+  * @hid_sensor_client_cnt: Number of MFD cells, (no of sensors attached).
+  */
+ struct sensor_hub_data {
+       struct hid_sensor_hub_device *hsdev;
+       struct mutex mutex;
+       spinlock_t lock;
+       struct sensor_hub_pending pending;
+       struct list_head dyn_callback_list;
+       spinlock_t dyn_callback_lock;
+       struct mfd_cell *hid_sensor_hub_client_devs;
+       int hid_sensor_client_cnt;
+ };
+ /**
+  * struct hid_sensor_hub_callbacks_list - Stores callback list
+  * @list:             list head.
+  * @usage_id:         usage id for a physical device.
+  * @usage_callback:   Stores registered callback functions.
+  * @priv:             Private data for a physical device.
+  */
+ struct hid_sensor_hub_callbacks_list {
+       struct list_head list;
+       u32 usage_id;
+       struct hid_sensor_hub_callbacks *usage_callback;
+       void *priv;
+ };
+ static int sensor_hub_check_for_sensor_page(struct hid_device *hdev)
+ {
+       int i;
+       int ret = -EINVAL;
+       for (i = 0; i < hdev->maxcollection; i++) {
+               struct hid_collection *col = &hdev->collection[i];
+               if (col->type == HID_COLLECTION_PHYSICAL &&
+                  (col->usage & HID_USAGE_PAGE) == HID_UP_SENSOR) {
+                       ret = 0;
+                       break;
+               }
+       }
+       return ret;
+ }
+ static struct hid_report *sensor_hub_report(int id, struct hid_device *hdev,
+                                               int dir)
+ {
+       struct hid_report *report;
+       list_for_each_entry(report, &hdev->report_enum[dir].report_list, list) {
+               if (report->id == id)
+                       return report;
+       }
+       hid_warn(hdev, "No report with id 0x%x found\n", id);
+       return NULL;
+ }
+ static int sensor_hub_get_physical_device_count(
+                               struct hid_report_enum *report_enum)
+ {
+       struct hid_report *report;
+       struct hid_field *field;
+       int cnt = 0;
+       list_for_each_entry(report, &report_enum->report_list, list) {
+               field = report->field[0];
+               if (report->maxfield && field &&
+                                       field->physical)
+                       cnt++;
+       }
+       return cnt;
+ }
+ static void sensor_hub_fill_attr_info(
+               struct hid_sensor_hub_attribute_info *info,
+               s32 index, s32 report_id, s32 units, s32 unit_expo, s32 size)
+ {
+       info->index = index;
+       info->report_id = report_id;
+       info->units = units;
+       info->unit_expo = unit_expo;
+       info->size = size/8;
+ }
+ static struct hid_sensor_hub_callbacks *sensor_hub_get_callback(
+                                       struct hid_device *hdev,
+                                       u32 usage_id, void **priv)
+ {
+       struct hid_sensor_hub_callbacks_list *callback;
+       struct sensor_hub_data *pdata = hid_get_drvdata(hdev);
+       spin_lock(&pdata->dyn_callback_lock);
+       list_for_each_entry(callback, &pdata->dyn_callback_list, list)
+               if (callback->usage_id == usage_id) {
+                       *priv = callback->priv;
+                       spin_unlock(&pdata->dyn_callback_lock);
+                       return callback->usage_callback;
+               }
+       spin_unlock(&pdata->dyn_callback_lock);
+       return NULL;
+ }
+ int sensor_hub_register_callback(struct hid_sensor_hub_device *hsdev,
+                       u32 usage_id,
+                       struct hid_sensor_hub_callbacks *usage_callback)
+ {
+       struct hid_sensor_hub_callbacks_list *callback;
+       struct sensor_hub_data *pdata = hid_get_drvdata(hsdev->hdev);
+       spin_lock(&pdata->dyn_callback_lock);
+       list_for_each_entry(callback, &pdata->dyn_callback_list, list)
+               if (callback->usage_id == usage_id) {
+                       spin_unlock(&pdata->dyn_callback_lock);
+                       return -EINVAL;
+               }
+       callback = kzalloc(sizeof(*callback), GFP_KERNEL);
+       if (!callback) {
+               spin_unlock(&pdata->dyn_callback_lock);
+               return -ENOMEM;
+       }
+       callback->usage_callback = usage_callback;
+       callback->usage_id = usage_id;
+       callback->priv = NULL;
+       list_add_tail(&callback->list, &pdata->dyn_callback_list);
+       spin_unlock(&pdata->dyn_callback_lock);
+       return 0;
+ }
+ EXPORT_SYMBOL_GPL(sensor_hub_register_callback);
+ int sensor_hub_remove_callback(struct hid_sensor_hub_device *hsdev,
+                               u32 usage_id)
+ {
+       struct hid_sensor_hub_callbacks_list *callback;
+       struct sensor_hub_data *pdata = hid_get_drvdata(hsdev->hdev);
+       spin_lock(&pdata->dyn_callback_lock);
+       list_for_each_entry(callback, &pdata->dyn_callback_list, list)
+               if (callback->usage_id == usage_id) {
+                       list_del(&callback->list);
+                       kfree(callback);
+                       break;
+               }
+       spin_unlock(&pdata->dyn_callback_lock);
+       return 0;
+ }
+ EXPORT_SYMBOL_GPL(sensor_hub_remove_callback);
+ int sensor_hub_set_feature(struct hid_sensor_hub_device *hsdev, u32 report_id,
+                               u32 field_index, s32 value)
+ {
+       struct hid_report *report;
+       struct sensor_hub_data *data =  hid_get_drvdata(hsdev->hdev);
+       int ret = 0;
+       if (report_id < 0)
+               return -EINVAL;
+       mutex_lock(&data->mutex);
+       report = sensor_hub_report(report_id, hsdev->hdev, HID_FEATURE_REPORT);
+       if (!report || (field_index >=  report->maxfield)) {
+               ret = -EINVAL;
+               goto done_proc;
+       }
+       hid_set_field(report->field[field_index], 0, value);
+       usbhid_submit_report(hsdev->hdev, report, USB_DIR_OUT);
+       usbhid_wait_io(hsdev->hdev);
+ done_proc:
+       mutex_unlock(&data->mutex);
+       return ret;
+ }
+ EXPORT_SYMBOL_GPL(sensor_hub_set_feature);
+ int sensor_hub_get_feature(struct hid_sensor_hub_device *hsdev, u32 report_id,
+                               u32 field_index, s32 *value)
+ {
+       struct hid_report *report;
+       struct sensor_hub_data *data =  hid_get_drvdata(hsdev->hdev);
+       int ret = 0;
+       if (report_id < 0)
+               return -EINVAL;
+       mutex_lock(&data->mutex);
+       report = sensor_hub_report(report_id, hsdev->hdev, HID_FEATURE_REPORT);
+       if (!report || (field_index >=  report->maxfield)) {
+               ret = -EINVAL;
+               goto done_proc;
+       }
+       usbhid_submit_report(hsdev->hdev, report, USB_DIR_IN);
+       usbhid_wait_io(hsdev->hdev);
+       *value = report->field[field_index]->value[0];
+ done_proc:
+       mutex_unlock(&data->mutex);
+       return ret;
+ }
+ EXPORT_SYMBOL_GPL(sensor_hub_get_feature);
+ int sensor_hub_input_attr_get_raw_value(struct hid_sensor_hub_device *hsdev,
+                                       u32 usage_id,
+                                       u32 attr_usage_id, u32 report_id)
+ {
+       struct sensor_hub_data *data =  hid_get_drvdata(hsdev->hdev);
+       unsigned long flags;
+       struct hid_report *report;
+       int ret_val = 0;
+       if (report_id < 0)
+               return -EINVAL;
+       mutex_lock(&data->mutex);
+       memset(&data->pending, 0, sizeof(data->pending));
+       init_completion(&data->pending.ready);
+       data->pending.usage_id = usage_id;
+       data->pending.attr_usage_id = attr_usage_id;
+       data->pending.raw_size = 0;
+       spin_lock_irqsave(&data->lock, flags);
+       data->pending.status = true;
+       report = sensor_hub_report(report_id, hsdev->hdev, HID_INPUT_REPORT);
+       if (!report) {
+               spin_unlock_irqrestore(&data->lock, flags);
+               goto err_free;
+       }
+       usbhid_submit_report(hsdev->hdev, report, USB_DIR_IN);
+       spin_unlock_irqrestore(&data->lock, flags);
+       wait_for_completion_interruptible_timeout(&data->pending.ready, HZ*5);
+       switch (data->pending.raw_size) {
+       case 1:
+               ret_val = *(u8 *)data->pending.raw_data;
+               break;
+       case 2:
+               ret_val = *(u16 *)data->pending.raw_data;
+               break;
+       case 4:
+               ret_val = *(u32 *)data->pending.raw_data;
+               break;
+       default:
+               ret_val = 0;
+       }
+       kfree(data->pending.raw_data);
+ err_free:
+       data->pending.status = false;
+       mutex_unlock(&data->mutex);
+       return ret_val;
+ }
+ EXPORT_SYMBOL_GPL(sensor_hub_input_attr_get_raw_value);
+ int sensor_hub_input_get_attribute_info(struct hid_sensor_hub_device *hsdev,
+                               u8 type,
+                               u32 usage_id,
+                               u32 attr_usage_id,
+                               struct hid_sensor_hub_attribute_info *info)
+ {
+       int ret = -1;
+       int i, j;
+       int collection_index = -1;
+       struct hid_report *report;
+       struct hid_field *field;
+       struct hid_report_enum *report_enum;
+       struct hid_device *hdev = hsdev->hdev;
+       /* Initialize with defaults */
+       info->usage_id = usage_id;
+       info->attrib_id =  attr_usage_id;
+       info->report_id = -1;
+       info->index = -1;
+       info->units = -1;
+       info->unit_expo = -1;
+       for (i = 0; i < hdev->maxcollection; ++i) {
+               struct hid_collection *collection = &hdev->collection[i];
+               if (usage_id == collection->usage) {
+                       collection_index = i;
+                       break;
+               }
+       }
+       if (collection_index == -1)
+               goto err_ret;
+       report_enum = &hdev->report_enum[type];
+       list_for_each_entry(report, &report_enum->report_list, list) {
+               for (i = 0; i < report->maxfield; ++i) {
+                       field = report->field[i];
+                       if (field->physical == usage_id &&
+                               field->logical == attr_usage_id) {
+                               sensor_hub_fill_attr_info(info, i, report->id,
+                                       field->unit, field->unit_exponent,
+                                       field->report_size);
+                               ret = 0;
+                       } else {
+                               for (j = 0; j < field->maxusage; ++j) {
+                                       if (field->usage[j].hid ==
+                                       attr_usage_id &&
+                                       field->usage[j].collection_index ==
+                                       collection_index)  {
+                                               sensor_hub_fill_attr_info(info,
+                                                       i, report->id,
+                                                       field->unit,
+                                                       field->unit_exponent,
+                                                       field->report_size);
+                                               ret = 0;
+                                               break;
+                                       }
+                               }
+                       }
+                       if (ret == 0)
+                               break;
+               }
+       }
+ err_ret:
+       return ret;
+ }
+ EXPORT_SYMBOL_GPL(sensor_hub_input_get_attribute_info);
+ #ifdef CONFIG_PM
+ static int sensor_hub_suspend(struct hid_device *hdev, pm_message_t message)
+ {
+       struct sensor_hub_data *pdata =  hid_get_drvdata(hdev);
+       struct hid_sensor_hub_callbacks_list *callback;
+       hid_dbg(hdev, " sensor_hub_suspend\n");
+       spin_lock(&pdata->dyn_callback_lock);
+       list_for_each_entry(callback, &pdata->dyn_callback_list, list) {
+               if (callback->usage_callback->suspend)
+                       callback->usage_callback->suspend(
+                                       pdata->hsdev, callback->priv);
+       }
+       spin_unlock(&pdata->dyn_callback_lock);
+       return 0;
+ }
+ static int sensor_hub_resume(struct hid_device *hdev)
+ {
+       struct sensor_hub_data *pdata =  hid_get_drvdata(hdev);
+       struct hid_sensor_hub_callbacks_list *callback;
+       hid_dbg(hdev, " sensor_hub_resume\n");
+       spin_lock(&pdata->dyn_callback_lock);
+       list_for_each_entry(callback, &pdata->dyn_callback_list, list) {
+               if (callback->usage_callback->resume)
+                       callback->usage_callback->resume(
+                                       pdata->hsdev, callback->priv);
+       }
+       spin_unlock(&pdata->dyn_callback_lock);
+       return 0;
+ }
+ static int sensor_hub_reset_resume(struct hid_device *hdev)
+ {
+       return 0;
+ }
+ #endif
+ /*
+  * Handle raw report as sent by device
+  */
+ static int sensor_hub_raw_event(struct hid_device *hdev,
+               struct hid_report *report, u8 *raw_data, int size)
+ {
+       int i;
+       u8 *ptr;
+       int sz;
+       struct sensor_hub_data *pdata = hid_get_drvdata(hdev);
+       unsigned long flags;
+       struct hid_sensor_hub_callbacks *callback = NULL;
+       struct hid_collection *collection = NULL;
+       void *priv = NULL;
+       hid_dbg(hdev, "sensor_hub_raw_event report id:0x%x size:%d type:%d\n",
+                        report->id, size, report->type);
+       hid_dbg(hdev, "maxfield:%d\n", report->maxfield);
+       if (report->type != HID_INPUT_REPORT)
+               return 1;
+       ptr = raw_data;
+       ptr++; /*Skip report id*/
+       if (!report)
+               goto err_report;
+       spin_lock_irqsave(&pdata->lock, flags);
+       for (i = 0; i < report->maxfield; ++i) {
+               hid_dbg(hdev, "%d collection_index:%x hid:%x sz:%x\n",
+                               i, report->field[i]->usage->collection_index,
+                               report->field[i]->usage->hid,
+                               report->field[i]->report_size/8);
+               sz = report->field[i]->report_size/8;
+               if (pdata->pending.status && pdata->pending.attr_usage_id ==
+                               report->field[i]->usage->hid) {
+                       hid_dbg(hdev, "data was pending ...\n");
+                       pdata->pending.raw_data = kmalloc(sz, GFP_KERNEL);
+                       if (pdata->pending.raw_data) {
+                               memcpy(pdata->pending.raw_data, ptr, sz);
+                               pdata->pending.raw_size  = sz;
+                       } else
+                               pdata->pending.raw_size = 0;
+                       complete(&pdata->pending.ready);
+               }
+               collection = &hdev->collection[
+                               report->field[i]->usage->collection_index];
+               hid_dbg(hdev, "collection->usage %x\n",
+                                       collection->usage);
+               callback = sensor_hub_get_callback(pdata->hsdev->hdev,
+                                               report->field[i]->physical,
+                                                       &priv);
+               if (callback && callback->capture_sample) {
+                       if (report->field[i]->logical)
+                               callback->capture_sample(pdata->hsdev,
+                                       report->field[i]->logical, sz, ptr,
+                                       callback->pdev);
+                       else
+                               callback->capture_sample(pdata->hsdev,
+                                       report->field[i]->usage->hid, sz, ptr,
+                                       callback->pdev);
+               }
+               ptr += sz;
+       }
+       if (callback && collection && callback->send_event)
+               callback->send_event(pdata->hsdev, collection->usage,
+                               callback->pdev);
+       spin_unlock_irqrestore(&pdata->lock, flags);
+ err_report:
+       return 1;
+ }
+ static int sensor_hub_probe(struct hid_device *hdev,
+                               const struct hid_device_id *id)
+ {
+       int ret;
+       struct sensor_hub_data *sd;
+       int i;
+       char *name;
+       struct hid_report *report;
+       struct hid_report_enum *report_enum;
+       struct hid_field *field;
+       int dev_cnt;
+       sd = kzalloc(sizeof(struct sensor_hub_data), GFP_KERNEL);
+       if (!sd) {
+               hid_err(hdev, "cannot allocate Sensor data\n");
+               return -ENOMEM;
+       }
+       sd->hsdev = kzalloc(sizeof(struct hid_sensor_hub_device), GFP_KERNEL);
+       if (!sd->hsdev) {
+               hid_err(hdev, "cannot allocate hid_sensor_hub_device\n");
+               ret = -ENOMEM;
+               goto err_free_hub;
+       }
+       hid_set_drvdata(hdev, sd);
+       sd->hsdev->hdev = hdev;
+       sd->hsdev->vendor_id = hdev->vendor;
+       sd->hsdev->product_id = hdev->product;
+       spin_lock_init(&sd->lock);
+       spin_lock_init(&sd->dyn_callback_lock);
+       mutex_init(&sd->mutex);
+       ret = hid_parse(hdev);
+       if (ret) {
+               hid_err(hdev, "parse failed\n");
+               goto err_free;
+       }
+       if (sensor_hub_check_for_sensor_page(hdev) < 0) {
+               hid_err(hdev, "sensor page not found\n");
+               goto err_free;
+       }
+       INIT_LIST_HEAD(&hdev->inputs);
+       hdev->claimed = HID_CLAIMED_INPUT;
+       ret = hid_hw_start(hdev, 0);
+       if (ret) {
+               hid_err(hdev, "hw start failed\n");
+               goto err_free;
+       }
+       ret = hid_hw_open(hdev);
+       if (ret) {
+               hid_err(hdev, "failed to open input interrupt pipe\n");
+               goto err_stop_hw;
+       }
+       INIT_LIST_HEAD(&sd->dyn_callback_list);
+       sd->hid_sensor_client_cnt = 0;
+       report_enum = &hdev->report_enum[HID_INPUT_REPORT];
+       dev_cnt = sensor_hub_get_physical_device_count(report_enum);
+       if (dev_cnt > HID_MAX_PHY_DEVICES) {
+               hid_err(hdev, "Invalid Physical device count\n");
+               ret = -EINVAL;
+               goto err_close;
+       }
+       sd->hid_sensor_hub_client_devs = kzalloc(dev_cnt *
+                                               sizeof(struct mfd_cell),
+                                               GFP_KERNEL);
+       if (sd->hid_sensor_hub_client_devs == NULL) {
+               hid_err(hdev,
+                       "Failed to allocate memory for mfd cells\n");
+                       ret = -ENOMEM;
+                       goto err_close;
+       }
+       list_for_each_entry(report, &report_enum->report_list, list) {
+               hid_dbg(hdev, "Report id:%x\n", report->id);
+               field = report->field[0];
+               if (report->maxfield && field &&
+                                       field->physical) {
+                       name = kasprintf(GFP_KERNEL, "HID-SENSOR-%x",
+                                               field->physical);
+                       if (name  == NULL) {
+                               hid_err(hdev,
+                                       "Failed MFD device name\n");
+                                       ret = -ENOMEM;
+                                       goto err_free_cells;
+                       }
+                       sd->hid_sensor_hub_client_devs[
+                               sd->hid_sensor_client_cnt].name = name;
+                       sd->hid_sensor_hub_client_devs[
+                               sd->hid_sensor_client_cnt].platform_data =
+                                               sd->hsdev;
+                       sd->hid_sensor_hub_client_devs[
+                               sd->hid_sensor_client_cnt].pdata_size =
+                                               sizeof(*sd->hsdev);
+                       hid_dbg(hdev, "Adding %s:%p\n", name, sd);
+                       sd->hid_sensor_client_cnt++;
+               }
+       }
+       ret = mfd_add_devices(&hdev->dev, 0, sd->hid_sensor_hub_client_devs,
++              sd->hid_sensor_client_cnt, NULL, 0, NULL);
+       if (ret < 0)
+               goto err_free_names;
+       return ret;
+ err_free_names:
+       for (i = 0; i < sd->hid_sensor_client_cnt ; ++i)
+               kfree(sd->hid_sensor_hub_client_devs[i].name);
+ err_free_cells:
+       kfree(sd->hid_sensor_hub_client_devs);
+ err_close:
+       hid_hw_stop(hdev);
+       hid_hw_close(hdev);
+ err_stop_hw:
+       hid_hw_stop(hdev);
+ err_free:
+       kfree(sd->hsdev);
+ err_free_hub:
+       kfree(sd);
+       return ret;
+ }
+ static void sensor_hub_remove(struct hid_device *hdev)
+ {
+       struct sensor_hub_data *data = hid_get_drvdata(hdev);
+       unsigned long flags;
+       int i;
+       hid_dbg(hdev, " hardware removed\n");
+       hdev->claimed &= ~HID_CLAIMED_INPUT;
+       hid_hw_stop(hdev);
+       hid_hw_close(hdev);
+       spin_lock_irqsave(&data->lock, flags);
+       if (data->pending.status)
+               complete(&data->pending.ready);
+       spin_unlock_irqrestore(&data->lock, flags);
+       mfd_remove_devices(&hdev->dev);
+       for (i = 0; i < data->hid_sensor_client_cnt ; ++i)
+               kfree(data->hid_sensor_hub_client_devs[i].name);
+       kfree(data->hid_sensor_hub_client_devs);
+       hid_set_drvdata(hdev, NULL);
+       mutex_destroy(&data->mutex);
+       kfree(data->hsdev);
+       kfree(data);
+ }
+ static const struct hid_device_id sensor_hub_devices[] = {
+       { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8086,
+                       USB_DEVICE_ID_SENSOR_HUB_1020) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8087,
+                       USB_DEVICE_ID_SENSOR_HUB_1020) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8086,
+                       USB_DEVICE_ID_SENSOR_HUB_09FA) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_INTEL_8087,
+                       USB_DEVICE_ID_SENSOR_HUB_09FA) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_STANTUM_STM,
+                       USB_DEVICE_ID_SENSOR_HUB_7014) },
+       { }
+ };
+ 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,
+       .probe = sensor_hub_probe,
+       .remove = sensor_hub_remove,
+       .raw_event = sensor_hub_raw_event,
+ #ifdef CONFIG_PM
+       .suspend = sensor_hub_suspend,
+       .resume =  sensor_hub_resume,
+       .reset_resume =  sensor_hub_reset_resume,
+ #endif
+ };
+ static int __init sensor_hub_init(void)
+ {
+       return hid_register_driver(&sensor_hub_driver);
+ }
+ static void __exit sensor_hub_exit(void)
+ {
+       hid_unregister_driver(&sensor_hub_driver);
+ }
+ module_init(sensor_hub_init);
+ module_exit(sensor_hub_exit);
+ MODULE_DESCRIPTION("HID Sensor Hub driver");
+ MODULE_AUTHOR("Srinivas Pandruvada <srinivas.pandruvada@intel.com>");
+ MODULE_LICENSE("GPL");
index 21114512fcb2e9a755e76d772a57761f6a0bcdc6,0f51a158ef704cbc7a2a6badaf95cbe2f8c1d809..449f04af483ed9dee1ca529ef36d28f2667d6024
@@@ -136,6 -134,12 +134,14 @@@ source "drivers/staging/csr/Kconfig
  
  source "drivers/staging/omap-thermal/Kconfig"
  
 +source "drivers/staging/dgrp/Kconfig"
 +
+ source "drivers/staging/ramster/Kconfig"
+ source "drivers/staging/silicom/Kconfig"
+ source "drivers/staging/ced1401/Kconfig"
+ source "drivers/staging/imx-drm/Kconfig"
  endif # STAGING
index 17c43c4cacaaa5779c0d64cd021f461f88660d61,f4b2bc41f1d1a0f34394824758c78f4fba224ef2..a19abe5381bf5c6e07aa4198ad481082b01a113a
@@@ -60,4 -59,7 +59,8 @@@ obj-$(CONFIG_USB_G_CCG)               += ccg
  obj-$(CONFIG_WIMAX_GDM72XX)   += gdm72xx/
  obj-$(CONFIG_CSR_WIFI)                += csr/
  obj-$(CONFIG_OMAP_BANDGAP)    += omap-thermal/
 +obj-$(CONFIG_DGRP)            += dgrp/
+ obj-$(CONFIG_ZCACHE2)         += ramster/
+ obj-$(CONFIG_NET_VENDOR_SILICOM)      += silicom/
+ obj-$(CONFIG_CED1401)         += ced1401/
+ obj-$(CONFIG_DRM_IMX)         += imx-drm/
index f71d624995eaa78bde3e86a9e0a185533810dcd8,a807129c7b5a93979e8dc52de5d167d98a327940..2a4109281acc33ab0264c4f400100800c29f8da8
@@@ -362,9 -362,14 +362,9 @@@ struct binder_transaction 
  static void
  binder_defer_work(struct binder_proc *proc, enum binder_deferred_state defer);
  
- int task_get_unused_fd_flags(struct binder_proc *proc, int flags)
 -/*
 - * copied from get_unused_fd_flags
 - */
+ static int task_get_unused_fd_flags(struct binder_proc *proc, int flags)
  {
        struct files_struct *files = proc->files;
 -      int fd, error;
 -      struct fdtable *fdt;
        unsigned long rlim_cur;
        unsigned long irqs;
  
Simple merge
Simple merge
Simple merge
index a68d981c259fe6eb517d85df0667f7d9cad7c96a,2cdbf280cdab340e597e98e3148f90f5bb7e0cfe..d751edfda8397c1c1d5791b34b7a38d0009d7866
@@@ -490,19 -429,26 +429,26 @@@ static int ipoctal_inst_slot(struct ipo
        ipoctal->tty_drv = tty;
  
        for (i = 0; i < NR_CHANNELS; i++) {
-               tty_port_init(&ipoctal->tty_port[i]);
-               tty_port_alloc_xmit_buf(&ipoctal->tty_port[i]);
-               ipoctal->tty_port[i].ops = &ipoctal_tty_port_ops;
-               ipoctal_reset_stats(&ipoctal->chan_stats[i]);
-               ipoctal->nb_bytes[i] = 0;
-               init_waitqueue_head(&ipoctal->queue[i]);
-               spin_lock_init(&ipoctal->lock[i]);
-               ipoctal->pointer_read[i] = 0;
-               ipoctal->pointer_write[i] = 0;
-               ipoctal->nb_bytes[i] = 0;
-               tty_port_register_device(&ipoctal->tty_port[i], tty, i, NULL);
+               struct device *tty_dev;
+               channel = &ipoctal->channel[i];
+               tty_port_init(&channel->tty_port);
+               tty_port_alloc_xmit_buf(&channel->tty_port);
+               channel->tty_port.ops = &ipoctal_tty_port_ops;
+               ipoctal_reset_stats(&channel->stats);
+               channel->nb_bytes = 0;
+               init_waitqueue_head(&channel->queue);
+               spin_lock_init(&channel->lock);
+               channel->pointer_read = 0;
+               channel->pointer_write = 0;
 -              tty_dev = tty_register_device(tty, i, NULL);
++              tty_dev = tty_port_register_device(&channel->tty_port, tty, i, NULL);
+               if (IS_ERR(tty_dev)) {
+                       dev_err(&ipoctal->dev->dev, "Failed to register tty device.\n");
+                       continue;
+               }
+               dev_set_drvdata(tty_dev, channel);
  
                /*
                 * Enable again the RX. TX will be enabled when
@@@ -613,23 -540,17 +540,17 @@@ static void ipoctal_set_termios(struct 
        unsigned char mr1 = 0;
        unsigned char mr2 = 0;
        unsigned char csr = 0;
-       unsigned int channel = tty->index;
-       struct ipoctal *ipoctal = tty->driver_data;
+       struct ipoctal_channel *channel = tty->driver_data;
        speed_t baud;
  
 -      cflag = tty->termios->c_cflag;
 +      cflag = tty->termios.c_cflag;
  
        /* Disable and reset everything before change the setup */
-       ipoctal_write_io_reg(ipoctal, &ipoctal->chan_regs[channel].u.w.cr,
-                            CR_DISABLE_RX | CR_DISABLE_TX);
-       ipoctal_write_cr_cmd(ipoctal, &ipoctal->chan_regs[channel].u.w.cr,
-                            CR_CMD_RESET_RX);
-       ipoctal_write_cr_cmd(ipoctal, &ipoctal->chan_regs[channel].u.w.cr,
-                            CR_CMD_RESET_TX);
-       ipoctal_write_cr_cmd(ipoctal, &ipoctal->chan_regs[channel].u.w.cr,
-                            CR_CMD_RESET_ERR_STATUS);
-       ipoctal_write_cr_cmd(ipoctal, &ipoctal->chan_regs[channel].u.w.cr,
-                            CR_CMD_RESET_MR);
+       iowrite8(CR_DISABLE_RX | CR_DISABLE_TX, &channel->regs->w.cr);
+       iowrite8(CR_CMD_RESET_RX, &channel->regs->w.cr);
+       iowrite8(CR_CMD_RESET_TX, &channel->regs->w.cr);
+       iowrite8(CR_CMD_RESET_ERR_STATUS, &channel->regs->w.cr);
+       iowrite8(CR_CMD_RESET_MR, &channel->regs->w.cr);
  
        /* Set Bits per chars */
        switch (cflag & CSIZE) {
Simple merge
Simple merge