diff --git a/drivers/input/sensors/sensor-dev.c b/drivers/input/sensors/sensor-dev.c
index 8ac550cb0675..88feeab9f73f 100644
--- a/drivers/input/sensors/sensor-dev.c
+++ b/drivers/input/sensors/sensor-dev.c
@@ -50,7 +50,6 @@ sensor-dev.c v1.4 add angle calculation support between two gsensors 2013-09-01
 
 #define SENSOR_VERSION_AND_TIME  "sensor-dev.c v1.4 add angle calculation support between two gsensors 2013-09-01"
 
-
 struct sensor_private_data *g_sensor[SENSOR_NUM_TYPES];
 static struct sensor_operate *sensor_ops[SENSOR_NUM_ID];
 static struct class *g_sensor_class[SENSOR_NUM_TYPES];
@@ -2272,6 +2271,7 @@ static const struct i2c_device_id sensor_id[] = {
 	{"mpu6880_acc",ACCEL_ID_MPU6880},
 	{"mpu6500_acc",ACCEL_ID_MPU6500},
 	{"lsm330_acc", ACCEL_ID_LSM330},
+	{"bma2xx_acc", ACCEL_ID_BMA2XX},
 	/*compass*/
 	{"compass", COMPASS_ID_ALL},
 	{"ak8975", COMPASS_ID_AK8975},
@@ -2297,12 +2297,13 @@ static const struct i2c_device_id sensor_id[] = {
 	{"ls_ap321xx", LIGHT_ID_AP321XX},
 	{"ls_photoresistor", LIGHT_ID_PHOTORESISTOR},
 	{"ls_us5152", LIGHT_ID_US5152},
+	{"ls_stk3410", LIGHT_ID_STK3410},
 	/*proximity sensor*/
 	{"psensor", PROXIMITY_ID_ALL},
 	{"proximity_al3006", PROXIMITY_ID_AL3006},
 	{"ps_stk3171", PROXIMITY_ID_STK3171},
 	{"ps_ap321xx", PROXIMITY_ID_AP321XX},
-
+	{"ps_stk3410", PROXIMITY_ID_STK3410},
 	/*temperature*/
 	{"temperature", TEMPERATURE_ID_ALL},
 	{"tmp_ms5607", TEMPERATURE_ID_MS5607},
@@ -2323,6 +2324,7 @@ static struct of_device_id sensor_dt_ids[] = {
 	{ .compatible = "gs_mxc6225" },
 	{ .compatible = "gs_mc3230" },
 	{ .compatible = "lsm330_acc" },
+	{ .compatible = "bma2xx_acc" },
 	/*compass*/
 	{ .compatible = "ak8975" },
 	{ .compatible = "ak8963" },
@@ -2345,6 +2347,8 @@ static struct of_device_id sensor_dt_ids[] = {
 
 	{ .compatible = "ls_photoresistor" },
 	{ .compatible = "ls_us5152" },
+	{ .compatible = "ls_stk3410" },
+	{ .compatible = "ps_stk3410" },
 
 	/*temperature sensor*/
 	{ .compatible = "tmp_ms5607" },
@@ -2357,7 +2361,6 @@ static struct of_device_id sensor_dt_ids[] = {
 	{ }
 };
 
-
 static struct i2c_driver sensor_driver = {
 	.probe = sensor_probe,
 	.remove = sensor_remove,
diff --git a/include/linux/sensor-dev.h b/include/linux/sensor-dev.h
index c5616f6d90ae..6bd411e4da63 100755
--- a/include/linux/sensor-dev.h
+++ b/include/linux/sensor-dev.h
@@ -58,6 +58,7 @@ enum sensor_id {
 	ACCEL_ID_MPU6880,
         ACCEL_ID_MPU6500,
 	ACCEL_ID_LSM330,
+	ACCEL_ID_BMA2XX,
 	COMPASS_ID_ALL,
 	COMPASS_ID_AK8975,
 	COMPASS_ID_AK8963,
@@ -91,11 +92,13 @@ enum sensor_id {
 	LIGHT_ID_AP321XX,
 	LIGHT_ID_PHOTORESISTOR,
 	LIGHT_ID_US5152,
+	LIGHT_ID_STK3410,
 
 	PROXIMITY_ID_ALL,
 	PROXIMITY_ID_AL3006,
 	PROXIMITY_ID_STK3171,
 	PROXIMITY_ID_AP321XX,
+	PROXIMITY_ID_STK3410,
 
 	TEMPERATURE_ID_ALL,
 	TEMPERATURE_ID_MS5607,