Permalink
Browse files

Fascinate-specific sensor fixes for orientation.

General sensor fixes for light level sensor.
  • Loading branch information...
Efpophis committed Mar 26, 2012
1 parent 3cf182e commit 48259042a256262e7432eee448370fdddd302453
@@ -19,12 +19,15 @@ obj-$(CONFIG_INPUT_ATI_REMOTE2) += ati_remote2.o
obj-$(CONFIG_INPUT_ATLAS_BTNS) += atlas_btns.o
obj-$(CONFIG_INPUT_BFIN_ROTARY) += bfin_rotary.o
obj-$(CONFIG_INPUT_BMA023) += bma023.o
-obj-$(CONFIG_INPUT_KR3DH) += kr3dh.o
ifeq ($(CONFIG_SAMSUNG_FASCINATE),y)
obj-$(CONFIG_INPUT_YAS529) += yas529_atlas.o
+obj-$(CONFIG_INPUT_KR3DH) += kr3dh_cdma.o
+obj-$(CONFIG_OPTICAL_GP2A) += gp2a_atlas.o
else
obj-$(CONFIG_INPUT_YAS529) += yas529.o
+obj-$(CONFIG_INPUT_KR3DH) += kr3dh.o
+obj-$(CONFIG_OPTICAL_GP2A) += gp2a.o
endif
obj-$(CONFIG_INPUT_ORIENTATION) += orientation.o
@@ -60,9 +63,3 @@ obj-$(CONFIG_INPUT_WM831X_ON) += wm831x-on.o
obj-$(CONFIG_INPUT_XEN_KBDDEV_FRONTEND) += xen-kbdfront.o
obj-$(CONFIG_INPUT_YEALINK) += yealink.o
-ifeq ($(CONFIG_SAMSUNG_FASCINATE),y)
-obj-$(CONFIG_OPTICAL_GP2A) += gp2a_atlas.o
-else
-obj-$(CONFIG_OPTICAL_GP2A) += gp2a.o
-endif
-
@@ -527,7 +527,7 @@ static int gp2a_i2c_probe(struct i2c_client *client,
}
gp2a->proximity_input_dev = input_dev;
input_set_drvdata(input_dev, gp2a);
- input_dev->name = "proximity_sensor";
+ input_dev->name = "proximity";
input_set_capability(input_dev, EV_ABS, ABS_DISTANCE);
input_set_abs_params(input_dev, ABS_DISTANCE, 0, 1, 0, 0);
@@ -569,7 +569,7 @@ static int gp2a_i2c_probe(struct i2c_client *client,
goto err_input_allocate_device_light;
}
input_set_drvdata(input_dev, gp2a);
- input_dev->name = "light_sensor";
+ input_dev->name = "lightsensor-level";
input_set_capability(input_dev, EV_ABS, ABS_MISC);
input_set_abs_params(input_dev, ABS_MISC, 0, 1, 0, 0);
@@ -30,7 +30,7 @@
#define DEVICE_ID (0x32)
#define KR3DH_NAME "kr3dh"
#define KR3DH_RESOLUTION 16384 /* [count/G] */
-#define GRAVITY_EARTH 9806550
+#define GRAVITY_EARTH 9806650
#define ABSMIN_2G (-GRAVITY_EARTH * 2)
#define ABSMAX_2G (GRAVITY_EARTH * 2)
@@ -415,7 +415,7 @@ static ssize_t kr3dh_delay_store(struct device *dev,
const char *buf, size_t count)
{
unsigned long delay = simple_strtoul(buf, NULL, 10);
-
+
kr3dh_set_delay(dev, delay);
return count;
Oops, something went wrong.

0 comments on commit 4825904

Please sign in to comment.