From: zwp <zwp@rock-chips.com>
Date: Thu, 5 Jan 2012 03:31:44 +0000 (+0800)
Subject: update mpu3050 slave gsesor(bma222)driver.
X-Git-Tag: firefly_0821_release~9689
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1cbf6e936593c48c289d010f00aafaad04800a98;p=firefly-linux-kernel-4.4.55.git

update mpu3050 slave gsesor(bma222)driver.
---

diff --git a/drivers/misc/inv_mpu/accel/bma222.c b/drivers/misc/inv_mpu/accel/bma222.c
index e9fc99b1a62d..e9cfb676c5d9 100644
--- a/drivers/misc/inv_mpu/accel/bma222.c
+++ b/drivers/misc/inv_mpu/accel/bma222.c
@@ -51,6 +51,8 @@
 #define BMA222_PWR_REG		(0x11)
 #define BMA222_SOFTRESET_REG	(0x14)
 
+#define BMA222_INTTERUPTSET_REG (0x17)
+
 #define BMA222_STATUS_RDY_MASK	(0x80)
 #define BMA222_FSR_MASK		(0x0F)
 #define BMA222_ODR_MASK		(0x1F)
@@ -257,7 +259,14 @@ static int bma222_init(void *mlsl_handle,
 		LOG_RESULT_LOCATION(result);
 		return result;
 	}
-
+/*	
+	result = inv_serial_single_write(mlsl_handle, pdata->address,
+		BMA222_INTTERUPTSET_REG, 0x10);
+	if (result) {
+		LOG_RESULT_LOCATION(result);
+		return result;
+	}
+*/
 	return result;
 }
 
@@ -328,6 +337,8 @@ static int bma222_get_config(void *mlsl_handle,
 		break;
 	case MPU_SLAVE_CONFIG_IRQ_SUSPEND:
 	case MPU_SLAVE_CONFIG_IRQ_RESUME:
+		//zwp,TODO,need to add irq config???
+		return INV_SUCCESS;
 	default:
 		return INV_ERROR_FEATURE_NOT_IMPLEMENTED;
 	};
@@ -383,6 +394,8 @@ static int bma222_config(void *mlsl_handle,
 				      *((long *)data->data));
 	case MPU_SLAVE_CONFIG_IRQ_SUSPEND:
 	case MPU_SLAVE_CONFIG_IRQ_RESUME:
+		//zwp,TODO,need to add irq config???
+		return INV_SUCCESS;
 	default:
 		return INV_ERROR_FEATURE_NOT_IMPLEMENTED;
 	};
@@ -475,7 +488,7 @@ static int bma222_resume(void *mlsl_handle,
 		LOG_RESULT_LOCATION(result);
 		return result;
 	}
-
+	
 	return result;
 }
 
@@ -499,14 +512,18 @@ static int bma222_read(void *mlsl_handle,
 		       unsigned char *data)
 {
 	int result = INV_SUCCESS;
-	result = inv_serial_read(mlsl_handle, pdata->address,
+/*	result = inv_serial_read(mlsl_handle, pdata->address,
 				BMA222_STATUS_REG, 1, data);
 	if (data[0] & BMA222_STATUS_RDY_MASK) {
+*/
 		result = inv_serial_read(mlsl_handle, pdata->address,
 				 slave->read_reg, slave->read_len, data);
+
 	return result;
-	} else
+/*	} else{
 		return INV_ERROR_ACCEL_DATA_NOT_READY;
+	}
+*/
 }
 
 static struct ext_slave_descr bma222_descr = {
@@ -548,7 +565,7 @@ static int bma222_mod_probe(struct i2c_client *client,
 	struct ext_slave_platform_data *pdata;
 	struct bma222_mod_private_data *private_data;
 	int result = 0;
-
+	printk("%s,++++++++++++++++++++\n",__FUNCTION__);
 	dev_info(&client->adapter->dev, "%s: %s\n", __func__, devid->name);
 
 	if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {