From: lyx <lyx@rock-chips.com>
Date: Wed, 13 Apr 2011 09:42:58 +0000 (-0700)
Subject: gsensor mma8452: modify driver
X-Git-Tag: firefly_0821_release~10494
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2e6c346cbfc16721c7d7254aac03719f97e638e0;p=firefly-linux-kernel-4.4.55.git

gsensor mma8452: modify driver
---

diff --git a/arch/arm/mach-rk29/board-rk29-phonesdk-rfkill.c b/arch/arm/mach-rk29/board-rk29-phonesdk-rfkill.c
index 2636ea516ba1..14367abd92fe 100755
--- a/arch/arm/mach-rk29/board-rk29-phonesdk-rfkill.c
+++ b/arch/arm/mach-rk29/board-rk29-phonesdk-rfkill.c
@@ -45,7 +45,7 @@ struct bt_ctrl
 
 #define BT_GPIO_POWER           RK29_PIN5_PD6
 #define IOMUX_BT_GPIO_POWER     rk29_mux_api_set(GPIO5D6_SDMMC1PWREN_NAME, GPIO5H_GPIO5D6);
-#define BT_GPIO_RESET          	RK29_PIN6_PC4
+#define BT_GPIO_RESET          	RK29_PIN6_PC7
 #define BT_GPIO_WAKE_UP         RK29_PIN6_PD0
 #define BT_GPIO_WAKE_UP_HOST    //RK2818_PIN_PA7
 #define IOMUX_BT_GPIO_WAKE_UP_HOST() //rk2818_mux_api_set(GPIOA7_FLASHCS3_SEL_NAME,0);
diff --git a/drivers/input/gsensor/mma8452.c b/drivers/input/gsensor/mma8452.c
old mode 100644
new mode 100755
index cccd544d618a..738b5a3c77ab
--- a/drivers/input/gsensor/mma8452.c
+++ b/drivers/input/gsensor/mma8452.c
@@ -40,7 +40,8 @@
 static int  mma8452_probe(struct i2c_client *client, const struct i2c_device_id *id);
 
 #define MMA8452_SPEED		200 * 1000
-#define MMA8452_DEVID		0x1a
+#define MMA8451_DEVID		0x1a
+#define MMA8452_DEVID		0x2a
 /* Addresses to scan -- protected by sense_data_mutex */
 //static char sense_data[RBUFF_SIZE + 1];
 static struct i2c_client *this_client;
@@ -600,6 +601,7 @@ static int  mma8452_probe(struct i2c_client *client, const struct i2c_device_id
 	struct mma8452_data *mma8452;
 	struct mma8452_platform_data *pdata = pdata = client->dev.platform_data;
 	int err;
+	char devid;
 
 	mmaprintk("%s enter\n",__FUNCTION__);
 
@@ -625,7 +627,8 @@ static int  mma8452_probe(struct i2c_client *client, const struct i2c_device_id
 		goto exit_request_gpio_irq_failed;
 	}
 
-	if (MMA8452_DEVID != mma8452_get_devid(this_client)) {
+	devid = mma8452_get_devid(this_client);
+	if ((MMA8452_DEVID != devid) && (MMA8451_DEVID != devid)) {
 		pr_info("mma8452: invalid devid\n");
 		goto exit_invalid_devid;
 	}