Merge branch develop-3.10-next

[firefly-linux-kernel-4.4.55.git] / drivers / input / sensors / sensor-dev.c

diff --git a/drivers/input/sensors/sensor-dev.c b/drivers/input/sensors/sensor-dev.c
index 020e3f13adf39e43870c6c91c55a92e040fdc343..d7536fc421f75aa2766bfaa3ea4988939a573b18 100755 (executable)
--- a/drivers/input/sensors/sensor-dev.c
+++ b/drivers/input/sensors/sensor-dev.c
@@ -1456,6 +1456,9 @@ static int sensor_misc_device_register(struct sensor_private_data *sensor, int t
                        {\r
                                sensor->fops.owner = THIS_MODULE;\r
                                sensor->fops.unlocked_ioctl = gsensor_dev_ioctl;\r
+                #ifdef CONFIG_COMPAT\r
+                               sensor->fops.compat_ioctl = gsensor_dev_ioctl;\r
+                               #endif\r
                                sensor->fops.open = gsensor_dev_open;\r
                                sensor->fops.release = gsensor_dev_release;\r
 \r
@@ -1656,7 +1659,7 @@ int sensor_probe(struct i2c_client *client, const struct i2c_device_id *devid)
        int result = 0;\r
        int type = 0;\r
        \r
-       dev_info(&client->adapter->dev, "%s: %s,0x%x\n", __func__, devid->name,(unsigned int)client);\r
+       dev_info(&client->adapter->dev, "%s: %s,%p\n", __func__, devid->name, client);\r
 \r
        if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {\r
                result = -ENODEV;\r
@@ -1693,7 +1696,7 @@ int sensor_probe(struct i2c_client *client, const struct i2c_device_id *devid)
        of_property_read_u32(np,"layout",&(pdata->layout));\r
 \r
        of_property_read_u8(np,"address",&(pdata->address));\r
-       pdata->project_name = of_get_property(np, "project_name", NULL);\r
+       of_get_property(np, "project_name", pdata->project_name);\r
 \r
 \r
        switch(pdata->layout)\r
@@ -2097,6 +2100,9 @@ static const struct i2c_device_id sensor_id[] = {
        {"gs_mxc6225", ACCEL_ID_MXC6225},       \r
        {"gs_dmard10", ACCEL_ID_DMARD10},\r
        {"gs_lsm303d", ACCEL_ID_LSM303D},\r
+       {"gs_mc3230",ACCEL_ID_MC3230},\r
+       {"mpu6880_acc",ACCEL_ID_MPU6880},\r
+       {"mpu6500_acc",ACCEL_ID_MPU6500},\r
        /*compass*/\r
        {"compass", COMPASS_ID_ALL},\r
        {"ak8975", COMPASS_ID_AK8975},  \r
@@ -2109,6 +2115,7 @@ static const struct i2c_device_id sensor_id[] = {
        {"l3g20d_gyro", GYRO_ID_L3G20D},\r
        {"ewtsa_gyro", GYRO_ID_EWTSA},\r
        {"k3g", GYRO_ID_K3G},\r
+       {"mpu6880_gyro",GYRO_ID_MPU6880},\r
        /*light sensor*/\r
        {"lightsensor", LIGHT_ID_ALL},  \r
        {"light_cm3217", LIGHT_ID_CM3217},\r
@@ -2143,6 +2150,8 @@ static struct of_device_id sensor_dt_ids[] = {
        { .compatible = "gs_lis3dh" },\r
        { .compatible = "gs_lsm303d" },\r
        { .compatible = "gs_mma7660" },\r
+       { .compatible = "gs_mxc6225" },\r
+       { .compatible = "gs_mc3230" },\r
        \r
        /*compass*/\r
        { .compatible = "ak8975" },\r