Hi!
I'm looking at synaptic touchscreen driver... who should be listed as
an author?
Changes I have so far are...
checkpatch only has minor complains -- lines over 80 characters -- but
the code is _way_ too deeply nested with way too little functions.
Pavel
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 339083e..fa3404f 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -94,6 +94,9 @@ config TOUCHSCREEN_GUNZE
config TOUCHSCREEN_ELAN_I2C_8232
tristate "Elan 8232 I2C touchscreen"
depends on I2C
+ help
+ This enables support for Elan over I2C based touchscreens.
+ Such touchscreen is used in HTC Dream.
config TOUCHSCREEN_ELO
tristate "Elo serial touchscreens"
@@ -215,6 +218,8 @@ config TOUCHSCREEN_SYNAPTICS_I2C_RMI
depends on I2C
help
This enables support for Synaptics RMI over I2C based touchscreens.
+ Such touchscreen is used in HTC Dream.
+
config TOUCHSCREEN_TOUCHRIGHT
tristate "Touchright serial touchscreen"
diff --git a/drivers/input/touchscreen/synaptics_i2c_rmi.c b/drivers/input/touchscreen/synaptics_i2c_rmi.c
index a45634b..28213b5 100644
--- a/drivers/input/touchscreen/synaptics_i2c_rmi.c
+++ b/drivers/input/touchscreen/synaptics_i2c_rmi.c
@@ -1,4 +1,5 @@
-/* drivers/input/keyboard/synaptics_i2c_rmi.c
+/*
+ * Support for synaptics touchscreen.
*
* Copyright (C) 2007 Google, Inc.
*
@@ -15,7 +16,6 @@
#include <linux/module.h>
#include <linux/delay.h>
-#include <linux/earlysuspend.h>
#include <linux/hrtimer.h>
#include <linux/i2c.h>
#include <linux/input.h>
@@ -24,18 +24,16 @@
#include <linux/platform_device.h>
#include <linux/synaptics_i2c_rmi.h>
-#define swap(x, y) do { typeof(x) z = x; x = y; y = z; } while (0)
-
static struct workqueue_struct *synaptics_wq;
struct synaptics_ts_data {
- uint16_t addr;
+ u16 addr;
struct i2c_client *client;
struct input_dev *input_dev;
int use_irq;
struct hrtimer timer;
struct work_struct work;
- uint16_t max[2];
+ u16 max[2];
int snap_state[2][2];
int snap_down_on[2];
int snap_down_off[2];
@@ -43,36 +41,35 @@ struct synaptics_ts_data {
int snap_up_off[2];
int snap_down[2];
int snap_up[2];
- uint32_t flags;
+ u32 flags;
int (*power)(int on);
- struct early_suspend early_suspend;
};
-#ifdef CONFIG_HAS_EARLYSUSPEND
-static void synaptics_ts_early_suspend(struct early_suspend *h);
-static void synaptics_ts_late_resume(struct early_suspend *h);
-#endif
-
static int synaptics_init_panel(struct synaptics_ts_data *ts)
{
int ret;
- ret = i2c_smbus_write_byte_data(ts->client, 0xff, 0x10); /* page select = 0x10 */
+ /* page select = 0x10 */
+ ret = i2c_smbus_write_byte_data(ts->client, 0xff, 0x10);
if (ret < 0) {
- printk(KERN_ERR "i2c_smbus_write_byte_data failed for page select\n");
+ printk(KERN_ERR "smbus write failed for page select\n");
goto err_page_select_failed;
}
- ret = i2c_smbus_write_byte_data(ts->client, 0x41, 0x04); /* Set "No Clip Z" */
+
+ /* Set "No Clip Z" */
+ ret = i2c_smbus_write_byte_data(ts->client, 0x41, 0x04);
if (ret < 0)
- printk(KERN_ERR "i2c_smbus_write_byte_data failed for No Clip Z\n");
+ printk(KERN_ERR "smbus write failed for No Clip Z\n");
err_page_select_failed:
- ret = i2c_smbus_write_byte_data(ts->client, 0xff, 0x04); /* page select = 0x04 */
+ /* page select = 0x04 */
+ ret = i2c_smbus_write_byte_data(ts->client, 0xff, 0x04);
if (ret < 0)
- printk(KERN_ERR "i2c_smbus_write_byte_data failed for page select\n");
- ret = i2c_smbus_write_byte_data(ts->client, 0xf0, 0x81); /* normal operation, 80 reports per second */
+ printk(KERN_ERR "smbus write failed for page select\n");
+ /* normal operation, 80 reports per second */
+ ret = i2c_smbus_write_byte_data(ts->client, 0xf0, 0x81);
if (ret < 0)
- printk(KERN_ERR "synaptics_ts_resume: i2c_smbus_write_byte_data failed\n");
+ printk(KERN_ERR "smbus write failed for 80/second\n");
return ret;
}
@@ -82,9 +79,10 @@ static void synaptics_ts_work_func(struct work_struct *work)
int ret;
int bad_data = 0;
struct i2c_msg msg[2];
- uint8_t start_reg;
- uint8_t buf[15];
- struct synaptics_ts_data *ts = container_of(work, struct synaptics_ts_data, work);
+ u8 start_reg;
+ u8 buf[15];
+ struct synaptics_ts_data *ts = \
+ container_of(work, struct synaptics_ts_data, work);
msg[0].addr = ts->client->addr;
msg[0].flags = 0;
@@ -96,19 +94,12 @@ static void synaptics_ts_work_func(struct work_struct *work)
msg[1].len = sizeof(buf);
msg[1].buf = buf;
- /* printk("synaptics_ts_work_func\n"); */
for (i = 0; i < ((ts->use_irq && !bad_data) ? 1 : 10); i++) {
ret = i2c_transfer(ts->client->adapter, msg, 2);
if (ret < 0) {
printk(KERN_ERR "synaptics_ts_work_func: i2c_transfer failed\n");
bad_data = 1;
} else {
- /* printk("synaptics_ts_work_func: %x %x %x %x %x %x" */
- /* " %x %x %x %x %x %x %x %x %x, ret %d\n", */
- /* buf[0], buf[1], buf[2], buf[3], */
- /* buf[4], buf[5], buf[6], buf[7], */
- /* buf[8], buf[9], buf[10], buf[11], */
- /* buf[12], buf[13], buf[14], ret); */
if ((buf[14] & 0xc0) != 0x40) {
printk(KERN_WARNING "synaptics_ts_work_func:"
" bad read %x %x %x %x %x %x %x %x %x"
@@ -130,33 +121,17 @@ static void synaptics_ts_work_func(struct work_struct *work)
int pos[2][2];
int f, a;
int base;
- /* int x = buf[3] | (uint16_t)(buf[2] & 0x1f) << 8; */
- /* int y = buf[5] | (uint16_t)(buf[4] & 0x1f) << 8; */
int z = buf[1];
int w = buf[0] >> 4;
int finger = buf[0] & 7;
-
- /* int x2 = buf[3+6] | (uint16_t)(buf[2+6] & 0x1f) << 8; */
- /* int y2 = buf[5+6] | (uint16_t)(buf[4+6] & 0x1f) << 8; */
- /* int z2 = buf[1+6]; */
- /* int w2 = buf[0+6] >> 4; */
- /* int finger2 = buf[0+6] & 7; */
-
- /* int dx = (int8_t)buf[12]; */
- /* int dy = (int8_t)buf[13]; */
int finger2_pressed;
- /* printk("x %4d, y %4d, z %3d, w %2d, F %d, 2nd: x %4d, y %4d, z %3d, w %2d, F %d, dx %4d, dy %4d\n", */
- /* x, y, z, w, finger, */
- /* x2, y2, z2, w2, finger2, */
- /* dx, dy); */
-
base = 2;
for (f = 0; f < 2; f++) {
- uint32_t flip_flag = SYNAPTICS_FLIP_X;
+ u32 flip_flag = SYNAPTICS_FLIP_X;
for (a = 0; a < 2; a++) {
int p = buf[base + 1];
- p |= (uint16_t)(buf[base] & 0x1f) << 8;
+ p |= (u16)(buf[base] & 0x1f) << 8;
if (ts->flags & flip_flag)
p = ts->max[a] - p;
if (ts->flags & SYNAPTICS_SNAP_TO_INACTIVE_EDGE) {
@@ -209,7 +184,6 @@ static void synaptics_ts_work_func(struct work_struct *work)
static enum hrtimer_restart synaptics_ts_timer_func(struct hrtimer *timer)
{
struct synaptics_ts_data *ts = container_of(timer, struct synaptics_ts_data, timer);
- /* printk("synaptics_ts_timer_func\n"); */
queue_work(synaptics_wq, &ts->work);
@@ -221,7 +195,6 @@ static irqreturn_t synaptics_ts_irq_handler(int irq, void *dev_id)
{
struct synaptics_ts_data *ts = dev_id;
- /* printk("synaptics_ts_irq_handler\n"); */
disable_irq(ts->client->irq);
queue_work(synaptics_wq, &ts->work);
return IRQ_HANDLED;
@@ -231,11 +204,11 @@ static int synaptics_ts_probe(
struct i2c_client *client, const struct i2c_device_id *id)
{
struct synaptics_ts_data *ts;
- uint8_t buf0[4];
- uint8_t buf1[8];
+ u8 buf0[4];
+ u8 buf1[8];
struct i2c_msg msg[2];
int ret = 0;
- uint16_t max_x, max_y;
+ u16 max_x, max_y;
int fuzz_x, fuzz_y, fuzz_p, fuzz_w;
struct synaptics_i2c_rmi_platform_data *pdata;
int inactive_area_left;
@@ -250,7 +223,7 @@ static int synaptics_ts_probe(
int snap_top_off;
int snap_bottom_on;
int snap_bottom_off;
- uint32_t panel_version;
+ u32 panel_version;
if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
printk(KERN_ERR "synaptics_ts_probe: need I2C_FUNC_I2C\n");
@@ -466,7 +439,7 @@ static int synaptics_ts_probe(
input_set_abs_params(ts->input_dev, ABS_TOOL_WIDTH, 0, 15, fuzz_w, 0);
input_set_abs_params(ts->input_dev, ABS_HAT0X, -inactive_area_left, max_x + inactive_area_right, fuzz_x, 0);
input_set_abs_params(ts->input_dev, ABS_HAT0Y, -inactive_area_top, max_y + inactive_area_bottom, fuzz_y, 0);
- /* ts->input_dev->name = ts->keypad_info->name; */
+
ret = input_register_device(ts->input_dev);
if (ret) {
printk(KERN_ERR "synaptics_ts_probe: Unable to register %s input device\n", ts->input_dev->name);
@@ -489,12 +462,6 @@ static int synaptics_ts_probe(
ts->timer.function = synaptics_ts_timer_func;
hrtimer_start(&ts->timer, ktime_set(1, 0), HRTIMER_MODE_REL);
}
-#ifdef CONFIG_HAS_EARLYSUSPEND
- ts->early_suspend.level = EARLY_SUSPEND_LEVEL_BLANK_SCREEN + 1;
- ts->early_suspend.suspend = synaptics_ts_early_suspend;
- ts->early_suspend.resume = synaptics_ts_late_resume;
- register_early_suspend(&ts->early_suspend);
-#endif
printk(KERN_INFO "synaptics_ts_probe: Start touchscreen %s in %s mode\n", ts->input_dev->name, ts->use_irq ? "interrupt" : "polling");
@@ -515,7 +482,7 @@ err_check_functionality_failed:
static int synaptics_ts_remove(struct i2c_client *client)
{
struct synaptics_ts_data *ts = i2c_get_clientdata(client);
- unregister_early_suspend(&ts->early_suspend);
+
if (ts->use_irq)
free_irq(client->irq, ts);
else
@@ -525,72 +492,6 @@ static int synaptics_ts_remove(struct i2c_client *client)
return 0;
}
-static int synaptics_ts_suspend(struct i2c_client *client, pm_message_t mesg)
-{
- int ret;
- struct synaptics_ts_data *ts = i2c_get_clientdata(client);
-
- if (ts->use_irq)
- disable_irq(client->irq);
- else
- hrtimer_cancel(&ts->timer);
- ret = cancel_work_sync(&ts->work);
- if (ret && ts->use_irq) /* if work was pending disable-count is now 2 */
- enable_irq(client->irq);
- ret = i2c_smbus_write_byte_data(ts->client, 0xf1, 0); /* disable interrupt */
- if (ret < 0)
- printk(KERN_ERR "synaptics_ts_suspend: i2c_smbus_write_byte_data failed\n");
-
- ret = i2c_smbus_write_byte_data(client, 0xf0, 0x86); /* deep sleep */
- if (ret < 0)
- printk(KERN_ERR "synaptics_ts_suspend: i2c_smbus_write_byte_data failed\n");
- if (ts->power) {
- ret = ts->power(0);
- if (ret < 0)
- printk(KERN_ERR "synaptics_ts_resume power off failed\n");
- }
- return 0;
-}
-
-static int synaptics_ts_resume(struct i2c_client *client)
-{
- int ret;
- struct synaptics_ts_data *ts = i2c_get_clientdata(client);
-
- if (ts->power) {
- ret = ts->power(1);
- if (ret < 0)
- printk(KERN_ERR "synaptics_ts_resume power on failed\n");
- }
-
- synaptics_init_panel(ts);
-
- if (ts->use_irq)
- enable_irq(client->irq);
-
- if (!ts->use_irq)
- hrtimer_start(&ts->timer, ktime_set(1, 0), HRTIMER_MODE_REL);
- else
- i2c_smbus_write_byte_data(ts->client, 0xf1, 0x01); /* enable abs int */
-
- return 0;
-}
-
-#ifdef CONFIG_HAS_EARLYSUSPEND
-static void synaptics_ts_early_suspend(struct early_suspend *h)
-{
- struct synaptics_ts_data *ts;
- ts = container_of(h, struct synaptics_ts_data, early_suspend);
- synaptics_ts_suspend(ts->client, PMSG_SUSPEND);
-}
-
-static void synaptics_ts_late_resume(struct early_suspend *h)
-{
- struct synaptics_ts_data *ts;
- ts = container_of(h, struct synaptics_ts_data, early_suspend);
- synaptics_ts_resume(ts->client);
-}
-#endif
static const struct i2c_device_id synaptics_ts_id[] = {
{ SYNAPTICS_I2C_RMI_NAME, 0 },
@@ -600,10 +501,6 @@ static const struct i2c_device_id synaptics_ts_id[] = {
static struct i2c_driver synaptics_ts_driver = {
.probe = synaptics_ts_probe,
.remove = synaptics_ts_remove,
-#ifndef CONFIG_HAS_EARLYSUSPEND
- .suspend = synaptics_ts_suspend,
- .resume = synaptics_ts_resume,
-#endif
.id_table = synaptics_ts_id,
.driver = {
.name = SYNAPTICS_I2C_RMI_NAME,
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
On Mon 2009-07-13 22:57:49, Pavel Machek wrote:
> Hi!
>
> I'm looking at synaptic touchscreen driver... who should be listed as
> an author?
>
> Changes I have so far are...
>
> checkpatch only has minor complains -- lines over 80 characters -- but
> the code is _way_ too deeply nested with way too little functions.
Here's better cleanup. But... some functions are still _way_ too big.
Signed-off-by: Pavel Machek <[email protected]>
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 339083e..fa3404f 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -94,6 +94,9 @@ config TOUCHSCREEN_GUNZE
config TOUCHSCREEN_ELAN_I2C_8232
tristate "Elan 8232 I2C touchscreen"
depends on I2C
+ help
+ This enables support for Elan over I2C based touchscreens.
+ Such touchscreen is used in HTC Dream.
config TOUCHSCREEN_ELO
tristate "Elo serial touchscreens"
@@ -215,6 +218,8 @@ config TOUCHSCREEN_SYNAPTICS_I2C_RMI
depends on I2C
help
This enables support for Synaptics RMI over I2C based touchscreens.
+ Such touchscreen is used in HTC Dream.
+
config TOUCHSCREEN_TOUCHRIGHT
tristate "Touchright serial touchscreen"
diff --git a/drivers/input/touchscreen/synaptics_i2c_rmi.c b/drivers/input/touchscreen/synaptics_i2c_rmi.c
index a45634b..f582582 100644
--- a/drivers/input/touchscreen/synaptics_i2c_rmi.c
+++ b/drivers/input/touchscreen/synaptics_i2c_rmi.c
@@ -1,4 +1,5 @@
-/* drivers/input/keyboard/synaptics_i2c_rmi.c
+/*
+ * Support for synaptics touchscreen.
*
* Copyright (C) 2007 Google, Inc.
*
@@ -15,7 +16,6 @@
#include <linux/module.h>
#include <linux/delay.h>
-#include <linux/earlysuspend.h>
#include <linux/hrtimer.h>
#include <linux/i2c.h>
#include <linux/input.h>
@@ -24,18 +24,16 @@
#include <linux/platform_device.h>
#include <linux/synaptics_i2c_rmi.h>
-#define swap(x, y) do { typeof(x) z = x; x = y; y = z; } while (0)
-
static struct workqueue_struct *synaptics_wq;
struct synaptics_ts_data {
- uint16_t addr;
+ u16 addr;
struct i2c_client *client;
struct input_dev *input_dev;
int use_irq;
struct hrtimer timer;
struct work_struct work;
- uint16_t max[2];
+ u16 max[2];
int snap_state[2][2];
int snap_down_on[2];
int snap_down_off[2];
@@ -43,164 +41,142 @@ struct synaptics_ts_data {
int snap_up_off[2];
int snap_down[2];
int snap_up[2];
- uint32_t flags;
+ u32 flags;
int (*power)(int on);
- struct early_suspend early_suspend;
};
-#ifdef CONFIG_HAS_EARLYSUSPEND
-static void synaptics_ts_early_suspend(struct early_suspend *h);
-static void synaptics_ts_late_resume(struct early_suspend *h);
-#endif
-
static int synaptics_init_panel(struct synaptics_ts_data *ts)
{
int ret;
- ret = i2c_smbus_write_byte_data(ts->client, 0xff, 0x10); /* page select = 0x10 */
+ /* page select = 0x10 */
+ ret = i2c_smbus_write_byte_data(ts->client, 0xff, 0x10);
if (ret < 0) {
- printk(KERN_ERR "i2c_smbus_write_byte_data failed for page select\n");
+ printk(KERN_ERR "smbus write failed for page select\n");
goto err_page_select_failed;
}
- ret = i2c_smbus_write_byte_data(ts->client, 0x41, 0x04); /* Set "No Clip Z" */
+
+ /* Set "No Clip Z" */
+ ret = i2c_smbus_write_byte_data(ts->client, 0x41, 0x04);
if (ret < 0)
- printk(KERN_ERR "i2c_smbus_write_byte_data failed for No Clip Z\n");
+ printk(KERN_ERR "smbus write failed for No Clip Z\n");
err_page_select_failed:
- ret = i2c_smbus_write_byte_data(ts->client, 0xff, 0x04); /* page select = 0x04 */
+ /* page select = 0x04 */
+ ret = i2c_smbus_write_byte_data(ts->client, 0xff, 0x04);
if (ret < 0)
- printk(KERN_ERR "i2c_smbus_write_byte_data failed for page select\n");
- ret = i2c_smbus_write_byte_data(ts->client, 0xf0, 0x81); /* normal operation, 80 reports per second */
+ printk(KERN_ERR "smbus write failed for page select\n");
+ /* normal operation, 80 reports per second */
+ ret = i2c_smbus_write_byte_data(ts->client, 0xf0, 0x81);
if (ret < 0)
- printk(KERN_ERR "synaptics_ts_resume: i2c_smbus_write_byte_data failed\n");
+ printk(KERN_ERR "smbus write failed for 80/second\n");
return ret;
}
+static void decode_report(struct synaptics_ts_data *ts, u8 *buf)
+{
+ int pos[2][2];
+ int f, a;
+ int base = 2;
+ int z = buf[1];
+ int w = buf[0] >> 4;
+ int finger = buf[0] & 7;
+ int finger2_pressed;
+
+ for (f = 0; f < 2; f++) {
+ u32 flip_flag = SYNAPTICS_FLIP_X;
+ for (a = 0; a < 2; a++) {
+ int p = buf[base + 1];
+ p |= (u16)(buf[base] & 0x1f) << 8;
+ if (ts->flags & flip_flag)
+ p = ts->max[a] - p;
+ if (ts->flags & SYNAPTICS_SNAP_TO_INACTIVE_EDGE) {
+ if (ts->snap_state[f][a]) {
+ if (p <= ts->snap_down_off[a])
+ p = ts->snap_down[a];
+ else if (p >= ts->snap_up_off[a])
+ p = ts->snap_up[a];
+ else
+ ts->snap_state[f][a] = 0;
+ } else {
+ if (p <= ts->snap_down_on[a]) {
+ p = ts->snap_down[a];
+ ts->snap_state[f][a] = 1;
+ } else if (p >= ts->snap_up_on[a]) {
+ p = ts->snap_up[a];
+ ts->snap_state[f][a] = 1;
+ }
+ }
+ }
+ pos[f][a] = p;
+ base += 2;
+ flip_flag <<= 1;
+ }
+ base += 2;
+ if (ts->flags & SYNAPTICS_SWAP_XY)
+ swap(pos[f][0], pos[f][1]);
+ }
+ if (z) {
+ input_report_abs(ts->input_dev, ABS_X, pos[0][0]);
+ input_report_abs(ts->input_dev, ABS_Y, pos[0][1]);
+ }
+ input_report_abs(ts->input_dev, ABS_PRESSURE, z);
+ input_report_abs(ts->input_dev, ABS_TOOL_WIDTH, w);
+ input_report_key(ts->input_dev, BTN_TOUCH, finger);
+ finger2_pressed = finger > 1 && finger != 7;
+ input_report_key(ts->input_dev, BTN_2, finger2_pressed);
+ if (finger2_pressed) {
+ input_report_abs(ts->input_dev, ABS_HAT0X, pos[1][0]);
+ input_report_abs(ts->input_dev, ABS_HAT0Y, pos[1][1]);
+ }
+ input_sync(ts->input_dev);
+}
+
static void synaptics_ts_work_func(struct work_struct *work)
{
int i;
int ret;
int bad_data = 0;
struct i2c_msg msg[2];
- uint8_t start_reg;
- uint8_t buf[15];
- struct synaptics_ts_data *ts = container_of(work, struct synaptics_ts_data, work);
+ u8 start_reg = 0;
+ u8 buf[15];
+ struct synaptics_ts_data *ts =
+ container_of(work, struct synaptics_ts_data, work);
msg[0].addr = ts->client->addr;
msg[0].flags = 0;
msg[0].len = 1;
msg[0].buf = &start_reg;
- start_reg = 0x00;
msg[1].addr = ts->client->addr;
msg[1].flags = I2C_M_RD;
msg[1].len = sizeof(buf);
msg[1].buf = buf;
- /* printk("synaptics_ts_work_func\n"); */
for (i = 0; i < ((ts->use_irq && !bad_data) ? 1 : 10); i++) {
ret = i2c_transfer(ts->client->adapter, msg, 2);
if (ret < 0) {
- printk(KERN_ERR "synaptics_ts_work_func: i2c_transfer failed\n");
+ printk(KERN_ERR "ts_work: i2c_transfer failed\n");
bad_data = 1;
- } else {
- /* printk("synaptics_ts_work_func: %x %x %x %x %x %x" */
- /* " %x %x %x %x %x %x %x %x %x, ret %d\n", */
- /* buf[0], buf[1], buf[2], buf[3], */
- /* buf[4], buf[5], buf[6], buf[7], */
- /* buf[8], buf[9], buf[10], buf[11], */
- /* buf[12], buf[13], buf[14], ret); */
- if ((buf[14] & 0xc0) != 0x40) {
- printk(KERN_WARNING "synaptics_ts_work_func:"
- " bad read %x %x %x %x %x %x %x %x %x"
- " %x %x %x %x %x %x, ret %d\n",
- buf[0], buf[1], buf[2], buf[3],
- buf[4], buf[5], buf[6], buf[7],
- buf[8], buf[9], buf[10], buf[11],
- buf[12], buf[13], buf[14], ret);
- if (bad_data)
- synaptics_init_panel(ts);
- bad_data = 1;
- continue;
- }
- bad_data = 0;
- if ((buf[14] & 1) == 0) {
- /* printk("read %d coordinates\n", i); */
- break;
- } else {
- int pos[2][2];
- int f, a;
- int base;
- /* int x = buf[3] | (uint16_t)(buf[2] & 0x1f) << 8; */
- /* int y = buf[5] | (uint16_t)(buf[4] & 0x1f) << 8; */
- int z = buf[1];
- int w = buf[0] >> 4;
- int finger = buf[0] & 7;
-
- /* int x2 = buf[3+6] | (uint16_t)(buf[2+6] & 0x1f) << 8; */
- /* int y2 = buf[5+6] | (uint16_t)(buf[4+6] & 0x1f) << 8; */
- /* int z2 = buf[1+6]; */
- /* int w2 = buf[0+6] >> 4; */
- /* int finger2 = buf[0+6] & 7; */
-
- /* int dx = (int8_t)buf[12]; */
- /* int dy = (int8_t)buf[13]; */
- int finger2_pressed;
-
- /* printk("x %4d, y %4d, z %3d, w %2d, F %d, 2nd: x %4d, y %4d, z %3d, w %2d, F %d, dx %4d, dy %4d\n", */
- /* x, y, z, w, finger, */
- /* x2, y2, z2, w2, finger2, */
- /* dx, dy); */
-
- base = 2;
- for (f = 0; f < 2; f++) {
- uint32_t flip_flag = SYNAPTICS_FLIP_X;
- for (a = 0; a < 2; a++) {
- int p = buf[base + 1];
- p |= (uint16_t)(buf[base] & 0x1f) << 8;
- if (ts->flags & flip_flag)
- p = ts->max[a] - p;
- if (ts->flags & SYNAPTICS_SNAP_TO_INACTIVE_EDGE) {
- if (ts->snap_state[f][a]) {
- if (p <= ts->snap_down_off[a])
- p = ts->snap_down[a];
- else if (p >= ts->snap_up_off[a])
- p = ts->snap_up[a];
- else
- ts->snap_state[f][a] = 0;
- } else {
- if (p <= ts->snap_down_on[a]) {
- p = ts->snap_down[a];
- ts->snap_state[f][a] = 1;
- } else if (p >= ts->snap_up_on[a]) {
- p = ts->snap_up[a];
- ts->snap_state[f][a] = 1;
- }
- }
- }
- pos[f][a] = p;
- base += 2;
- flip_flag <<= 1;
- }
- base += 2;
- if (ts->flags & SYNAPTICS_SWAP_XY)
- swap(pos[f][0], pos[f][1]);
- }
- if (z) {
- input_report_abs(ts->input_dev, ABS_X, pos[0][0]);
- input_report_abs(ts->input_dev, ABS_Y, pos[0][1]);
- }
- input_report_abs(ts->input_dev, ABS_PRESSURE, z);
- input_report_abs(ts->input_dev, ABS_TOOL_WIDTH, w);
- input_report_key(ts->input_dev, BTN_TOUCH, finger);
- finger2_pressed = finger > 1 && finger != 7;
- input_report_key(ts->input_dev, BTN_2, finger2_pressed);
- if (finger2_pressed) {
- input_report_abs(ts->input_dev, ABS_HAT0X, pos[1][0]);
- input_report_abs(ts->input_dev, ABS_HAT0Y, pos[1][1]);
- }
- input_sync(ts->input_dev);
- }
+ continue;
+ }
+ if ((buf[14] & 0xc0) != 0x40) {
+ printk(KERN_WARNING "synaptics_ts_work_func:"
+ " bad read %x %x %x %x %x %x %x %x %x"
+ " %x %x %x %x %x %x, ret %d\n",
+ buf[0], buf[1], buf[2], buf[3],
+ buf[4], buf[5], buf[6], buf[7],
+ buf[8], buf[9], buf[10], buf[11],
+ buf[12], buf[13], buf[14], ret);
+ if (bad_data)
+ synaptics_init_panel(ts);
+ bad_data = 1;
+ continue;
}
+ bad_data = 0;
+ if ((buf[14] & 1) == 0)
+ break;
+
+ decode_report(ts, buf);
}
if (ts->use_irq)
enable_irq(ts->client->irq);
@@ -208,8 +184,8 @@ static void synaptics_ts_work_func(struct work_struct *work)
static enum hrtimer_restart synaptics_ts_timer_func(struct hrtimer *timer)
{
- struct synaptics_ts_data *ts = container_of(timer, struct synaptics_ts_data, timer);
- /* printk("synaptics_ts_timer_func\n"); */
+ struct synaptics_ts_data *ts =
+ container_of(timer, struct synaptics_ts_data, timer);
queue_work(synaptics_wq, &ts->work);
@@ -221,36 +197,145 @@ static irqreturn_t synaptics_ts_irq_handler(int irq, void *dev_id)
{
struct synaptics_ts_data *ts = dev_id;
- /* printk("synaptics_ts_irq_handler\n"); */
disable_irq(ts->client->irq);
queue_work(synaptics_wq, &ts->work);
return IRQ_HANDLED;
}
+static int detect(struct synaptics_ts_data *ts, u32 *panel_version)
+{
+ int ret;
+ int retry = 10;
+
+ /* device command = reset */
+ ret = i2c_smbus_write_byte_data(ts->client, 0xf4, 0x01);
+ if (ret < 0) {
+ printk(KERN_ERR "i2c_smbus_write_byte_data failed\n");
+ /* fail? */
+ }
+
+ while (retry-- > 0) {
+ ret = i2c_smbus_read_byte_data(ts->client, 0xe4);
+ if (ret >= 0)
+ break;
+ msleep(100);
+ }
+ if (ret < 0) {
+ printk(KERN_ERR "i2c_smbus_read_byte_data failed\n");
+ return ret;
+ }
+
+ printk(KERN_INFO "synaptics_ts_probe: Product Major Version %x\n", ret);
+ *panel_version = ret << 8;
+ ret = i2c_smbus_read_byte_data(ts->client, 0xe5);
+ if (ret < 0) {
+ printk(KERN_ERR "i2c_smbus_read_byte_data failed\n");
+ return ret;
+ }
+ printk(KERN_INFO "synaptics_ts_probe: Product Minor Version %x\n", ret);
+ *panel_version |= ret;
+
+ ret = i2c_smbus_read_byte_data(ts->client, 0xe3);
+ if (ret < 0) {
+ printk(KERN_ERR "i2c_smbus_read_byte_data failed\n");
+ return ret;
+ }
+ printk(KERN_INFO "synaptics_ts_probe: product property %x\n", ret);
+ return 0;
+}
+
+static void compute_areas(struct synaptics_ts_data *ts,
+ struct synaptics_i2c_rmi_platform_data *pdata,
+ u16 max_x, u16 max_y)
+{
+ u32 inactive_area_left;
+ u32 inactive_area_right;
+ u32 inactive_area_top;
+ u32 inactive_area_bottom;
+ u32 snap_left_on;
+ u32 snap_left_off;
+ u32 snap_right_on;
+ u32 snap_right_off;
+ u32 snap_top_on;
+ u32 snap_top_off;
+ u32 snap_bottom_on;
+ u32 snap_bottom_off;
+ u32 fuzz_x;
+ u32 fuzz_y;
+ int fuzz_p;
+ int fuzz_w;
+
+ inactive_area_left = pdata->inactive_left;
+ inactive_area_right = pdata->inactive_right;
+ inactive_area_top = pdata->inactive_top;
+ inactive_area_bottom = pdata->inactive_bottom;
+ snap_left_on = pdata->snap_left_on;
+ snap_left_off = pdata->snap_left_off;
+ snap_right_on = pdata->snap_right_on;
+ snap_right_off = pdata->snap_right_off;
+ snap_top_on = pdata->snap_top_on;
+ snap_top_off = pdata->snap_top_off;
+ snap_bottom_on = pdata->snap_bottom_on;
+ snap_bottom_off = pdata->snap_bottom_off;
+ fuzz_x = pdata->fuzz_x;
+ fuzz_y = pdata->fuzz_y;
+ fuzz_p = pdata->fuzz_p;
+ fuzz_w = pdata->fuzz_w;
+
+ inactive_area_left = inactive_area_left * max_x / 0x10000;
+ inactive_area_right = inactive_area_right * max_x / 0x10000;
+ inactive_area_top = inactive_area_top * max_y / 0x10000;
+ inactive_area_bottom = inactive_area_bottom * max_y / 0x10000;
+ snap_left_on = snap_left_on * max_x / 0x10000;
+ snap_left_off = snap_left_off * max_x / 0x10000;
+ snap_right_on = snap_right_on * max_x / 0x10000;
+ snap_right_off = snap_right_off * max_x / 0x10000;
+ snap_top_on = snap_top_on * max_y / 0x10000;
+ snap_top_off = snap_top_off * max_y / 0x10000;
+ snap_bottom_on = snap_bottom_on * max_y / 0x10000;
+ snap_bottom_off = snap_bottom_off * max_y / 0x10000;
+ fuzz_x = fuzz_x * max_x / 0x10000;
+ fuzz_y = fuzz_y * max_y / 0x10000;
+
+ ts->snap_down[!!(ts->flags & SYNAPTICS_SWAP_XY)] = -inactive_area_left;
+ ts->snap_up[!!(ts->flags & SYNAPTICS_SWAP_XY)] = max_x + inactive_area_right;
+ ts->snap_down[!(ts->flags & SYNAPTICS_SWAP_XY)] = -inactive_area_top;
+ ts->snap_up[!(ts->flags & SYNAPTICS_SWAP_XY)] = max_y + inactive_area_bottom;
+ ts->snap_down_on[!!(ts->flags & SYNAPTICS_SWAP_XY)] = snap_left_on;
+ ts->snap_down_off[!!(ts->flags & SYNAPTICS_SWAP_XY)] = snap_left_off;
+ ts->snap_up_on[!!(ts->flags & SYNAPTICS_SWAP_XY)] = max_x - snap_right_on;
+ ts->snap_up_off[!!(ts->flags & SYNAPTICS_SWAP_XY)] = max_x - snap_right_off;
+ ts->snap_down_on[!(ts->flags & SYNAPTICS_SWAP_XY)] = snap_top_on;
+ ts->snap_down_off[!(ts->flags & SYNAPTICS_SWAP_XY)] = snap_top_off;
+ ts->snap_up_on[!(ts->flags & SYNAPTICS_SWAP_XY)] = max_y - snap_bottom_on;
+ ts->snap_up_off[!(ts->flags & SYNAPTICS_SWAP_XY)] = max_y - snap_bottom_off;
+ printk(KERN_INFO "synaptics_ts_probe: max_x %d, max_y %d\n", max_x, max_y);
+ printk(KERN_INFO "synaptics_ts_probe: inactive_x %d %d, inactive_y %d %d\n",
+ inactive_area_left, inactive_area_right,
+ inactive_area_top, inactive_area_bottom);
+ printk(KERN_INFO "synaptics_ts_probe: snap_x %d-%d %d-%d, snap_y %d-%d %d-%d\n",
+ snap_left_on, snap_left_off, snap_right_on, snap_right_off,
+ snap_top_on, snap_top_off, snap_bottom_on, snap_bottom_off);
+
+ input_set_abs_params(ts->input_dev, ABS_X, -inactive_area_left, max_x + inactive_area_right, fuzz_x, 0);
+ input_set_abs_params(ts->input_dev, ABS_Y, -inactive_area_top, max_y + inactive_area_bottom, fuzz_y, 0);
+ input_set_abs_params(ts->input_dev, ABS_PRESSURE, 0, 255, fuzz_p, 0);
+ input_set_abs_params(ts->input_dev, ABS_TOOL_WIDTH, 0, 15, fuzz_w, 0);
+ input_set_abs_params(ts->input_dev, ABS_HAT0X, -inactive_area_left, max_x + inactive_area_right, fuzz_x, 0);
+ input_set_abs_params(ts->input_dev, ABS_HAT0Y, -inactive_area_top, max_y + inactive_area_bottom, fuzz_y, 0);
+}
+
static int synaptics_ts_probe(
struct i2c_client *client, const struct i2c_device_id *id)
{
struct synaptics_ts_data *ts;
- uint8_t buf0[4];
- uint8_t buf1[8];
+ u8 buf0[4];
+ u8 buf1[8];
struct i2c_msg msg[2];
int ret = 0;
- uint16_t max_x, max_y;
- int fuzz_x, fuzz_y, fuzz_p, fuzz_w;
struct synaptics_i2c_rmi_platform_data *pdata;
- int inactive_area_left;
- int inactive_area_right;
- int inactive_area_top;
- int inactive_area_bottom;
- int snap_left_on;
- int snap_left_off;
- int snap_right_on;
- int snap_right_off;
- int snap_top_on;
- int snap_top_off;
- int snap_bottom_on;
- int snap_bottom_off;
- uint32_t panel_version;
+ u32 panel_version = 0;
+ u16 max_x, max_y;
if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
printk(KERN_ERR "synaptics_ts_probe: need I2C_FUNC_I2C\n");
@@ -269,6 +354,9 @@ static int synaptics_ts_probe(
pdata = client->dev.platform_data;
if (pdata)
ts->power = pdata->power;
+ else
+ pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
+
if (ts->power) {
ret = ts->power(1);
if (ret < 0) {
@@ -277,81 +365,16 @@ static int synaptics_ts_probe(
}
}
- ret = i2c_smbus_write_byte_data(ts->client, 0xf4, 0x01); /* device command = reset */
- if (ret < 0) {
- printk(KERN_ERR "i2c_smbus_write_byte_data failed\n");
- /* fail? */
- }
- {
- int retry = 10;
- while (retry-- > 0) {
- ret = i2c_smbus_read_byte_data(ts->client, 0xe4);
- if (ret >= 0)
- break;
- msleep(100);
- }
- }
- if (ret < 0) {
- printk(KERN_ERR "i2c_smbus_read_byte_data failed\n");
- goto err_detect_failed;
- }
- printk(KERN_INFO "synaptics_ts_probe: Product Major Version %x\n", ret);
- panel_version = ret << 8;
- ret = i2c_smbus_read_byte_data(ts->client, 0xe5);
- if (ret < 0) {
- printk(KERN_ERR "i2c_smbus_read_byte_data failed\n");
- goto err_detect_failed;
- }
- printk(KERN_INFO "synaptics_ts_probe: Product Minor Version %x\n", ret);
- panel_version |= ret;
-
- ret = i2c_smbus_read_byte_data(ts->client, 0xe3);
- if (ret < 0) {
- printk(KERN_ERR "i2c_smbus_read_byte_data failed\n");
+ ret = detect(ts, &panel_version);
+ if (ret)
goto err_detect_failed;
- }
- printk(KERN_INFO "synaptics_ts_probe: product property %x\n", ret);
- if (pdata) {
- while (pdata->version > panel_version)
- pdata++;
- ts->flags = pdata->flags;
- inactive_area_left = pdata->inactive_left;
- inactive_area_right = pdata->inactive_right;
- inactive_area_top = pdata->inactive_top;
- inactive_area_bottom = pdata->inactive_bottom;
- snap_left_on = pdata->snap_left_on;
- snap_left_off = pdata->snap_left_off;
- snap_right_on = pdata->snap_right_on;
- snap_right_off = pdata->snap_right_off;
- snap_top_on = pdata->snap_top_on;
- snap_top_off = pdata->snap_top_off;
- snap_bottom_on = pdata->snap_bottom_on;
- snap_bottom_off = pdata->snap_bottom_off;
- fuzz_x = pdata->fuzz_x;
- fuzz_y = pdata->fuzz_y;
- fuzz_p = pdata->fuzz_p;
- fuzz_w = pdata->fuzz_w;
- } else {
- inactive_area_left = 0;
- inactive_area_right = 0;
- inactive_area_top = 0;
- inactive_area_bottom = 0;
- snap_left_on = 0;
- snap_left_off = 0;
- snap_right_on = 0;
- snap_right_off = 0;
- snap_top_on = 0;
- snap_top_off = 0;
- snap_bottom_on = 0;
- snap_bottom_off = 0;
- fuzz_x = 0;
- fuzz_y = 0;
- fuzz_p = 0;
- fuzz_w = 0;
- }
+ while (pdata->version > panel_version)
+ pdata++;
+ ts->flags = pdata->flags;
ret = i2c_smbus_read_byte_data(ts->client, 0xf0);
+
if (ret < 0) {
printk(KERN_ERR "i2c_smbus_read_byte_data failed\n");
goto err_detect_failed;
@@ -427,46 +450,10 @@ static int synaptics_ts_probe(
set_bit(BTN_TOUCH, ts->input_dev->keybit);
set_bit(BTN_2, ts->input_dev->keybit);
set_bit(EV_ABS, ts->input_dev->evbit);
- inactive_area_left = inactive_area_left * max_x / 0x10000;
- inactive_area_right = inactive_area_right * max_x / 0x10000;
- inactive_area_top = inactive_area_top * max_y / 0x10000;
- inactive_area_bottom = inactive_area_bottom * max_y / 0x10000;
- snap_left_on = snap_left_on * max_x / 0x10000;
- snap_left_off = snap_left_off * max_x / 0x10000;
- snap_right_on = snap_right_on * max_x / 0x10000;
- snap_right_off = snap_right_off * max_x / 0x10000;
- snap_top_on = snap_top_on * max_y / 0x10000;
- snap_top_off = snap_top_off * max_y / 0x10000;
- snap_bottom_on = snap_bottom_on * max_y / 0x10000;
- snap_bottom_off = snap_bottom_off * max_y / 0x10000;
- fuzz_x = fuzz_x * max_x / 0x10000;
- fuzz_y = fuzz_y * max_y / 0x10000;
- ts->snap_down[!!(ts->flags & SYNAPTICS_SWAP_XY)] = -inactive_area_left;
- ts->snap_up[!!(ts->flags & SYNAPTICS_SWAP_XY)] = max_x + inactive_area_right;
- ts->snap_down[!(ts->flags & SYNAPTICS_SWAP_XY)] = -inactive_area_top;
- ts->snap_up[!(ts->flags & SYNAPTICS_SWAP_XY)] = max_y + inactive_area_bottom;
- ts->snap_down_on[!!(ts->flags & SYNAPTICS_SWAP_XY)] = snap_left_on;
- ts->snap_down_off[!!(ts->flags & SYNAPTICS_SWAP_XY)] = snap_left_off;
- ts->snap_up_on[!!(ts->flags & SYNAPTICS_SWAP_XY)] = max_x - snap_right_on;
- ts->snap_up_off[!!(ts->flags & SYNAPTICS_SWAP_XY)] = max_x - snap_right_off;
- ts->snap_down_on[!(ts->flags & SYNAPTICS_SWAP_XY)] = snap_top_on;
- ts->snap_down_off[!(ts->flags & SYNAPTICS_SWAP_XY)] = snap_top_off;
- ts->snap_up_on[!(ts->flags & SYNAPTICS_SWAP_XY)] = max_y - snap_bottom_on;
- ts->snap_up_off[!(ts->flags & SYNAPTICS_SWAP_XY)] = max_y - snap_bottom_off;
- printk(KERN_INFO "synaptics_ts_probe: max_x %d, max_y %d\n", max_x, max_y);
- printk(KERN_INFO "synaptics_ts_probe: inactive_x %d %d, inactive_y %d %d\n",
- inactive_area_left, inactive_area_right,
- inactive_area_top, inactive_area_bottom);
- printk(KERN_INFO "synaptics_ts_probe: snap_x %d-%d %d-%d, snap_y %d-%d %d-%d\n",
- snap_left_on, snap_left_off, snap_right_on, snap_right_off,
- snap_top_on, snap_top_off, snap_bottom_on, snap_bottom_off);
- input_set_abs_params(ts->input_dev, ABS_X, -inactive_area_left, max_x + inactive_area_right, fuzz_x, 0);
- input_set_abs_params(ts->input_dev, ABS_Y, -inactive_area_top, max_y + inactive_area_bottom, fuzz_y, 0);
- input_set_abs_params(ts->input_dev, ABS_PRESSURE, 0, 255, fuzz_p, 0);
- input_set_abs_params(ts->input_dev, ABS_TOOL_WIDTH, 0, 15, fuzz_w, 0);
- input_set_abs_params(ts->input_dev, ABS_HAT0X, -inactive_area_left, max_x + inactive_area_right, fuzz_x, 0);
- input_set_abs_params(ts->input_dev, ABS_HAT0Y, -inactive_area_top, max_y + inactive_area_bottom, fuzz_y, 0);
- /* ts->input_dev->name = ts->keypad_info->name; */
+
+ compute_areas(ts, pdata, max_x, max_y);
+
+
ret = input_register_device(ts->input_dev);
if (ret) {
printk(KERN_ERR "synaptics_ts_probe: Unable to register %s input device\n", ts->input_dev->name);
@@ -489,33 +476,27 @@ static int synaptics_ts_probe(
ts->timer.function = synaptics_ts_timer_func;
hrtimer_start(&ts->timer, ktime_set(1, 0), HRTIMER_MODE_REL);
}
-#ifdef CONFIG_HAS_EARLYSUSPEND
- ts->early_suspend.level = EARLY_SUSPEND_LEVEL_BLANK_SCREEN + 1;
- ts->early_suspend.suspend = synaptics_ts_early_suspend;
- ts->early_suspend.resume = synaptics_ts_late_resume;
- register_early_suspend(&ts->early_suspend);
-#endif
printk(KERN_INFO "synaptics_ts_probe: Start touchscreen %s in %s mode\n", ts->input_dev->name, ts->use_irq ? "interrupt" : "polling");
return 0;
-err_input_register_device_failed:
+ err_input_register_device_failed:
input_free_device(ts->input_dev);
-err_input_dev_alloc_failed:
-err_detect_failed:
-err_power_failed:
+ err_input_dev_alloc_failed:
+ err_detect_failed:
+ err_power_failed:
kfree(ts);
-err_alloc_data_failed:
-err_check_functionality_failed:
+ err_alloc_data_failed:
+ err_check_functionality_failed:
return ret;
}
static int synaptics_ts_remove(struct i2c_client *client)
{
struct synaptics_ts_data *ts = i2c_get_clientdata(client);
- unregister_early_suspend(&ts->early_suspend);
+
if (ts->use_irq)
free_irq(client->irq, ts);
else
@@ -525,72 +506,6 @@ static int synaptics_ts_remove(struct i2c_client *client)
return 0;
}
-static int synaptics_ts_suspend(struct i2c_client *client, pm_message_t mesg)
-{
- int ret;
- struct synaptics_ts_data *ts = i2c_get_clientdata(client);
-
- if (ts->use_irq)
- disable_irq(client->irq);
- else
- hrtimer_cancel(&ts->timer);
- ret = cancel_work_sync(&ts->work);
- if (ret && ts->use_irq) /* if work was pending disable-count is now 2 */
- enable_irq(client->irq);
- ret = i2c_smbus_write_byte_data(ts->client, 0xf1, 0); /* disable interrupt */
- if (ret < 0)
- printk(KERN_ERR "synaptics_ts_suspend: i2c_smbus_write_byte_data failed\n");
-
- ret = i2c_smbus_write_byte_data(client, 0xf0, 0x86); /* deep sleep */
- if (ret < 0)
- printk(KERN_ERR "synaptics_ts_suspend: i2c_smbus_write_byte_data failed\n");
- if (ts->power) {
- ret = ts->power(0);
- if (ret < 0)
- printk(KERN_ERR "synaptics_ts_resume power off failed\n");
- }
- return 0;
-}
-
-static int synaptics_ts_resume(struct i2c_client *client)
-{
- int ret;
- struct synaptics_ts_data *ts = i2c_get_clientdata(client);
-
- if (ts->power) {
- ret = ts->power(1);
- if (ret < 0)
- printk(KERN_ERR "synaptics_ts_resume power on failed\n");
- }
-
- synaptics_init_panel(ts);
-
- if (ts->use_irq)
- enable_irq(client->irq);
-
- if (!ts->use_irq)
- hrtimer_start(&ts->timer, ktime_set(1, 0), HRTIMER_MODE_REL);
- else
- i2c_smbus_write_byte_data(ts->client, 0xf1, 0x01); /* enable abs int */
-
- return 0;
-}
-
-#ifdef CONFIG_HAS_EARLYSUSPEND
-static void synaptics_ts_early_suspend(struct early_suspend *h)
-{
- struct synaptics_ts_data *ts;
- ts = container_of(h, struct synaptics_ts_data, early_suspend);
- synaptics_ts_suspend(ts->client, PMSG_SUSPEND);
-}
-
-static void synaptics_ts_late_resume(struct early_suspend *h)
-{
- struct synaptics_ts_data *ts;
- ts = container_of(h, struct synaptics_ts_data, early_suspend);
- synaptics_ts_resume(ts->client);
-}
-#endif
static const struct i2c_device_id synaptics_ts_id[] = {
{ SYNAPTICS_I2C_RMI_NAME, 0 },
@@ -600,10 +515,6 @@ static const struct i2c_device_id synaptics_ts_id[] = {
static struct i2c_driver synaptics_ts_driver = {
.probe = synaptics_ts_probe,
.remove = synaptics_ts_remove,
-#ifndef CONFIG_HAS_EARLYSUSPEND
- .suspend = synaptics_ts_suspend,
- .resume = synaptics_ts_resume,
-#endif
.id_table = synaptics_ts_id,
.driver = {
.name = SYNAPTICS_I2C_RMI_NAME,
diff --git a/include/linux/synaptics_i2c_rmi.h b/include/linux/synaptics_i2c_rmi.h
index ca51b2f..73e1de7 100644
--- a/include/linux/synaptics_i2c_rmi.h
+++ b/include/linux/synaptics_i2c_rmi.h
@@ -1,5 +1,5 @@
/*
- * include/linux/synaptics_i2c_rmi.h - platform data structure for f75375s sensor
+ * synaptics_i2c_rmi.h - platform data structure for f75375s sensor
*
* Copyright (C) 2008 Google, Inc.
*
@@ -27,25 +27,25 @@ enum {
};
struct synaptics_i2c_rmi_platform_data {
- uint32_t version; /* Use this entry for panels with */
+ u32 version; /* Use this entry for panels with */
/* (major << 8 | minor) version or above. */
/* If non-zero another array entry follows */
int (*power)(int on); /* Only valid in first array entry */
- uint32_t flags;
- uint32_t inactive_left; /* 0x10000 = screen width */
- uint32_t inactive_right; /* 0x10000 = screen width */
- uint32_t inactive_top; /* 0x10000 = screen height */
- uint32_t inactive_bottom; /* 0x10000 = screen height */
- uint32_t snap_left_on; /* 0x10000 = screen width */
- uint32_t snap_left_off; /* 0x10000 = screen width */
- uint32_t snap_right_on; /* 0x10000 = screen width */
- uint32_t snap_right_off; /* 0x10000 = screen width */
- uint32_t snap_top_on; /* 0x10000 = screen height */
- uint32_t snap_top_off; /* 0x10000 = screen height */
- uint32_t snap_bottom_on; /* 0x10000 = screen height */
- uint32_t snap_bottom_off; /* 0x10000 = screen height */
- uint32_t fuzz_x; /* 0x10000 = screen width */
- uint32_t fuzz_y; /* 0x10000 = screen height */
+ u32 flags;
+ u32 inactive_left; /* 0x10000 = screen width */
+ u32 inactive_right; /* 0x10000 = screen width */
+ u32 inactive_top; /* 0x10000 = screen height */
+ u32 inactive_bottom; /* 0x10000 = screen height */
+ u32 snap_left_on; /* 0x10000 = screen width */
+ u32 snap_left_off; /* 0x10000 = screen width */
+ u32 snap_right_on; /* 0x10000 = screen width */
+ u32 snap_right_off; /* 0x10000 = screen width */
+ u32 snap_top_on; /* 0x10000 = screen height */
+ u32 snap_top_off; /* 0x10000 = screen height */
+ u32 snap_bottom_on; /* 0x10000 = screen height */
+ u32 snap_bottom_off; /* 0x10000 = screen height */
+ u32 fuzz_x; /* 0x10000 = screen width */
+ u32 fuzz_y; /* 0x10000 = screen height */
int fuzz_p;
int fuzz_w;
};
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
On Mon, Jul 13, 2009 at 1:57 PM, Pavel Machek<[email protected]> wrote:
> Hi!
>
> I'm looking at synaptic touchscreen driver... who should be listed as
> an author?
Arve.
Arve -- You'll want to look at Pavel's revised synaptics driver, sent to lkml.
Brian
On Mon, Jul 13, 2009 at 3:07 PM, Pavel Machek<[email protected]> wrote:
> On Mon 2009-07-13 22:57:49, Pavel Machek wrote:
>> Hi!
>>
>> I'm looking at synaptic touchscreen driver... who should be listed as
>> an author?
>>
>> Changes I have so far are...
>>
>> checkpatch only has minor complains -- lines over 80 characters -- but
>> the code is _way_ too deeply nested with way too little functions.
>
> Here's better cleanup. But... some functions are still _way_ too big.
>
> Signed-off-by: Pavel Machek <[email protected]>
> diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
> index 339083e..fa3404f 100644
> --- a/drivers/input/touchscreen/Kconfig
> +++ b/drivers/input/touchscreen/Kconfig
> @@ -94,6 +94,9 @@ config TOUCHSCREEN_GUNZE
> ?config TOUCHSCREEN_ELAN_I2C_8232
> ? ? ? ?tristate "Elan 8232 I2C touchscreen"
> ? ? ? ?depends on I2C
> + ? ? ? help
> + ? ? ? ? This enables support for Elan over I2C based touchscreens.
> + ? ? ? ? Such touchscreen is used in HTC Dream.
>
Why is this here? This driver is not related to elan touchscreens.
> ?config TOUCHSCREEN_ELO
> ? ? ? ?tristate "Elo serial touchscreens"
> @@ -215,6 +218,8 @@ config TOUCHSCREEN_SYNAPTICS_I2C_RMI
> ? ? ? ?depends on I2C
> ? ? ? ?help
> ? ? ? ? ?This enables support for Synaptics RMI over I2C based touchscreens.
> + ? ? ? ? Such touchscreen is used in HTC Dream.
> +
>
> ?config TOUCHSCREEN_TOUCHRIGHT
> ? ? ? ?tristate "Touchright serial touchscreen"
> diff --git a/drivers/input/touchscreen/synaptics_i2c_rmi.c b/drivers/input/touchscreen/synaptics_i2c_rmi.c
> index a45634b..f582582 100644
> --- a/drivers/input/touchscreen/synaptics_i2c_rmi.c
> +++ b/drivers/input/touchscreen/synaptics_i2c_rmi.c
> @@ -1,4 +1,5 @@
> -/* drivers/input/keyboard/synaptics_i2c_rmi.c
> +/*
> + * Support for synaptics touchscreen.
> ?*
> ?* Copyright (C) 2007 Google, Inc.
> ?*
> @@ -15,7 +16,6 @@
>
> ?#include <linux/module.h>
> ?#include <linux/delay.h>
> -#include <linux/earlysuspend.h>
> ?#include <linux/hrtimer.h>
> ?#include <linux/i2c.h>
> ?#include <linux/input.h>
> @@ -24,18 +24,16 @@
> ?#include <linux/platform_device.h>
> ?#include <linux/synaptics_i2c_rmi.h>
>
> -#define swap(x, y) do { typeof(x) z = x; x = y; y = z; } while (0)
> -
> ?static struct workqueue_struct *synaptics_wq;
>
> ?struct synaptics_ts_data {
> - ? ? ? uint16_t addr;
> + ? ? ? u16 addr;
What is the point of this change?
> ? ? ? ?struct i2c_client *client;
> ? ? ? ?struct input_dev *input_dev;
> ? ? ? ?int use_irq;
> ? ? ? ?struct hrtimer timer;
> ? ? ? ?struct work_struct ?work;
> - ? ? ? uint16_t max[2];
> + ? ? ? u16 max[2];
> ? ? ? ?int snap_state[2][2];
> ? ? ? ?int snap_down_on[2];
> ? ? ? ?int snap_down_off[2];
> @@ -43,164 +41,142 @@ struct synaptics_ts_data {
> ? ? ? ?int snap_up_off[2];
> ? ? ? ?int snap_down[2];
> ? ? ? ?int snap_up[2];
> - ? ? ? uint32_t flags;
> + ? ? ? u32 flags;
> ? ? ? ?int (*power)(int on);
> - ? ? ? struct early_suspend early_suspend;
> ?};
>
> -#ifdef CONFIG_HAS_EARLYSUSPEND
> -static void synaptics_ts_early_suspend(struct early_suspend *h);
> -static void synaptics_ts_late_resume(struct early_suspend *h);
> -#endif
> -
> ?static int synaptics_init_panel(struct synaptics_ts_data *ts)
> ?{
> ? ? ? ?int ret;
>
> - ? ? ? ret = i2c_smbus_write_byte_data(ts->client, 0xff, 0x10); /* page select = 0x10 */
> + ? ? ? /* page select = 0x10 */
> + ? ? ? ret = i2c_smbus_write_byte_data(ts->client, 0xff, 0x10);
> ? ? ? ?if (ret < 0) {
> - ? ? ? ? ? ? ? printk(KERN_ERR "i2c_smbus_write_byte_data failed for page select\n");
> + ? ? ? ? ? ? ? printk(KERN_ERR "smbus write failed for page select\n");
> ? ? ? ? ? ? ? ?goto err_page_select_failed;
> ? ? ? ?}
> - ? ? ? ret = i2c_smbus_write_byte_data(ts->client, 0x41, 0x04); /* Set "No Clip Z" */
> +
> + ? ? ? /* Set "No Clip Z" */
> + ? ? ? ret = i2c_smbus_write_byte_data(ts->client, 0x41, 0x04);
> ? ? ? ?if (ret < 0)
> - ? ? ? ? ? ? ? printk(KERN_ERR "i2c_smbus_write_byte_data failed for No Clip Z\n");
> + ? ? ? ? ? ? ? printk(KERN_ERR "smbus write failed for No Clip Z\n");
>
> ?err_page_select_failed:
> - ? ? ? ret = i2c_smbus_write_byte_data(ts->client, 0xff, 0x04); /* page select = 0x04 */
> + ? ? ? /* page select = 0x04 */
> + ? ? ? ret = i2c_smbus_write_byte_data(ts->client, 0xff, 0x04);
> ? ? ? ?if (ret < 0)
> - ? ? ? ? ? ? ? printk(KERN_ERR "i2c_smbus_write_byte_data failed for page select\n");
> - ? ? ? ret = i2c_smbus_write_byte_data(ts->client, 0xf0, 0x81); /* normal operation, 80 reports per second */
> + ? ? ? ? ? ? ? printk(KERN_ERR "smbus write failed for page select\n");
> + ? ? ? /* normal operation, 80 reports per second */
> + ? ? ? ret = i2c_smbus_write_byte_data(ts->client, 0xf0, 0x81);
> ? ? ? ?if (ret < 0)
> - ? ? ? ? ? ? ? printk(KERN_ERR "synaptics_ts_resume: i2c_smbus_write_byte_data failed\n");
> + ? ? ? ? ? ? ? printk(KERN_ERR "smbus write failed for 80/second\n");
> ? ? ? ?return ret;
> ?}
>
> +static void decode_report(struct synaptics_ts_data *ts, u8 *buf)
> +{
> + ? ? ? int pos[2][2];
> + ? ? ? int f, a;
> + ? ? ? int base = 2;
> + ? ? ? int z = buf[1];
> + ? ? ? int w = buf[0] >> 4;
> + ? ? ? int finger = buf[0] & 7;
> + ? ? ? int finger2_pressed;
> +
> + ? ? ? for (f = 0; f < 2; f++) {
> + ? ? ? ? ? ? ? u32 flip_flag = SYNAPTICS_FLIP_X;
> + ? ? ? ? ? ? ? for (a = 0; a < 2; a++) {
> + ? ? ? ? ? ? ? ? ? ? ? int p = buf[base + 1];
> + ? ? ? ? ? ? ? ? ? ? ? p |= (u16)(buf[base] & 0x1f) << 8;
> + ? ? ? ? ? ? ? ? ? ? ? if (ts->flags & flip_flag)
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? p = ts->max[a] - p;
> + ? ? ? ? ? ? ? ? ? ? ? if (ts->flags & SYNAPTICS_SNAP_TO_INACTIVE_EDGE) {
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? if (ts->snap_state[f][a]) {
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? if (p <= ts->snap_down_off[a])
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? p = ts->snap_down[a];
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? else if (p >= ts->snap_up_off[a])
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? p = ts->snap_up[a];
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? else
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ts->snap_state[f][a] = 0;
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? } else {
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? if (p <= ts->snap_down_on[a]) {
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? p = ts->snap_down[a];
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ts->snap_state[f][a] = 1;
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? } else if (p >= ts->snap_up_on[a]) {
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? p = ts->snap_up[a];
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ts->snap_state[f][a] = 1;
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? }
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? }
> + ? ? ? ? ? ? ? ? ? ? ? }
> + ? ? ? ? ? ? ? ? ? ? ? pos[f][a] = p;
> + ? ? ? ? ? ? ? ? ? ? ? base += 2;
> + ? ? ? ? ? ? ? ? ? ? ? flip_flag <<= 1;
> + ? ? ? ? ? ? ? }
> + ? ? ? ? ? ? ? base += 2;
> + ? ? ? ? ? ? ? if (ts->flags & SYNAPTICS_SWAP_XY)
> + ? ? ? ? ? ? ? ? ? ? ? swap(pos[f][0], pos[f][1]);
> + ? ? ? }
> + ? ? ? if (z) {
> + ? ? ? ? ? ? ? input_report_abs(ts->input_dev, ABS_X, pos[0][0]);
> + ? ? ? ? ? ? ? input_report_abs(ts->input_dev, ABS_Y, pos[0][1]);
> + ? ? ? }
> + ? ? ? input_report_abs(ts->input_dev, ABS_PRESSURE, z);
> + ? ? ? input_report_abs(ts->input_dev, ABS_TOOL_WIDTH, w);
> + ? ? ? input_report_key(ts->input_dev, BTN_TOUCH, finger);
> + ? ? ? finger2_pressed = finger > 1 && finger != 7;
> + ? ? ? input_report_key(ts->input_dev, BTN_2, finger2_pressed);
> + ? ? ? if (finger2_pressed) {
> + ? ? ? ? ? ? ? input_report_abs(ts->input_dev, ABS_HAT0X, pos[1][0]);
> + ? ? ? ? ? ? ? input_report_abs(ts->input_dev, ABS_HAT0Y, pos[1][1]);
> + ? ? ? }
> + ? ? ? input_sync(ts->input_dev);
> +}
> +
> ?static void synaptics_ts_work_func(struct work_struct *work)
> ?{
> ? ? ? ?int i;
> ? ? ? ?int ret;
> ? ? ? ?int bad_data = 0;
> ? ? ? ?struct i2c_msg msg[2];
> - ? ? ? uint8_t start_reg;
> - ? ? ? uint8_t buf[15];
> - ? ? ? struct synaptics_ts_data *ts = container_of(work, struct synaptics_ts_data, work);
> + ? ? ? u8 start_reg = 0;
> + ? ? ? u8 buf[15];
> + ? ? ? struct synaptics_ts_data *ts =
> + ? ? ? ? ? ? ? container_of(work, struct synaptics_ts_data, work);
>
> ? ? ? ?msg[0].addr = ts->client->addr;
> ? ? ? ?msg[0].flags = 0;
> ? ? ? ?msg[0].len = 1;
> ? ? ? ?msg[0].buf = &start_reg;
> - ? ? ? start_reg = 0x00;
> ? ? ? ?msg[1].addr = ts->client->addr;
> ? ? ? ?msg[1].flags = I2C_M_RD;
> ? ? ? ?msg[1].len = sizeof(buf);
> ? ? ? ?msg[1].buf = buf;
>
> - ? ? ? /* printk("synaptics_ts_work_func\n"); */
> ? ? ? ?for (i = 0; i < ((ts->use_irq && !bad_data) ? 1 : 10); i++) {
> ? ? ? ? ? ? ? ?ret = i2c_transfer(ts->client->adapter, msg, 2);
> ? ? ? ? ? ? ? ?if (ret < 0) {
> - ? ? ? ? ? ? ? ? ? ? ? printk(KERN_ERR "synaptics_ts_work_func: i2c_transfer failed\n");
> + ? ? ? ? ? ? ? ? ? ? ? printk(KERN_ERR "ts_work: i2c_transfer failed\n");
This will make it harder to read the kernel logs since the driver is
no longer specified.
> ? ? ? ? ? ? ? ? ? ? ? ?bad_data = 1;
> - ? ? ? ? ? ? ? } else {
> - ? ? ? ? ? ? ? ? ? ? ? /* printk("synaptics_ts_work_func: %x %x %x %x %x %x" */
> - ? ? ? ? ? ? ? ? ? ? ? /* ? ? ? ?" %x %x %x %x %x %x %x %x %x, ret %d\n", */
> - ? ? ? ? ? ? ? ? ? ? ? /* ? ? ? ?buf[0], buf[1], buf[2], buf[3], */
> - ? ? ? ? ? ? ? ? ? ? ? /* ? ? ? ?buf[4], buf[5], buf[6], buf[7], */
> - ? ? ? ? ? ? ? ? ? ? ? /* ? ? ? ?buf[8], buf[9], buf[10], buf[11], */
> - ? ? ? ? ? ? ? ? ? ? ? /* ? ? ? ?buf[12], buf[13], buf[14], ret); */
> - ? ? ? ? ? ? ? ? ? ? ? if ((buf[14] & 0xc0) != 0x40) {
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? printk(KERN_WARNING "synaptics_ts_work_func:"
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?" bad read %x %x %x %x %x %x %x %x %x"
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?" %x %x %x %x %x %x, ret %d\n",
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?buf[0], buf[1], buf[2], buf[3],
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?buf[4], buf[5], buf[6], buf[7],
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?buf[8], buf[9], buf[10], buf[11],
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?buf[12], buf[13], buf[14], ret);
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? if (bad_data)
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? synaptics_init_panel(ts);
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? bad_data = 1;
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? continue;
> - ? ? ? ? ? ? ? ? ? ? ? }
> - ? ? ? ? ? ? ? ? ? ? ? bad_data = 0;
> - ? ? ? ? ? ? ? ? ? ? ? if ((buf[14] & 1) == 0) {
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /* printk("read %d coordinates\n", i); */
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? break;
> - ? ? ? ? ? ? ? ? ? ? ? } else {
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? int pos[2][2];
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? int f, a;
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? int base;
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /* int x = buf[3] | (uint16_t)(buf[2] & 0x1f) << 8; */
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /* int y = buf[5] | (uint16_t)(buf[4] & 0x1f) << 8; */
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? int z = buf[1];
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? int w = buf[0] >> 4;
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? int finger = buf[0] & 7;
> -
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /* int x2 = buf[3+6] | (uint16_t)(buf[2+6] & 0x1f) << 8; */
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /* int y2 = buf[5+6] | (uint16_t)(buf[4+6] & 0x1f) << 8; */
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /* int z2 = buf[1+6]; */
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /* int w2 = buf[0+6] >> 4; */
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /* int finger2 = buf[0+6] & 7; */
> -
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /* int dx = (int8_t)buf[12]; */
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /* int dy = (int8_t)buf[13]; */
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? int finger2_pressed;
> -
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /* printk("x %4d, y %4d, z %3d, w %2d, F %d, 2nd: x %4d, y %4d, z %3d, w %2d, F %d, dx %4d, dy %4d\n", */
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /* ? ? ?x, y, z, w, finger, */
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /* ? ? ?x2, y2, z2, w2, finger2, */
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? /* ? ? ?dx, dy); */
> -
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? base = 2;
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? for (f = 0; f < 2; f++) {
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? uint32_t flip_flag = SYNAPTICS_FLIP_X;
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? for (a = 0; a < 2; a++) {
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? int p = buf[base + 1];
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? p |= (uint16_t)(buf[base] & 0x1f) << 8;
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? if (ts->flags & flip_flag)
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? p = ts->max[a] - p;
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? if (ts->flags & SYNAPTICS_SNAP_TO_INACTIVE_EDGE) {
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? if (ts->snap_state[f][a]) {
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? if (p <= ts->snap_down_off[a])
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? p = ts->snap_down[a];
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? else if (p >= ts->snap_up_off[a])
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? p = ts->snap_up[a];
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? else
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ts->snap_state[f][a] = 0;
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? } else {
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? if (p <= ts->snap_down_on[a]) {
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? p = ts->snap_down[a];
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ts->snap_state[f][a] = 1;
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? } else if (p >= ts->snap_up_on[a]) {
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? p = ts->snap_up[a];
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ts->snap_state[f][a] = 1;
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? }
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? }
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? }
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? pos[f][a] = p;
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? base += 2;
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? flip_flag <<= 1;
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? }
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? base += 2;
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? if (ts->flags & SYNAPTICS_SWAP_XY)
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? swap(pos[f][0], pos[f][1]);
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? }
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? if (z) {
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? input_report_abs(ts->input_dev, ABS_X, pos[0][0]);
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? input_report_abs(ts->input_dev, ABS_Y, pos[0][1]);
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? }
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? input_report_abs(ts->input_dev, ABS_PRESSURE, z);
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? input_report_abs(ts->input_dev, ABS_TOOL_WIDTH, w);
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? input_report_key(ts->input_dev, BTN_TOUCH, finger);
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? finger2_pressed = finger > 1 && finger != 7;
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? input_report_key(ts->input_dev, BTN_2, finger2_pressed);
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? if (finger2_pressed) {
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? input_report_abs(ts->input_dev, ABS_HAT0X, pos[1][0]);
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? input_report_abs(ts->input_dev, ABS_HAT0Y, pos[1][1]);
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? }
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? input_sync(ts->input_dev);
> - ? ? ? ? ? ? ? ? ? ? ? }
> + ? ? ? ? ? ? ? ? ? ? ? continue;
> + ? ? ? ? ? ? ? }
> + ? ? ? ? ? ? ? if ((buf[14] & 0xc0) != 0x40) {
> + ? ? ? ? ? ? ? ? ? ? ? printk(KERN_WARNING "synaptics_ts_work_func:"
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?" bad read %x %x %x %x %x %x %x %x %x"
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?" %x %x %x %x %x %x, ret %d\n",
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?buf[0], buf[1], buf[2], buf[3],
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?buf[4], buf[5], buf[6], buf[7],
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?buf[8], buf[9], buf[10], buf[11],
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?buf[12], buf[13], buf[14], ret);
> + ? ? ? ? ? ? ? ? ? ? ? if (bad_data)
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? synaptics_init_panel(ts);
> + ? ? ? ? ? ? ? ? ? ? ? bad_data = 1;
> + ? ? ? ? ? ? ? ? ? ? ? continue;
> ? ? ? ? ? ? ? ?}
> + ? ? ? ? ? ? ? bad_data = 0;
> + ? ? ? ? ? ? ? if ((buf[14] & 1) == 0)
> + ? ? ? ? ? ? ? ? ? ? ? break;
> +
> + ? ? ? ? ? ? ? decode_report(ts, buf);
> ? ? ? ?}
> ? ? ? ?if (ts->use_irq)
> ? ? ? ? ? ? ? ?enable_irq(ts->client->irq);
> @@ -208,8 +184,8 @@ static void synaptics_ts_work_func(struct work_struct *work)
>
> ?static enum hrtimer_restart synaptics_ts_timer_func(struct hrtimer *timer)
> ?{
> - ? ? ? struct synaptics_ts_data *ts = container_of(timer, struct synaptics_ts_data, timer);
> - ? ? ? /* printk("synaptics_ts_timer_func\n"); */
> + ? ? ? struct synaptics_ts_data *ts =
> + ? ? ? ? ? ? ? container_of(timer, struct synaptics_ts_data, timer);
>
> ? ? ? ?queue_work(synaptics_wq, &ts->work);
>
> @@ -221,36 +197,145 @@ static irqreturn_t synaptics_ts_irq_handler(int irq, void *dev_id)
> ?{
> ? ? ? ?struct synaptics_ts_data *ts = dev_id;
>
> - ? ? ? /* printk("synaptics_ts_irq_handler\n"); */
> ? ? ? ?disable_irq(ts->client->irq);
> ? ? ? ?queue_work(synaptics_wq, &ts->work);
> ? ? ? ?return IRQ_HANDLED;
> ?}
>
> +static int detect(struct synaptics_ts_data *ts, u32 *panel_version)
> +{
> + ? ? ? int ret;
> + ? ? ? int retry = 10;
> +
> + ? ? ? /* device command = reset */
> + ? ? ? ret = i2c_smbus_write_byte_data(ts->client, 0xf4, 0x01);
> + ? ? ? if (ret < 0) {
> + ? ? ? ? ? ? ? printk(KERN_ERR "i2c_smbus_write_byte_data failed\n");
> + ? ? ? ? ? ? ? /* fail? */
> + ? ? ? }
> +
> + ? ? ? while (retry-- > 0) {
> + ? ? ? ? ? ? ? ret = i2c_smbus_read_byte_data(ts->client, 0xe4);
> + ? ? ? ? ? ? ? if (ret >= 0)
> + ? ? ? ? ? ? ? ? ? ? ? break;
> + ? ? ? ? ? ? ? msleep(100);
> + ? ? ? }
> + ? ? ? if (ret < 0) {
> + ? ? ? ? ? ? ? printk(KERN_ERR "i2c_smbus_read_byte_data failed\n");
> + ? ? ? ? ? ? ? return ret;
> + ? ? ? }
> +
> + ? ? ? printk(KERN_INFO "synaptics_ts_probe: Product Major Version %x\n", ret);
> + ? ? ? *panel_version = ret << 8;
> + ? ? ? ret = i2c_smbus_read_byte_data(ts->client, 0xe5);
> + ? ? ? if (ret < 0) {
> + ? ? ? ? ? ? ? printk(KERN_ERR "i2c_smbus_read_byte_data failed\n");
> + ? ? ? ? ? ? ? return ret;
> + ? ? ? }
> + ? ? ? printk(KERN_INFO "synaptics_ts_probe: Product Minor Version %x\n", ret);
> + ? ? ? *panel_version |= ret;
> +
> + ? ? ? ret = i2c_smbus_read_byte_data(ts->client, 0xe3);
> + ? ? ? if (ret < 0) {
> + ? ? ? ? ? ? ? printk(KERN_ERR "i2c_smbus_read_byte_data failed\n");
> + ? ? ? ? ? ? ? return ret;
> + ? ? ? }
> + ? ? ? printk(KERN_INFO "synaptics_ts_probe: product property %x\n", ret);
> + ? ? ? return 0;
> +}
> +
> +static void compute_areas(struct synaptics_ts_data *ts,
> + ? ? ? ? ? ? ? ? ? ? ? ? struct synaptics_i2c_rmi_platform_data *pdata,
> + ? ? ? ? ? ? ? ? ? ? ? ? u16 max_x, u16 max_y)
> +{
> + ? ? ? u32 inactive_area_left;
> + ? ? ? u32 inactive_area_right;
> + ? ? ? u32 inactive_area_top;
> + ? ? ? u32 inactive_area_bottom;
> + ? ? ? u32 snap_left_on;
> + ? ? ? u32 snap_left_off;
> + ? ? ? u32 snap_right_on;
> + ? ? ? u32 snap_right_off;
> + ? ? ? u32 snap_top_on;
> + ? ? ? u32 snap_top_off;
> + ? ? ? u32 snap_bottom_on;
> + ? ? ? u32 snap_bottom_off;
> + ? ? ? u32 fuzz_x;
> + ? ? ? u32 fuzz_y;
> + ? ? ? int fuzz_p;
> + ? ? ? int fuzz_w;
> +
> + ? ? ? inactive_area_left = pdata->inactive_left;
> + ? ? ? inactive_area_right = pdata->inactive_right;
> + ? ? ? inactive_area_top = pdata->inactive_top;
> + ? ? ? inactive_area_bottom = pdata->inactive_bottom;
> + ? ? ? snap_left_on = pdata->snap_left_on;
> + ? ? ? snap_left_off = pdata->snap_left_off;
> + ? ? ? snap_right_on = pdata->snap_right_on;
> + ? ? ? snap_right_off = pdata->snap_right_off;
> + ? ? ? snap_top_on = pdata->snap_top_on;
> + ? ? ? snap_top_off = pdata->snap_top_off;
> + ? ? ? snap_bottom_on = pdata->snap_bottom_on;
> + ? ? ? snap_bottom_off = pdata->snap_bottom_off;
> + ? ? ? fuzz_x = pdata->fuzz_x;
> + ? ? ? fuzz_y = pdata->fuzz_y;
> + ? ? ? fuzz_p = pdata->fuzz_p;
> + ? ? ? fuzz_w = pdata->fuzz_w;
> +
> + ? ? ? inactive_area_left = inactive_area_left * max_x / 0x10000;
> + ? ? ? inactive_area_right = inactive_area_right * max_x / 0x10000;
> + ? ? ? inactive_area_top = inactive_area_top * max_y / 0x10000;
> + ? ? ? inactive_area_bottom = inactive_area_bottom * max_y / 0x10000;
> + ? ? ? snap_left_on = snap_left_on * max_x / 0x10000;
> + ? ? ? snap_left_off = snap_left_off * max_x / 0x10000;
> + ? ? ? snap_right_on = snap_right_on * max_x / 0x10000;
> + ? ? ? snap_right_off = snap_right_off * max_x / 0x10000;
> + ? ? ? snap_top_on = snap_top_on * max_y / 0x10000;
> + ? ? ? snap_top_off = snap_top_off * max_y / 0x10000;
> + ? ? ? snap_bottom_on = snap_bottom_on * max_y / 0x10000;
> + ? ? ? snap_bottom_off = snap_bottom_off * max_y / 0x10000;
> + ? ? ? fuzz_x = fuzz_x * max_x / 0x10000;
> + ? ? ? fuzz_y = fuzz_y * max_y / 0x10000;
> +
> + ? ? ? ts->snap_down[!!(ts->flags & SYNAPTICS_SWAP_XY)] = -inactive_area_left;
> + ? ? ? ts->snap_up[!!(ts->flags & SYNAPTICS_SWAP_XY)] = max_x + inactive_area_right;
> + ? ? ? ts->snap_down[!(ts->flags & SYNAPTICS_SWAP_XY)] = -inactive_area_top;
> + ? ? ? ts->snap_up[!(ts->flags & SYNAPTICS_SWAP_XY)] = max_y + inactive_area_bottom;
> + ? ? ? ts->snap_down_on[!!(ts->flags & SYNAPTICS_SWAP_XY)] = snap_left_on;
> + ? ? ? ts->snap_down_off[!!(ts->flags & SYNAPTICS_SWAP_XY)] = snap_left_off;
> + ? ? ? ts->snap_up_on[!!(ts->flags & SYNAPTICS_SWAP_XY)] = max_x - snap_right_on;
> + ? ? ? ts->snap_up_off[!!(ts->flags & SYNAPTICS_SWAP_XY)] = max_x - snap_right_off;
> + ? ? ? ts->snap_down_on[!(ts->flags & SYNAPTICS_SWAP_XY)] = snap_top_on;
> + ? ? ? ts->snap_down_off[!(ts->flags & SYNAPTICS_SWAP_XY)] = snap_top_off;
> + ? ? ? ts->snap_up_on[!(ts->flags & SYNAPTICS_SWAP_XY)] = max_y - snap_bottom_on;
> + ? ? ? ts->snap_up_off[!(ts->flags & SYNAPTICS_SWAP_XY)] = max_y - snap_bottom_off;
> + ? ? ? printk(KERN_INFO "synaptics_ts_probe: max_x %d, max_y %d\n", max_x, max_y);
> + ? ? ? printk(KERN_INFO "synaptics_ts_probe: inactive_x %d %d, inactive_y %d %d\n",
> + ? ? ? ? ? ? ?inactive_area_left, inactive_area_right,
> + ? ? ? ? ? ? ?inactive_area_top, inactive_area_bottom);
> + ? ? ? printk(KERN_INFO "synaptics_ts_probe: snap_x %d-%d %d-%d, snap_y %d-%d %d-%d\n",
> + ? ? ? ? ? ? ?snap_left_on, snap_left_off, snap_right_on, snap_right_off,
> + ? ? ? ? ? ? ?snap_top_on, snap_top_off, snap_bottom_on, snap_bottom_off);
> +
> + ? ? ? input_set_abs_params(ts->input_dev, ABS_X, -inactive_area_left, max_x + inactive_area_right, fuzz_x, 0);
> + ? ? ? input_set_abs_params(ts->input_dev, ABS_Y, -inactive_area_top, max_y + inactive_area_bottom, fuzz_y, 0);
> + ? ? ? input_set_abs_params(ts->input_dev, ABS_PRESSURE, 0, 255, fuzz_p, 0);
> + ? ? ? input_set_abs_params(ts->input_dev, ABS_TOOL_WIDTH, 0, 15, fuzz_w, 0);
> + ? ? ? input_set_abs_params(ts->input_dev, ABS_HAT0X, -inactive_area_left, max_x + inactive_area_right, fuzz_x, 0);
> + ? ? ? input_set_abs_params(ts->input_dev, ABS_HAT0Y, -inactive_area_top, max_y + inactive_area_bottom, fuzz_y, 0);
> +}
> +
> ?static int synaptics_ts_probe(
> ? ? ? ?struct i2c_client *client, const struct i2c_device_id *id)
> ?{
> ? ? ? ?struct synaptics_ts_data *ts;
> - ? ? ? uint8_t buf0[4];
> - ? ? ? uint8_t buf1[8];
> + ? ? ? u8 buf0[4];
> + ? ? ? u8 buf1[8];
> ? ? ? ?struct i2c_msg msg[2];
> ? ? ? ?int ret = 0;
> - ? ? ? uint16_t max_x, max_y;
> - ? ? ? int fuzz_x, fuzz_y, fuzz_p, fuzz_w;
> ? ? ? ?struct synaptics_i2c_rmi_platform_data *pdata;
> - ? ? ? int inactive_area_left;
> - ? ? ? int inactive_area_right;
> - ? ? ? int inactive_area_top;
> - ? ? ? int inactive_area_bottom;
> - ? ? ? int snap_left_on;
> - ? ? ? int snap_left_off;
> - ? ? ? int snap_right_on;
> - ? ? ? int snap_right_off;
> - ? ? ? int snap_top_on;
> - ? ? ? int snap_top_off;
> - ? ? ? int snap_bottom_on;
> - ? ? ? int snap_bottom_off;
> - ? ? ? uint32_t panel_version;
> + ? ? ? u32 panel_version = 0;
> + ? ? ? u16 max_x, max_y;
>
> ? ? ? ?if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
> ? ? ? ? ? ? ? ?printk(KERN_ERR "synaptics_ts_probe: need I2C_FUNC_I2C\n");
> @@ -269,6 +354,9 @@ static int synaptics_ts_probe(
> ? ? ? ?pdata = client->dev.platform_data;
> ? ? ? ?if (pdata)
> ? ? ? ? ? ? ? ?ts->power = pdata->power;
> + ? ? ? else
> + ? ? ? ? ? ? ? pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
> +
Where do you free this?
> ? ? ? ?if (ts->power) {
> ? ? ? ? ? ? ? ?ret = ts->power(1);
> ? ? ? ? ? ? ? ?if (ret < 0) {
> @@ -277,81 +365,16 @@ static int synaptics_ts_probe(
> ? ? ? ? ? ? ? ?}
> ? ? ? ?}
>
> - ? ? ? ret = i2c_smbus_write_byte_data(ts->client, 0xf4, 0x01); /* device command = reset */
> - ? ? ? if (ret < 0) {
> - ? ? ? ? ? ? ? printk(KERN_ERR "i2c_smbus_write_byte_data failed\n");
> - ? ? ? ? ? ? ? /* fail? */
> - ? ? ? }
> - ? ? ? {
> - ? ? ? ? ? ? ? int retry = 10;
> - ? ? ? ? ? ? ? while (retry-- > 0) {
> - ? ? ? ? ? ? ? ? ? ? ? ret = i2c_smbus_read_byte_data(ts->client, 0xe4);
> - ? ? ? ? ? ? ? ? ? ? ? if (ret >= 0)
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? break;
> - ? ? ? ? ? ? ? ? ? ? ? msleep(100);
> - ? ? ? ? ? ? ? }
> - ? ? ? }
> - ? ? ? if (ret < 0) {
> - ? ? ? ? ? ? ? printk(KERN_ERR "i2c_smbus_read_byte_data failed\n");
> - ? ? ? ? ? ? ? goto err_detect_failed;
> - ? ? ? }
> - ? ? ? printk(KERN_INFO "synaptics_ts_probe: Product Major Version %x\n", ret);
> - ? ? ? panel_version = ret << 8;
> - ? ? ? ret = i2c_smbus_read_byte_data(ts->client, 0xe5);
> - ? ? ? if (ret < 0) {
> - ? ? ? ? ? ? ? printk(KERN_ERR "i2c_smbus_read_byte_data failed\n");
> - ? ? ? ? ? ? ? goto err_detect_failed;
> - ? ? ? }
> - ? ? ? printk(KERN_INFO "synaptics_ts_probe: Product Minor Version %x\n", ret);
> - ? ? ? panel_version |= ret;
> -
> - ? ? ? ret = i2c_smbus_read_byte_data(ts->client, 0xe3);
> - ? ? ? if (ret < 0) {
> - ? ? ? ? ? ? ? printk(KERN_ERR "i2c_smbus_read_byte_data failed\n");
> + ? ? ? ret = detect(ts, &panel_version);
> + ? ? ? if (ret)
> ? ? ? ? ? ? ? ?goto err_detect_failed;
> - ? ? ? }
> - ? ? ? printk(KERN_INFO "synaptics_ts_probe: product property %x\n", ret);
>
> - ? ? ? if (pdata) {
> - ? ? ? ? ? ? ? while (pdata->version > panel_version)
> - ? ? ? ? ? ? ? ? ? ? ? pdata++;
> - ? ? ? ? ? ? ? ts->flags = pdata->flags;
> - ? ? ? ? ? ? ? inactive_area_left = pdata->inactive_left;
> - ? ? ? ? ? ? ? inactive_area_right = pdata->inactive_right;
> - ? ? ? ? ? ? ? inactive_area_top = pdata->inactive_top;
> - ? ? ? ? ? ? ? inactive_area_bottom = pdata->inactive_bottom;
> - ? ? ? ? ? ? ? snap_left_on = pdata->snap_left_on;
> - ? ? ? ? ? ? ? snap_left_off = pdata->snap_left_off;
> - ? ? ? ? ? ? ? snap_right_on = pdata->snap_right_on;
> - ? ? ? ? ? ? ? snap_right_off = pdata->snap_right_off;
> - ? ? ? ? ? ? ? snap_top_on = pdata->snap_top_on;
> - ? ? ? ? ? ? ? snap_top_off = pdata->snap_top_off;
> - ? ? ? ? ? ? ? snap_bottom_on = pdata->snap_bottom_on;
> - ? ? ? ? ? ? ? snap_bottom_off = pdata->snap_bottom_off;
> - ? ? ? ? ? ? ? fuzz_x = pdata->fuzz_x;
> - ? ? ? ? ? ? ? fuzz_y = pdata->fuzz_y;
> - ? ? ? ? ? ? ? fuzz_p = pdata->fuzz_p;
> - ? ? ? ? ? ? ? fuzz_w = pdata->fuzz_w;
> - ? ? ? } else {
> - ? ? ? ? ? ? ? inactive_area_left = 0;
> - ? ? ? ? ? ? ? inactive_area_right = 0;
> - ? ? ? ? ? ? ? inactive_area_top = 0;
> - ? ? ? ? ? ? ? inactive_area_bottom = 0;
> - ? ? ? ? ? ? ? snap_left_on = 0;
> - ? ? ? ? ? ? ? snap_left_off = 0;
> - ? ? ? ? ? ? ? snap_right_on = 0;
> - ? ? ? ? ? ? ? snap_right_off = 0;
> - ? ? ? ? ? ? ? snap_top_on = 0;
> - ? ? ? ? ? ? ? snap_top_off = 0;
> - ? ? ? ? ? ? ? snap_bottom_on = 0;
> - ? ? ? ? ? ? ? snap_bottom_off = 0;
> - ? ? ? ? ? ? ? fuzz_x = 0;
> - ? ? ? ? ? ? ? fuzz_y = 0;
> - ? ? ? ? ? ? ? fuzz_p = 0;
> - ? ? ? ? ? ? ? fuzz_w = 0;
> - ? ? ? }
> + ? ? ? while (pdata->version > panel_version)
> + ? ? ? ? ? ? ? pdata++;
> + ? ? ? ts->flags = pdata->flags;
>
> ? ? ? ?ret = i2c_smbus_read_byte_data(ts->client, 0xf0);
> +
> ? ? ? ?if (ret < 0) {
> ? ? ? ? ? ? ? ?printk(KERN_ERR "i2c_smbus_read_byte_data failed\n");
> ? ? ? ? ? ? ? ?goto err_detect_failed;
> @@ -427,46 +450,10 @@ static int synaptics_ts_probe(
> ? ? ? ?set_bit(BTN_TOUCH, ts->input_dev->keybit);
> ? ? ? ?set_bit(BTN_2, ts->input_dev->keybit);
> ? ? ? ?set_bit(EV_ABS, ts->input_dev->evbit);
> - ? ? ? inactive_area_left = inactive_area_left * max_x / 0x10000;
> - ? ? ? inactive_area_right = inactive_area_right * max_x / 0x10000;
> - ? ? ? inactive_area_top = inactive_area_top * max_y / 0x10000;
> - ? ? ? inactive_area_bottom = inactive_area_bottom * max_y / 0x10000;
> - ? ? ? snap_left_on = snap_left_on * max_x / 0x10000;
> - ? ? ? snap_left_off = snap_left_off * max_x / 0x10000;
> - ? ? ? snap_right_on = snap_right_on * max_x / 0x10000;
> - ? ? ? snap_right_off = snap_right_off * max_x / 0x10000;
> - ? ? ? snap_top_on = snap_top_on * max_y / 0x10000;
> - ? ? ? snap_top_off = snap_top_off * max_y / 0x10000;
> - ? ? ? snap_bottom_on = snap_bottom_on * max_y / 0x10000;
> - ? ? ? snap_bottom_off = snap_bottom_off * max_y / 0x10000;
> - ? ? ? fuzz_x = fuzz_x * max_x / 0x10000;
> - ? ? ? fuzz_y = fuzz_y * max_y / 0x10000;
> - ? ? ? ts->snap_down[!!(ts->flags & SYNAPTICS_SWAP_XY)] = -inactive_area_left;
> - ? ? ? ts->snap_up[!!(ts->flags & SYNAPTICS_SWAP_XY)] = max_x + inactive_area_right;
> - ? ? ? ts->snap_down[!(ts->flags & SYNAPTICS_SWAP_XY)] = -inactive_area_top;
> - ? ? ? ts->snap_up[!(ts->flags & SYNAPTICS_SWAP_XY)] = max_y + inactive_area_bottom;
> - ? ? ? ts->snap_down_on[!!(ts->flags & SYNAPTICS_SWAP_XY)] = snap_left_on;
> - ? ? ? ts->snap_down_off[!!(ts->flags & SYNAPTICS_SWAP_XY)] = snap_left_off;
> - ? ? ? ts->snap_up_on[!!(ts->flags & SYNAPTICS_SWAP_XY)] = max_x - snap_right_on;
> - ? ? ? ts->snap_up_off[!!(ts->flags & SYNAPTICS_SWAP_XY)] = max_x - snap_right_off;
> - ? ? ? ts->snap_down_on[!(ts->flags & SYNAPTICS_SWAP_XY)] = snap_top_on;
> - ? ? ? ts->snap_down_off[!(ts->flags & SYNAPTICS_SWAP_XY)] = snap_top_off;
> - ? ? ? ts->snap_up_on[!(ts->flags & SYNAPTICS_SWAP_XY)] = max_y - snap_bottom_on;
> - ? ? ? ts->snap_up_off[!(ts->flags & SYNAPTICS_SWAP_XY)] = max_y - snap_bottom_off;
> - ? ? ? printk(KERN_INFO "synaptics_ts_probe: max_x %d, max_y %d\n", max_x, max_y);
> - ? ? ? printk(KERN_INFO "synaptics_ts_probe: inactive_x %d %d, inactive_y %d %d\n",
> - ? ? ? ? ? ? ?inactive_area_left, inactive_area_right,
> - ? ? ? ? ? ? ?inactive_area_top, inactive_area_bottom);
> - ? ? ? printk(KERN_INFO "synaptics_ts_probe: snap_x %d-%d %d-%d, snap_y %d-%d %d-%d\n",
> - ? ? ? ? ? ? ?snap_left_on, snap_left_off, snap_right_on, snap_right_off,
> - ? ? ? ? ? ? ?snap_top_on, snap_top_off, snap_bottom_on, snap_bottom_off);
> - ? ? ? input_set_abs_params(ts->input_dev, ABS_X, -inactive_area_left, max_x + inactive_area_right, fuzz_x, 0);
> - ? ? ? input_set_abs_params(ts->input_dev, ABS_Y, -inactive_area_top, max_y + inactive_area_bottom, fuzz_y, 0);
> - ? ? ? input_set_abs_params(ts->input_dev, ABS_PRESSURE, 0, 255, fuzz_p, 0);
> - ? ? ? input_set_abs_params(ts->input_dev, ABS_TOOL_WIDTH, 0, 15, fuzz_w, 0);
> - ? ? ? input_set_abs_params(ts->input_dev, ABS_HAT0X, -inactive_area_left, max_x + inactive_area_right, fuzz_x, 0);
> - ? ? ? input_set_abs_params(ts->input_dev, ABS_HAT0Y, -inactive_area_top, max_y + inactive_area_bottom, fuzz_y, 0);
> - ? ? ? /* ts->input_dev->name = ts->keypad_info->name; */
> +
> + ? ? ? compute_areas(ts, pdata, max_x, max_y);
> +
> +
> ? ? ? ?ret = input_register_device(ts->input_dev);
> ? ? ? ?if (ret) {
> ? ? ? ? ? ? ? ?printk(KERN_ERR "synaptics_ts_probe: Unable to register %s input device\n", ts->input_dev->name);
> @@ -489,33 +476,27 @@ static int synaptics_ts_probe(
> ? ? ? ? ? ? ? ?ts->timer.function = synaptics_ts_timer_func;
> ? ? ? ? ? ? ? ?hrtimer_start(&ts->timer, ktime_set(1, 0), HRTIMER_MODE_REL);
> ? ? ? ?}
> -#ifdef CONFIG_HAS_EARLYSUSPEND
> - ? ? ? ts->early_suspend.level = EARLY_SUSPEND_LEVEL_BLANK_SCREEN + 1;
> - ? ? ? ts->early_suspend.suspend = synaptics_ts_early_suspend;
> - ? ? ? ts->early_suspend.resume = synaptics_ts_late_resume;
> - ? ? ? register_early_suspend(&ts->early_suspend);
> -#endif
>
> ? ? ? ?printk(KERN_INFO "synaptics_ts_probe: Start touchscreen %s in %s mode\n", ts->input_dev->name, ts->use_irq ? "interrupt" : "polling");
>
> ? ? ? ?return 0;
>
> -err_input_register_device_failed:
> + err_input_register_device_failed:
> ? ? ? ?input_free_device(ts->input_dev);
>
> -err_input_dev_alloc_failed:
> -err_detect_failed:
> -err_power_failed:
> + err_input_dev_alloc_failed:
> + err_detect_failed:
> + err_power_failed:
> ? ? ? ?kfree(ts);
> -err_alloc_data_failed:
> -err_check_functionality_failed:
> + err_alloc_data_failed:
> + err_check_functionality_failed:
> ? ? ? ?return ret;
> ?}
>
> ?static int synaptics_ts_remove(struct i2c_client *client)
> ?{
> ? ? ? ?struct synaptics_ts_data *ts = i2c_get_clientdata(client);
> - ? ? ? unregister_early_suspend(&ts->early_suspend);
> +
> ? ? ? ?if (ts->use_irq)
> ? ? ? ? ? ? ? ?free_irq(client->irq, ts);
> ? ? ? ?else
> @@ -525,72 +506,6 @@ static int synaptics_ts_remove(struct i2c_client *client)
> ? ? ? ?return 0;
> ?}
>
> -static int synaptics_ts_suspend(struct i2c_client *client, pm_message_t mesg)
> -{
> - ? ? ? int ret;
> - ? ? ? struct synaptics_ts_data *ts = i2c_get_clientdata(client);
> -
> - ? ? ? if (ts->use_irq)
> - ? ? ? ? ? ? ? disable_irq(client->irq);
> - ? ? ? else
> - ? ? ? ? ? ? ? hrtimer_cancel(&ts->timer);
> - ? ? ? ret = cancel_work_sync(&ts->work);
> - ? ? ? if (ret && ts->use_irq) /* if work was pending disable-count is now 2 */
> - ? ? ? ? ? ? ? enable_irq(client->irq);
> - ? ? ? ret = i2c_smbus_write_byte_data(ts->client, 0xf1, 0); /* disable interrupt */
> - ? ? ? if (ret < 0)
> - ? ? ? ? ? ? ? printk(KERN_ERR "synaptics_ts_suspend: i2c_smbus_write_byte_data failed\n");
> -
> - ? ? ? ret = i2c_smbus_write_byte_data(client, 0xf0, 0x86); /* deep sleep */
> - ? ? ? if (ret < 0)
> - ? ? ? ? ? ? ? printk(KERN_ERR "synaptics_ts_suspend: i2c_smbus_write_byte_data failed\n");
> - ? ? ? if (ts->power) {
> - ? ? ? ? ? ? ? ret = ts->power(0);
> - ? ? ? ? ? ? ? if (ret < 0)
> - ? ? ? ? ? ? ? ? ? ? ? printk(KERN_ERR "synaptics_ts_resume power off failed\n");
> - ? ? ? }
> - ? ? ? return 0;
> -}
> -
> -static int synaptics_ts_resume(struct i2c_client *client)
> -{
> - ? ? ? int ret;
> - ? ? ? struct synaptics_ts_data *ts = i2c_get_clientdata(client);
> -
> - ? ? ? if (ts->power) {
> - ? ? ? ? ? ? ? ret = ts->power(1);
> - ? ? ? ? ? ? ? if (ret < 0)
> - ? ? ? ? ? ? ? ? ? ? ? printk(KERN_ERR "synaptics_ts_resume power on failed\n");
> - ? ? ? }
> -
> - ? ? ? synaptics_init_panel(ts);
> -
> - ? ? ? if (ts->use_irq)
> - ? ? ? ? ? ? ? enable_irq(client->irq);
> -
> - ? ? ? if (!ts->use_irq)
> - ? ? ? ? ? ? ? hrtimer_start(&ts->timer, ktime_set(1, 0), HRTIMER_MODE_REL);
> - ? ? ? else
> - ? ? ? ? ? ? ? i2c_smbus_write_byte_data(ts->client, 0xf1, 0x01); /* enable abs int */
> -
> - ? ? ? return 0;
> -}
Why did you remove suspend and resume?
> -
> -#ifdef CONFIG_HAS_EARLYSUSPEND
> -static void synaptics_ts_early_suspend(struct early_suspend *h)
> -{
> - ? ? ? struct synaptics_ts_data *ts;
> - ? ? ? ts = container_of(h, struct synaptics_ts_data, early_suspend);
> - ? ? ? synaptics_ts_suspend(ts->client, PMSG_SUSPEND);
> -}
> -
> -static void synaptics_ts_late_resume(struct early_suspend *h)
> -{
> - ? ? ? struct synaptics_ts_data *ts;
> - ? ? ? ts = container_of(h, struct synaptics_ts_data, early_suspend);
> - ? ? ? synaptics_ts_resume(ts->client);
> -}
> -#endif
>
> ?static const struct i2c_device_id synaptics_ts_id[] = {
> ? ? ? ?{ SYNAPTICS_I2C_RMI_NAME, 0 },
> @@ -600,10 +515,6 @@ static const struct i2c_device_id synaptics_ts_id[] = {
> ?static struct i2c_driver synaptics_ts_driver = {
> ? ? ? ?.probe ? ? ? ? ?= synaptics_ts_probe,
> ? ? ? ?.remove ? ? ? ? = synaptics_ts_remove,
> -#ifndef CONFIG_HAS_EARLYSUSPEND
> - ? ? ? .suspend ? ? ? ?= synaptics_ts_suspend,
> - ? ? ? .resume ? ? ? ? = synaptics_ts_resume,
> -#endif
Remove #ifndef only, not the content.
> ? ? ? ?.id_table ? ? ? = synaptics_ts_id,
> ? ? ? ?.driver = {
> ? ? ? ? ? ? ? ?.name ? = SYNAPTICS_I2C_RMI_NAME,
> diff --git a/include/linux/synaptics_i2c_rmi.h b/include/linux/synaptics_i2c_rmi.h
> index ca51b2f..73e1de7 100644
> --- a/include/linux/synaptics_i2c_rmi.h
> +++ b/include/linux/synaptics_i2c_rmi.h
> @@ -1,5 +1,5 @@
> ?/*
> - * include/linux/synaptics_i2c_rmi.h - platform data structure for f75375s sensor
> + * synaptics_i2c_rmi.h - platform data structure for f75375s sensor
> ?*
> ?* Copyright (C) 2008 Google, Inc.
> ?*
> @@ -27,25 +27,25 @@ enum {
> ?};
>
> ?struct synaptics_i2c_rmi_platform_data {
> - ? ? ? uint32_t version; ? ? ? /* Use this entry for panels with */
> + ? ? ? u32 version; ? ?/* Use this entry for panels with */
> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?/* (major << 8 | minor) version or above. */
> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?/* If non-zero another array entry follows */
> ? ? ? ?int (*power)(int on); ? /* Only valid in first array entry */
> - ? ? ? uint32_t flags;
> - ? ? ? uint32_t inactive_left; /* 0x10000 = screen width */
> - ? ? ? uint32_t inactive_right; /* 0x10000 = screen width */
> - ? ? ? uint32_t inactive_top; /* 0x10000 = screen height */
> - ? ? ? uint32_t inactive_bottom; /* 0x10000 = screen height */
> - ? ? ? uint32_t snap_left_on; /* 0x10000 = screen width */
> - ? ? ? uint32_t snap_left_off; /* 0x10000 = screen width */
> - ? ? ? uint32_t snap_right_on; /* 0x10000 = screen width */
> - ? ? ? uint32_t snap_right_off; /* 0x10000 = screen width */
> - ? ? ? uint32_t snap_top_on; /* 0x10000 = screen height */
> - ? ? ? uint32_t snap_top_off; /* 0x10000 = screen height */
> - ? ? ? uint32_t snap_bottom_on; /* 0x10000 = screen height */
> - ? ? ? uint32_t snap_bottom_off; /* 0x10000 = screen height */
> - ? ? ? uint32_t fuzz_x; /* 0x10000 = screen width */
> - ? ? ? uint32_t fuzz_y; /* 0x10000 = screen height */
> + ? ? ? u32 flags;
> + ? ? ? u32 inactive_left; /* 0x10000 = screen width */
> + ? ? ? u32 inactive_right; /* 0x10000 = screen width */
> + ? ? ? u32 inactive_top; /* 0x10000 = screen height */
> + ? ? ? u32 inactive_bottom; /* 0x10000 = screen height */
> + ? ? ? u32 snap_left_on; /* 0x10000 = screen width */
> + ? ? ? u32 snap_left_off; /* 0x10000 = screen width */
> + ? ? ? u32 snap_right_on; /* 0x10000 = screen width */
> + ? ? ? u32 snap_right_off; /* 0x10000 = screen width */
> + ? ? ? u32 snap_top_on; /* 0x10000 = screen height */
> + ? ? ? u32 snap_top_off; /* 0x10000 = screen height */
> + ? ? ? u32 snap_bottom_on; /* 0x10000 = screen height */
> + ? ? ? u32 snap_bottom_off; /* 0x10000 = screen height */
> + ? ? ? u32 fuzz_x; /* 0x10000 = screen width */
> + ? ? ? u32 fuzz_y; /* 0x10000 = screen height */
I prefer the existing C99 types.
> ? ? ? ?int fuzz_p;
> ? ? ? ?int fuzz_w;
> ?};
>
> --
> (english) http://www.livejournal.com/~pavelmachek
> (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at ?http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at ?http://www.tux.org/lkml/
>
This driver only supports a subset of Synaptics' devices so a more
generic driver will eventually be needed. The patch below adds support
for a more recent but similar panel.
--
Arve Hj?nnev?g
----
commit 22d8c831554b8bec6e9fbac9d6bf972c775ee128
Author: Arve Hj?nnev?g <[email protected]>
Date: Wed Jul 8 21:32:06 2009 -0700
Input: synaptics_i2c_rmi: Add support for panels with
has-no-relative-data property.
Signed-off-by: Arve Hj?nnev?g <[email protected]>
diff --git a/drivers/input/touchscreen/synaptics_i2c_rmi.c
b/drivers/input/touchscreen/synaptics_i2c_rmi.c
index a45634b..88c8e4a 100644
--- a/drivers/input/touchscreen/synaptics_i2c_rmi.c
+++ b/drivers/input/touchscreen/synaptics_i2c_rmi.c
@@ -33,6 +33,7 @@ struct synaptics_ts_data {
struct i2c_client *client;
struct input_dev *input_dev;
int use_irq;
+ bool has_relative_report;
struct hrtimer timer;
struct work_struct work;
uint16_t max[2];
@@ -85,6 +86,7 @@ static void synaptics_ts_work_func(struct work_struct *work)
uint8_t start_reg;
uint8_t buf[15];
struct synaptics_ts_data *ts = container_of(work, struct
synaptics_ts_data, work);
+ int buf_len = ts->has_relative_report ? 15 : 13;
msg[0].addr = ts->client->addr;
msg[0].flags = 0;
@@ -93,7 +95,7 @@ static void synaptics_ts_work_func(struct work_struct *work)
start_reg = 0x00;
msg[1].addr = ts->client->addr;
msg[1].flags = I2C_M_RD;
- msg[1].len = sizeof(buf);
+ msg[1].len = buf_len;
msg[1].buf = buf;
/* printk("synaptics_ts_work_func\n"); */
@@ -109,7 +111,7 @@ static void synaptics_ts_work_func(struct work_struct *work)
/* buf[4], buf[5], buf[6], buf[7], */
/* buf[8], buf[9], buf[10], buf[11], */
/* buf[12], buf[13], buf[14], ret); */
- if ((buf[14] & 0xc0) != 0x40) {
+ if ((buf[buf_len - 1] & 0xc0) != 0x40) {
printk(KERN_WARNING "synaptics_ts_work_func:"
" bad read %x %x %x %x %x %x %x %x %x"
" %x %x %x %x %x %x, ret %d\n",
@@ -123,7 +125,7 @@ static void synaptics_ts_work_func(struct work_struct *work)
continue;
}
bad_data = 0;
- if ((buf[14] & 1) == 0) {
+ if ((buf[buf_len - 1] & 1) == 0) {
/* printk("read %d coordinates\n", i); */
break;
} else {
@@ -394,6 +396,13 @@ static int synaptics_ts_probe(
printk(KERN_ERR "i2c_smbus_write_byte_data failed for
page select\n");
goto err_detect_failed;
}
+ ret = i2c_smbus_read_word_data(ts->client, 0x02);
+ if (ret < 0) {
+ printk(KERN_ERR "i2c_smbus_read_word_data failed\n");
+ goto err_detect_failed;
+ }
+ ts->has_relative_report = !(ret & 0x100);
+ printk(KERN_INFO "synaptics_ts_probe: Sensor properties %x\n", ret);
ret = i2c_smbus_read_word_data(ts->client, 0x04);
if (ret < 0) {
printk(KERN_ERR "i2c_smbus_read_word_data failed\n");
On Mon, 2009-07-13 at 18:29 -0700, Arve Hjønnevåg wrote:
> On Mon, Jul 13, 2009 at 3:07 PM, Pavel Machek<[email protected]> wrote:
> > - printk(KERN_ERR "synaptics_ts_work_func: i2c_transfer failed\n");
> > + printk(KERN_ERR "ts_work: i2c_transfer failed\n");
> This will make it harder to read the kernel logs since the driver is
> no longer specified.
How about converting to:
#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
or
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
and pr_<level>()
On Tue, 2009-07-14 at 00:07 +0200, Pavel Machek wrote:
> On Mon 2009-07-13 22:57:49, Pavel Machek wrote:
> > Hi!
> >
> > I'm looking at synaptic touchscreen driver... who should be listed as
> > an author?
> >
> > Changes I have so far are...
> >
> > checkpatch only has minor complains -- lines over 80 characters -- but
> > the code is _way_ too deeply nested with way too little functions.
>
> Here's better cleanup. But... some functions are still _way_ too big.
>
I'd put the nesting removal into another patch .. It makes reviewing
more clear, your first patch was already fairly busy .. It would also
make a bisect more fine grained if it lands on one of your patches.
Daniel
Hi Pavel,
On Tue, Jul 14, 2009 at 7:18 AM, Daniel Walker<[email protected]> wrote:
> On Tue, 2009-07-14 at 00:07 +0200, Pavel Machek wrote:
>> On Mon 2009-07-13 22:57:49, Pavel Machek wrote:
>> > Hi!
>> >
>> > I'm looking at synaptic touchscreen driver... who should be listed as
>> > an author?
>> >
>> > Changes I have so far are...
>> >
>> > checkpatch only has minor complains -- lines over 80 characters -- but
>> > the code is _way_ too deeply nested with way too little functions.
>>
>> Here's better cleanup. But... some functions are still _way_ too big.
>>
>
> I'd put the nesting removal into another patch .. It makes reviewing
> more clear, your first patch was already fairly busy .. It would also
> make a bisect more fine grained if it lands on one of your patches.
Please keep linux-input ML for any updates or when you have single
patch ready to submit for review.
--
---Trilok Soni
http://triloksoni.wordpress.com
http://www.linkedin.com/in/triloksoni
On Mon 2009-07-13 18:29:52, Arve Hj?nnev?g wrote:
> On Mon, Jul 13, 2009 at 3:07 PM, Pavel Machek<[email protected]> wrote:
> > On Mon 2009-07-13 22:57:49, Pavel Machek wrote:
> >> Hi!
> >>
> >> I'm looking at synaptic touchscreen driver... who should be listed as
> >> an author?
> >>
> >> Changes I have so far are...
> >>
> >> checkpatch only has minor complains -- lines over 80 characters -- but
> >> the code is _way_ too deeply nested with way too little functions.
> >
> > Here's better cleanup. But... some functions are still _way_ too big.
> >
> > Signed-off-by: Pavel Machek <[email protected]>
> > diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
> > index 339083e..fa3404f 100644
> > --- a/drivers/input/touchscreen/Kconfig
> > +++ b/drivers/input/touchscreen/Kconfig
> > @@ -94,6 +94,9 @@ config TOUCHSCREEN_GUNZE
> > ?config TOUCHSCREEN_ELAN_I2C_8232
> > ? ? ? ?tristate "Elan 8232 I2C touchscreen"
> > ? ? ? ?depends on I2C
> > + ? ? ? help
> > + ? ? ? ? This enables support for Elan over I2C based touchscreens.
> > + ? ? ? ? Such touchscreen is used in HTC Dream.
> >
>
> Why is this here? This driver is not related to elan touchscreens.
I forgot to strip it. Can you apply it to linux-msm tree so that it does
not get lost?
> > ?static struct workqueue_struct *synaptics_wq;
> >
> > ?struct synaptics_ts_data {
> > - ? ? ? uint16_t addr;
> > + ? ? ? u16 addr;
>
> What is the point of this change?
u16 is both shorter and more common in kernel, so use that.
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
> > ? ? ? ?if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
> > ? ? ? ? ? ? ? ?printk(KERN_ERR "synaptics_ts_probe: need I2C_FUNC_I2C\n");
> > @@ -269,6 +354,9 @@ static int synaptics_ts_probe(
> > ? ? ? ?pdata = client->dev.platform_data;
> > ? ? ? ?if (pdata)
> > ? ? ? ? ? ? ? ?ts->power = pdata->power;
> > + ? ? ? else
> > + ? ? ? ? ? ? ? pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
> > +
>
> Where do you free this?
Well, nowhere; but it should not actually matter. ... btw can this
path (!pdata) actually trigger? The driver will not be working,
anyway, in that case..
> > - ? ? ? if (ts->use_irq)
> > - ? ? ? ? ? ? ? enable_irq(client->irq);
> > -
> > - ? ? ? if (!ts->use_irq)
> > - ? ? ? ? ? ? ? hrtimer_start(&ts->timer, ktime_set(1, 0), HRTIMER_MODE_REL);
> > - ? ? ? else
> > - ? ? ? ? ? ? ? i2c_smbus_write_byte_data(ts->client, 0xf1, 0x01); /* enable abs int */
> > -
> > - ? ? ? return 0;
> > -}
>
> Why did you remove suspend and resume?
I thought it depended on earlysuspend.
> > ?static const struct i2c_device_id synaptics_ts_id[] = {
> > ? ? ? ?{ SYNAPTICS_I2C_RMI_NAME, 0 },
> > @@ -600,10 +515,6 @@ static const struct i2c_device_id synaptics_ts_id[] = {
> > ?static struct i2c_driver synaptics_ts_driver = {
> > ? ? ? ?.probe ? ? ? ? ?= synaptics_ts_probe,
> > ? ? ? ?.remove ? ? ? ? = synaptics_ts_remove,
> > -#ifndef CONFIG_HAS_EARLYSUSPEND
> > - ? ? ? .suspend ? ? ? ?= synaptics_ts_suspend,
> > - ? ? ? .resume ? ? ? ? = synaptics_ts_resume,
> > -#endif
>
> Remove #ifndef only, not the content.
Aha, I see; yes, my fault.
> > + ? ? ? u32 flags;
> > + ? ? ? u32 inactive_left; /* 0x10000 = screen width */
> > + ? ? ? u32 inactive_right; /* 0x10000 = screen width */
> > + ? ? ? u32 inactive_top; /* 0x10000 = screen height */
> > + ? ? ? u32 inactive_bottom; /* 0x10000 = screen height */
> > + ? ? ? u32 snap_left_on; /* 0x10000 = screen width */
> > + ? ? ? u32 snap_left_off; /* 0x10000 = screen width */
> > + ? ? ? u32 snap_right_on; /* 0x10000 = screen width */
> > + ? ? ? u32 snap_right_off; /* 0x10000 = screen width */
> > + ? ? ? u32 snap_top_on; /* 0x10000 = screen height */
> > + ? ? ? u32 snap_top_off; /* 0x10000 = screen height */
> > + ? ? ? u32 snap_bottom_on; /* 0x10000 = screen height */
> > + ? ? ? u32 snap_bottom_off; /* 0x10000 = screen height */
> > + ? ? ? u32 fuzz_x; /* 0x10000 = screen width */
> > + ? ? ? u32 fuzz_y; /* 0x10000 = screen height */
>
> I prefer the existing C99 types.
Yes, well, the rest of kernel disagrees with you.
> This driver only supports a subset of Synaptics' devices so a more
> generic driver will eventually be needed. The patch below adds support
> for a more recent but similar panel.
Ok, that should be simple enough to apply, but lets do improvements
when we cleaned the code enough for the mainline...?
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
On Mon 2009-07-13 18:44:23, Joe Perches wrote:
> On Mon, 2009-07-13 at 18:29 -0700, Arve Hj??nnev??g wrote:
> > On Mon, Jul 13, 2009 at 3:07 PM, Pavel Machek<[email protected]> wrote:
> > > - printk(KERN_ERR "synaptics_ts_work_func: i2c_transfer failed\n");
> > > + printk(KERN_ERR "ts_work: i2c_transfer failed\n");
> > This will make it harder to read the kernel logs since the driver is
> > no longer specified.
>
> How about converting to:
>
> #define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
> or
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>
> and pr_<level>()
Good idea, thanks.
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
On Mon 2009-07-13 17:17:58, Brian Swetland wrote:
> On Mon, Jul 13, 2009 at 1:57 PM, Pavel Machek<[email protected]> wrote:
> > Hi!
> >
> > I'm looking at synaptic touchscreen driver... who should be listed as
> > an author?
>
> Arve.
>
> Arve -- You'll want to look at Pavel's revised synaptics driver, sent to lkml.
Ok, I have problem here. How to spell Arve's second name in us-ascii?
(That's unfortunately all my consoles can do...)
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Hi!
Here's updated patch:
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 339083e..fa3404f 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -215,6 +218,8 @@ config TOUCHSCREEN_SYNAPTICS_I2C_RMI
depends on I2C
help
This enables support for Synaptics RMI over I2C based touchscreens.
+ Such touchscreen is used in HTC Dream.
+
config TOUCHSCREEN_TOUCHRIGHT
tristate "Touchright serial touchscreen"
diff --git a/drivers/input/touchscreen/synaptics_i2c_rmi.c b/drivers/input/touchscreen/synaptics_i2c_rmi.c
index a45634b..fe10e85 100644
--- a/drivers/input/touchscreen/synaptics_i2c_rmi.c
+++ b/drivers/input/touchscreen/synaptics_i2c_rmi.c
@@ -1,6 +1,8 @@
-/* drivers/input/keyboard/synaptics_i2c_rmi.c
+/*
+ * Support for synaptics touchscreen.
*
* Copyright (C) 2007 Google, Inc.
+ * Author: Arve Hj?nnev?g <[email protected]>
*
* This software is licensed under the terms of the GNU General Public
* License version 2, as published by the Free Software Foundation, and
@@ -15,7 +17,6 @@
#include <linux/module.h>
#include <linux/delay.h>
-#include <linux/earlysuspend.h>
#include <linux/hrtimer.h>
#include <linux/i2c.h>
#include <linux/input.h>
@@ -24,18 +25,16 @@
#include <linux/platform_device.h>
#include <linux/synaptics_i2c_rmi.h>
-#define swap(x, y) do { typeof(x) z = x; x = y; y = z; } while (0)
-
static struct workqueue_struct *synaptics_wq;
struct synaptics_ts_data {
- uint16_t addr;
+ u16 addr;
struct i2c_client *client;
struct input_dev *input_dev;
int use_irq;
struct hrtimer timer;
struct work_struct work;
- uint16_t max[2];
+ u16 max[2];
int snap_state[2][2];
int snap_down_on[2];
int snap_down_off[2];
@@ -43,164 +42,143 @@ struct synaptics_ts_data {
int snap_up_off[2];
int snap_down[2];
int snap_up[2];
- uint32_t flags;
+ u32 flags;
int (*power)(int on);
- struct early_suspend early_suspend;
};
-#ifdef CONFIG_HAS_EARLYSUSPEND
-static void synaptics_ts_early_suspend(struct early_suspend *h);
-static void synaptics_ts_late_resume(struct early_suspend *h);
-#endif
+static int i2c_set(struct synaptics_ts_data *ts, u8 reg, u8 val, char *msg)
+{
+ int ret = i2c_smbus_write_byte_data(ts->client, reg, val);
+ if (ret < 0)
+ pr_err("i2c_smbus_write_byte_data failed (%s)\n", msg);
+ return ret;
+}
+
+static int i2c_read(struct synaptics_ts_data *ts, u8 reg, char *msg)
+{
+ int ret = i2c_smbus_read_byte_data(ts->client, 0xf0);
+ if (ret < 0)
+ pr_err("i2c_smbus_read_byte_data failed (%s)\n", msg);
+ return ret;
+}
static int synaptics_init_panel(struct synaptics_ts_data *ts)
{
int ret;
- ret = i2c_smbus_write_byte_data(ts->client, 0xff, 0x10); /* page select = 0x10 */
- if (ret < 0) {
- printk(KERN_ERR "i2c_smbus_write_byte_data failed for page select\n");
- goto err_page_select_failed;
- }
- ret = i2c_smbus_write_byte_data(ts->client, 0x41, 0x04); /* Set "No Clip Z" */
- if (ret < 0)
- printk(KERN_ERR "i2c_smbus_write_byte_data failed for No Clip Z\n");
+ ret = i2c_set(ts, 0xff, 0x10, "set page select");
+ if (ret == 0)
+ ret = i2c_set(ts, 0x41, 0x04, "set No Clip Z");
-err_page_select_failed:
- ret = i2c_smbus_write_byte_data(ts->client, 0xff, 0x04); /* page select = 0x04 */
- if (ret < 0)
- printk(KERN_ERR "i2c_smbus_write_byte_data failed for page select\n");
- ret = i2c_smbus_write_byte_data(ts->client, 0xf0, 0x81); /* normal operation, 80 reports per second */
- if (ret < 0)
- printk(KERN_ERR "synaptics_ts_resume: i2c_smbus_write_byte_data failed\n");
+ ret = i2c_set(ts, 0xff, 0x04, "fallback page select");
+ ret = i2c_set(ts, 0xf0, 0x81, "select 80 reports per second");
return ret;
}
+static void decode_report(struct synaptics_ts_data *ts, u8 *buf)
+{
+ int pos[2][2];
+ int f, a;
+ int base = 2;
+ int z = buf[1];
+ int w = buf[0] >> 4;
+ int finger = buf[0] & 7;
+ int finger2_pressed;
+
+ for (f = 0; f < 2; f++) {
+ u32 flip_flag = SYNAPTICS_FLIP_X;
+ for (a = 0; a < 2; a++) {
+ int p = buf[base + 1];
+ p |= (u16)(buf[base] & 0x1f) << 8;
+ if (ts->flags & flip_flag)
+ p = ts->max[a] - p;
+ if (ts->flags & SYNAPTICS_SNAP_TO_INACTIVE_EDGE) {
+ if (ts->snap_state[f][a]) {
+ if (p <= ts->snap_down_off[a])
+ p = ts->snap_down[a];
+ else if (p >= ts->snap_up_off[a])
+ p = ts->snap_up[a];
+ else
+ ts->snap_state[f][a] = 0;
+ } else {
+ if (p <= ts->snap_down_on[a]) {
+ p = ts->snap_down[a];
+ ts->snap_state[f][a] = 1;
+ } else if (p >= ts->snap_up_on[a]) {
+ p = ts->snap_up[a];
+ ts->snap_state[f][a] = 1;
+ }
+ }
+ }
+ pos[f][a] = p;
+ base += 2;
+ flip_flag <<= 1;
+ }
+ base += 2;
+ if (ts->flags & SYNAPTICS_SWAP_XY)
+ swap(pos[f][0], pos[f][1]);
+ }
+ if (z) {
+ input_report_abs(ts->input_dev, ABS_X, pos[0][0]);
+ input_report_abs(ts->input_dev, ABS_Y, pos[0][1]);
+ }
+ input_report_abs(ts->input_dev, ABS_PRESSURE, z);
+ input_report_abs(ts->input_dev, ABS_TOOL_WIDTH, w);
+ input_report_key(ts->input_dev, BTN_TOUCH, finger);
+ finger2_pressed = finger > 1 && finger != 7;
+ input_report_key(ts->input_dev, BTN_2, finger2_pressed);
+ if (finger2_pressed) {
+ input_report_abs(ts->input_dev, ABS_HAT0X, pos[1][0]);
+ input_report_abs(ts->input_dev, ABS_HAT0Y, pos[1][1]);
+ }
+ input_sync(ts->input_dev);
+}
+
static void synaptics_ts_work_func(struct work_struct *work)
{
int i;
int ret;
int bad_data = 0;
struct i2c_msg msg[2];
- uint8_t start_reg;
- uint8_t buf[15];
- struct synaptics_ts_data *ts = container_of(work, struct synaptics_ts_data, work);
+ u8 start_reg = 0;
+ u8 buf[15];
+ struct synaptics_ts_data *ts =
+ container_of(work, struct synaptics_ts_data, work);
msg[0].addr = ts->client->addr;
msg[0].flags = 0;
msg[0].len = 1;
msg[0].buf = &start_reg;
- start_reg = 0x00;
msg[1].addr = ts->client->addr;
msg[1].flags = I2C_M_RD;
msg[1].len = sizeof(buf);
msg[1].buf = buf;
- /* printk("synaptics_ts_work_func\n"); */
for (i = 0; i < ((ts->use_irq && !bad_data) ? 1 : 10); i++) {
ret = i2c_transfer(ts->client->adapter, msg, 2);
if (ret < 0) {
- printk(KERN_ERR "synaptics_ts_work_func: i2c_transfer failed\n");
+ printk(KERN_ERR "ts_work: i2c_transfer failed\n");
bad_data = 1;
- } else {
- /* printk("synaptics_ts_work_func: %x %x %x %x %x %x" */
- /* " %x %x %x %x %x %x %x %x %x, ret %d\n", */
- /* buf[0], buf[1], buf[2], buf[3], */
- /* buf[4], buf[5], buf[6], buf[7], */
- /* buf[8], buf[9], buf[10], buf[11], */
- /* buf[12], buf[13], buf[14], ret); */
- if ((buf[14] & 0xc0) != 0x40) {
- printk(KERN_WARNING "synaptics_ts_work_func:"
- " bad read %x %x %x %x %x %x %x %x %x"
- " %x %x %x %x %x %x, ret %d\n",
- buf[0], buf[1], buf[2], buf[3],
- buf[4], buf[5], buf[6], buf[7],
- buf[8], buf[9], buf[10], buf[11],
- buf[12], buf[13], buf[14], ret);
- if (bad_data)
- synaptics_init_panel(ts);
- bad_data = 1;
- continue;
- }
- bad_data = 0;
- if ((buf[14] & 1) == 0) {
- /* printk("read %d coordinates\n", i); */
- break;
- } else {
- int pos[2][2];
- int f, a;
- int base;
- /* int x = buf[3] | (uint16_t)(buf[2] & 0x1f) << 8; */
- /* int y = buf[5] | (uint16_t)(buf[4] & 0x1f) << 8; */
- int z = buf[1];
- int w = buf[0] >> 4;
- int finger = buf[0] & 7;
-
- /* int x2 = buf[3+6] | (uint16_t)(buf[2+6] & 0x1f) << 8; */
- /* int y2 = buf[5+6] | (uint16_t)(buf[4+6] & 0x1f) << 8; */
- /* int z2 = buf[1+6]; */
- /* int w2 = buf[0+6] >> 4; */
- /* int finger2 = buf[0+6] & 7; */
-
- /* int dx = (int8_t)buf[12]; */
- /* int dy = (int8_t)buf[13]; */
- int finger2_pressed;
-
- /* printk("x %4d, y %4d, z %3d, w %2d, F %d, 2nd: x %4d, y %4d, z %3d, w %2d, F %d, dx %4d, dy %4d\n", */
- /* x, y, z, w, finger, */
- /* x2, y2, z2, w2, finger2, */
- /* dx, dy); */
-
- base = 2;
- for (f = 0; f < 2; f++) {
- uint32_t flip_flag = SYNAPTICS_FLIP_X;
- for (a = 0; a < 2; a++) {
- int p = buf[base + 1];
- p |= (uint16_t)(buf[base] & 0x1f) << 8;
- if (ts->flags & flip_flag)
- p = ts->max[a] - p;
- if (ts->flags & SYNAPTICS_SNAP_TO_INACTIVE_EDGE) {
- if (ts->snap_state[f][a]) {
- if (p <= ts->snap_down_off[a])
- p = ts->snap_down[a];
- else if (p >= ts->snap_up_off[a])
- p = ts->snap_up[a];
- else
- ts->snap_state[f][a] = 0;
- } else {
- if (p <= ts->snap_down_on[a]) {
- p = ts->snap_down[a];
- ts->snap_state[f][a] = 1;
- } else if (p >= ts->snap_up_on[a]) {
- p = ts->snap_up[a];
- ts->snap_state[f][a] = 1;
- }
- }
- }
- pos[f][a] = p;
- base += 2;
- flip_flag <<= 1;
- }
- base += 2;
- if (ts->flags & SYNAPTICS_SWAP_XY)
- swap(pos[f][0], pos[f][1]);
- }
- if (z) {
- input_report_abs(ts->input_dev, ABS_X, pos[0][0]);
- input_report_abs(ts->input_dev, ABS_Y, pos[0][1]);
- }
- input_report_abs(ts->input_dev, ABS_PRESSURE, z);
- input_report_abs(ts->input_dev, ABS_TOOL_WIDTH, w);
- input_report_key(ts->input_dev, BTN_TOUCH, finger);
- finger2_pressed = finger > 1 && finger != 7;
- input_report_key(ts->input_dev, BTN_2, finger2_pressed);
- if (finger2_pressed) {
- input_report_abs(ts->input_dev, ABS_HAT0X, pos[1][0]);
- input_report_abs(ts->input_dev, ABS_HAT0Y, pos[1][1]);
- }
- input_sync(ts->input_dev);
- }
+ continue;
}
+ if ((buf[14] & 0xc0) != 0x40) {
+ printk(KERN_WARNING "synaptics_ts_work_func:"
+ " bad read %x %x %x %x %x %x %x %x %x"
+ " %x %x %x %x %x %x, ret %d\n",
+ buf[0], buf[1], buf[2], buf[3],
+ buf[4], buf[5], buf[6], buf[7],
+ buf[8], buf[9], buf[10], buf[11],
+ buf[12], buf[13], buf[14], ret);
+ if (bad_data)
+ synaptics_init_panel(ts);
+ bad_data = 1;
+ continue;
+ }
+ bad_data = 0;
+ if ((buf[14] & 1) == 0)
+ break;
+
+ decode_report(ts, buf);
}
if (ts->use_irq)
enable_irq(ts->client->irq);
@@ -208,8 +186,8 @@ static void synaptics_ts_work_func(struct work_struct *work)
static enum hrtimer_restart synaptics_ts_timer_func(struct hrtimer *timer)
{
- struct synaptics_ts_data *ts = container_of(timer, struct synaptics_ts_data, timer);
- /* printk("synaptics_ts_timer_func\n"); */
+ struct synaptics_ts_data *ts =
+ container_of(timer, struct synaptics_ts_data, timer);
queue_work(synaptics_wq, &ts->work);
@@ -221,36 +199,144 @@ static irqreturn_t synaptics_ts_irq_handler(int irq, void *dev_id)
{
struct synaptics_ts_data *ts = dev_id;
- /* printk("synaptics_ts_irq_handler\n"); */
disable_irq(ts->client->irq);
queue_work(synaptics_wq, &ts->work);
return IRQ_HANDLED;
}
+static int detect(struct synaptics_ts_data *ts, u32 *panel_version)
+{
+ int ret;
+ int retry = 10;
+
+ ret = i2c_set(ts, 0xf4, 0x01, "reset device");
+
+ while (retry-- > 0) {
+ ret = i2c_smbus_read_byte_data(ts->client, 0xe4);
+ if (ret >= 0)
+ break;
+ msleep(100);
+ }
+ if (ret < 0) {
+ pr_err("i2c_smbus_read_byte_data failed\n");
+ return ret;
+ }
+
+ *panel_version = ret << 8;
+ ret = i2c_read(ts, 0xe5, "product minor");
+ if (ret < 0)
+ return ret;
+ *panel_version |= ret;
+
+ ret = i2c_read(ts, 0xe3, "property");
+ if (ret < 0)
+ return ret;
+
+ pr_info("synaptics: version %x, product property %x\n",
+ *panel_version, ret);
+ return 0;
+}
+
+static void compute_areas(struct synaptics_ts_data *ts,
+ struct synaptics_i2c_rmi_platform_data *pdata,
+ u16 max_x, u16 max_y)
+{
+ u32 inactive_area_left;
+ u32 inactive_area_right;
+ u32 inactive_area_top;
+ u32 inactive_area_bottom;
+ u32 snap_left_on;
+ u32 snap_left_off;
+ u32 snap_right_on;
+ u32 snap_right_off;
+ u32 snap_top_on;
+ u32 snap_top_off;
+ u32 snap_bottom_on;
+ u32 snap_bottom_off;
+ u32 fuzz_x;
+ u32 fuzz_y;
+ int fuzz_p;
+ int fuzz_w;
+ int swapped = !!(ts->flags & SYNAPTICS_SWAP_XY);
+
+ inactive_area_left = pdata->inactive_left;
+ inactive_area_right = pdata->inactive_right;
+ inactive_area_top = pdata->inactive_top;
+ inactive_area_bottom = pdata->inactive_bottom;
+ snap_left_on = pdata->snap_left_on;
+ snap_left_off = pdata->snap_left_off;
+ snap_right_on = pdata->snap_right_on;
+ snap_right_off = pdata->snap_right_off;
+ snap_top_on = pdata->snap_top_on;
+ snap_top_off = pdata->snap_top_off;
+ snap_bottom_on = pdata->snap_bottom_on;
+ snap_bottom_off = pdata->snap_bottom_off;
+ fuzz_x = pdata->fuzz_x;
+ fuzz_y = pdata->fuzz_y;
+ fuzz_p = pdata->fuzz_p;
+ fuzz_w = pdata->fuzz_w;
+
+ inactive_area_left = inactive_area_left * max_x / 0x10000;
+ inactive_area_right = inactive_area_right * max_x / 0x10000;
+ inactive_area_top = inactive_area_top * max_y / 0x10000;
+ inactive_area_bottom = inactive_area_bottom * max_y / 0x10000;
+ snap_left_on = snap_left_on * max_x / 0x10000;
+ snap_left_off = snap_left_off * max_x / 0x10000;
+ snap_right_on = snap_right_on * max_x / 0x10000;
+ snap_right_off = snap_right_off * max_x / 0x10000;
+ snap_top_on = snap_top_on * max_y / 0x10000;
+ snap_top_off = snap_top_off * max_y / 0x10000;
+ snap_bottom_on = snap_bottom_on * max_y / 0x10000;
+ snap_bottom_off = snap_bottom_off * max_y / 0x10000;
+ fuzz_x = fuzz_x * max_x / 0x10000;
+ fuzz_y = fuzz_y * max_y / 0x10000;
+
+
+ ts->snap_down[swapped] = -inactive_area_left;
+ ts->snap_up[swapped] = max_x + inactive_area_right;
+ ts->snap_down[!swapped] = -inactive_area_top;
+ ts->snap_up[!swapped] = max_y + inactive_area_bottom;
+ ts->snap_down_on[swapped] = snap_left_on;
+ ts->snap_down_off[swapped] = snap_left_off;
+ ts->snap_up_on[swapped] = max_x - snap_right_on;
+ ts->snap_up_off[swapped] = max_x - snap_right_off;
+ ts->snap_down_on[!swapped] = snap_top_on;
+ ts->snap_down_off[!swapped] = snap_top_off;
+ ts->snap_up_on[!swapped] = max_y - snap_bottom_on;
+ ts->snap_up_off[!swapped] = max_y - snap_bottom_off;
+ pr_info("synaptics_ts_probe: max_x %d, max_y %d\n", max_x, max_y);
+ pr_info("synaptics_ts_probe: inactive_x %d %d, inactive_y %d %d\n",
+ inactive_area_left, inactive_area_right,
+ inactive_area_top, inactive_area_bottom);
+ pr_info("synaptics_ts_probe: snap_x %d-%d %d-%d, snap_y %d-%d %d-%d\n",
+ snap_left_on, snap_left_off, snap_right_on, snap_right_off,
+ snap_top_on, snap_top_off, snap_bottom_on, snap_bottom_off);
+
+ input_set_abs_params(ts->input_dev, ABS_X,
+ -inactive_area_left, max_x + inactive_area_right,
+ fuzz_x, 0);
+ input_set_abs_params(ts->input_dev, ABS_Y,
+ -inactive_area_top, max_y + inactive_area_bottom,
+ fuzz_y, 0);
+ input_set_abs_params(ts->input_dev, ABS_PRESSURE, 0, 255, fuzz_p, 0);
+ input_set_abs_params(ts->input_dev, ABS_TOOL_WIDTH, 0, 15, fuzz_w, 0);
+ input_set_abs_params(ts->input_dev, ABS_HAT0X, -inactive_area_left,
+ max_x + inactive_area_right, fuzz_x, 0);
+ input_set_abs_params(ts->input_dev, ABS_HAT0Y, -inactive_area_top,
+ max_y + inactive_area_bottom, fuzz_y, 0);
+}
+
static int synaptics_ts_probe(
struct i2c_client *client, const struct i2c_device_id *id)
{
struct synaptics_ts_data *ts;
- uint8_t buf0[4];
- uint8_t buf1[8];
+ u8 buf0[4];
+ u8 buf1[8];
struct i2c_msg msg[2];
int ret = 0;
- uint16_t max_x, max_y;
- int fuzz_x, fuzz_y, fuzz_p, fuzz_w;
struct synaptics_i2c_rmi_platform_data *pdata;
- int inactive_area_left;
- int inactive_area_right;
- int inactive_area_top;
- int inactive_area_bottom;
- int snap_left_on;
- int snap_left_off;
- int snap_right_on;
- int snap_right_off;
- int snap_top_on;
- int snap_top_off;
- int snap_bottom_on;
- int snap_bottom_off;
- uint32_t panel_version;
+ u32 panel_version = 0;
+ u16 max_x, max_y;
if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
printk(KERN_ERR "synaptics_ts_probe: need I2C_FUNC_I2C\n");
@@ -269,6 +355,9 @@ static int synaptics_ts_probe(
pdata = client->dev.platform_data;
if (pdata)
ts->power = pdata->power;
+ else
+ pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
+
if (ts->power) {
ret = ts->power(1);
if (ret < 0) {
@@ -277,99 +366,27 @@ static int synaptics_ts_probe(
}
}
- ret = i2c_smbus_write_byte_data(ts->client, 0xf4, 0x01); /* device command = reset */
- if (ret < 0) {
- printk(KERN_ERR "i2c_smbus_write_byte_data failed\n");
- /* fail? */
- }
- {
- int retry = 10;
- while (retry-- > 0) {
- ret = i2c_smbus_read_byte_data(ts->client, 0xe4);
- if (ret >= 0)
- break;
- msleep(100);
- }
- }
- if (ret < 0) {
- printk(KERN_ERR "i2c_smbus_read_byte_data failed\n");
+ ret = detect(ts, &panel_version);
+ if (ret)
goto err_detect_failed;
- }
- printk(KERN_INFO "synaptics_ts_probe: Product Major Version %x\n", ret);
- panel_version = ret << 8;
- ret = i2c_smbus_read_byte_data(ts->client, 0xe5);
- if (ret < 0) {
- printk(KERN_ERR "i2c_smbus_read_byte_data failed\n");
- goto err_detect_failed;
- }
- printk(KERN_INFO "synaptics_ts_probe: Product Minor Version %x\n", ret);
- panel_version |= ret;
- ret = i2c_smbus_read_byte_data(ts->client, 0xe3);
- if (ret < 0) {
- printk(KERN_ERR "i2c_smbus_read_byte_data failed\n");
- goto err_detect_failed;
- }
- printk(KERN_INFO "synaptics_ts_probe: product property %x\n", ret);
-
- if (pdata) {
- while (pdata->version > panel_version)
- pdata++;
- ts->flags = pdata->flags;
- inactive_area_left = pdata->inactive_left;
- inactive_area_right = pdata->inactive_right;
- inactive_area_top = pdata->inactive_top;
- inactive_area_bottom = pdata->inactive_bottom;
- snap_left_on = pdata->snap_left_on;
- snap_left_off = pdata->snap_left_off;
- snap_right_on = pdata->snap_right_on;
- snap_right_off = pdata->snap_right_off;
- snap_top_on = pdata->snap_top_on;
- snap_top_off = pdata->snap_top_off;
- snap_bottom_on = pdata->snap_bottom_on;
- snap_bottom_off = pdata->snap_bottom_off;
- fuzz_x = pdata->fuzz_x;
- fuzz_y = pdata->fuzz_y;
- fuzz_p = pdata->fuzz_p;
- fuzz_w = pdata->fuzz_w;
- } else {
- inactive_area_left = 0;
- inactive_area_right = 0;
- inactive_area_top = 0;
- inactive_area_bottom = 0;
- snap_left_on = 0;
- snap_left_off = 0;
- snap_right_on = 0;
- snap_right_off = 0;
- snap_top_on = 0;
- snap_top_off = 0;
- snap_bottom_on = 0;
- snap_bottom_off = 0;
- fuzz_x = 0;
- fuzz_y = 0;
- fuzz_p = 0;
- fuzz_w = 0;
- }
+ while (pdata->version > panel_version)
+ pdata++;
+ ts->flags = pdata->flags;
- ret = i2c_smbus_read_byte_data(ts->client, 0xf0);
- if (ret < 0) {
- printk(KERN_ERR "i2c_smbus_read_byte_data failed\n");
+ ret = i2c_read(ts, 0xf0, "device control");
+ if (ret < 0)
goto err_detect_failed;
- }
- printk(KERN_INFO "synaptics_ts_probe: device control %x\n", ret);
+ pr_info("synaptics: device control %x\n", ret);
- ret = i2c_smbus_read_byte_data(ts->client, 0xf1);
- if (ret < 0) {
- printk(KERN_ERR "i2c_smbus_read_byte_data failed\n");
+ ret = i2c_read(ts, 0xf1, "interrupt enable");
+ if (ret < 0)
goto err_detect_failed;
- }
- printk(KERN_INFO "synaptics_ts_probe: interrupt enable %x\n", ret);
+ pr_info("synaptics_ts_probe: interrupt enable %x\n", ret);
- ret = i2c_smbus_write_byte_data(ts->client, 0xf1, 0); /* disable interrupt */
- if (ret < 0) {
- printk(KERN_ERR "i2c_smbus_write_byte_data failed\n");
+ ret = i2c_set(ts, 0xf1, 0, "disable interrupt");
+ if (ret < 0)
goto err_detect_failed;
- }
msg[0].addr = ts->client->addr;
msg[0].flags = 0;
@@ -389,11 +406,10 @@ static int synaptics_ts_probe(
buf1[0], buf1[1], buf1[2], buf1[3],
buf1[4], buf1[5], buf1[6], buf1[7]);
- ret = i2c_smbus_write_byte_data(ts->client, 0xff, 0x10); /* page select = 0x10 */
- if (ret < 0) {
- printk(KERN_ERR "i2c_smbus_write_byte_data failed for page select\n");
+ ret = i2c_set(ts, 0xff, 0x10, "page select = 0x10");
+ if (ret < 0)
goto err_detect_failed;
- }
+
ret = i2c_smbus_read_word_data(ts->client, 0x04);
if (ret < 0) {
printk(KERN_ERR "i2c_smbus_read_word_data failed\n");
@@ -409,16 +425,17 @@ static int synaptics_ts_probe(
if (ts->flags & SYNAPTICS_SWAP_XY)
swap(max_x, max_y);
- ret = synaptics_init_panel(ts); /* will also switch back to page 0x04 */
+ /* will also switch back to page 0x04 */
+ ret = synaptics_init_panel(ts);
if (ret < 0) {
- printk(KERN_ERR "synaptics_init_panel failed\n");
+ pr_err("synaptics_init_panel failed\n");
goto err_detect_failed;
}
ts->input_dev = input_allocate_device();
if (ts->input_dev == NULL) {
ret = -ENOMEM;
- printk(KERN_ERR "synaptics_ts_probe: Failed to allocate input device\n");
+ pr_err("synaptics: Failed to allocate input device\n");
goto err_input_dev_alloc_failed;
}
ts->input_dev->name = "synaptics-rmi-touchscreen";
@@ -427,55 +444,21 @@ static int synaptics_ts_probe(
set_bit(BTN_TOUCH, ts->input_dev->keybit);
set_bit(BTN_2, ts->input_dev->keybit);
set_bit(EV_ABS, ts->input_dev->evbit);
- inactive_area_left = inactive_area_left * max_x / 0x10000;
- inactive_area_right = inactive_area_right * max_x / 0x10000;
- inactive_area_top = inactive_area_top * max_y / 0x10000;
- inactive_area_bottom = inactive_area_bottom * max_y / 0x10000;
- snap_left_on = snap_left_on * max_x / 0x10000;
- snap_left_off = snap_left_off * max_x / 0x10000;
- snap_right_on = snap_right_on * max_x / 0x10000;
- snap_right_off = snap_right_off * max_x / 0x10000;
- snap_top_on = snap_top_on * max_y / 0x10000;
- snap_top_off = snap_top_off * max_y / 0x10000;
- snap_bottom_on = snap_bottom_on * max_y / 0x10000;
- snap_bottom_off = snap_bottom_off * max_y / 0x10000;
- fuzz_x = fuzz_x * max_x / 0x10000;
- fuzz_y = fuzz_y * max_y / 0x10000;
- ts->snap_down[!!(ts->flags & SYNAPTICS_SWAP_XY)] = -inactive_area_left;
- ts->snap_up[!!(ts->flags & SYNAPTICS_SWAP_XY)] = max_x + inactive_area_right;
- ts->snap_down[!(ts->flags & SYNAPTICS_SWAP_XY)] = -inactive_area_top;
- ts->snap_up[!(ts->flags & SYNAPTICS_SWAP_XY)] = max_y + inactive_area_bottom;
- ts->snap_down_on[!!(ts->flags & SYNAPTICS_SWAP_XY)] = snap_left_on;
- ts->snap_down_off[!!(ts->flags & SYNAPTICS_SWAP_XY)] = snap_left_off;
- ts->snap_up_on[!!(ts->flags & SYNAPTICS_SWAP_XY)] = max_x - snap_right_on;
- ts->snap_up_off[!!(ts->flags & SYNAPTICS_SWAP_XY)] = max_x - snap_right_off;
- ts->snap_down_on[!(ts->flags & SYNAPTICS_SWAP_XY)] = snap_top_on;
- ts->snap_down_off[!(ts->flags & SYNAPTICS_SWAP_XY)] = snap_top_off;
- ts->snap_up_on[!(ts->flags & SYNAPTICS_SWAP_XY)] = max_y - snap_bottom_on;
- ts->snap_up_off[!(ts->flags & SYNAPTICS_SWAP_XY)] = max_y - snap_bottom_off;
- printk(KERN_INFO "synaptics_ts_probe: max_x %d, max_y %d\n", max_x, max_y);
- printk(KERN_INFO "synaptics_ts_probe: inactive_x %d %d, inactive_y %d %d\n",
- inactive_area_left, inactive_area_right,
- inactive_area_top, inactive_area_bottom);
- printk(KERN_INFO "synaptics_ts_probe: snap_x %d-%d %d-%d, snap_y %d-%d %d-%d\n",
- snap_left_on, snap_left_off, snap_right_on, snap_right_off,
- snap_top_on, snap_top_off, snap_bottom_on, snap_bottom_off);
- input_set_abs_params(ts->input_dev, ABS_X, -inactive_area_left, max_x + inactive_area_right, fuzz_x, 0);
- input_set_abs_params(ts->input_dev, ABS_Y, -inactive_area_top, max_y + inactive_area_bottom, fuzz_y, 0);
- input_set_abs_params(ts->input_dev, ABS_PRESSURE, 0, 255, fuzz_p, 0);
- input_set_abs_params(ts->input_dev, ABS_TOOL_WIDTH, 0, 15, fuzz_w, 0);
- input_set_abs_params(ts->input_dev, ABS_HAT0X, -inactive_area_left, max_x + inactive_area_right, fuzz_x, 0);
- input_set_abs_params(ts->input_dev, ABS_HAT0Y, -inactive_area_top, max_y + inactive_area_bottom, fuzz_y, 0);
- /* ts->input_dev->name = ts->keypad_info->name; */
+
+ compute_areas(ts, pdata, max_x, max_y);
+
+
ret = input_register_device(ts->input_dev);
if (ret) {
- printk(KERN_ERR "synaptics_ts_probe: Unable to register %s input device\n", ts->input_dev->name);
+ pr_err("synaptics: Unable to register %s input device\n",
+ ts->input_dev->name);
goto err_input_register_device_failed;
}
if (client->irq) {
- ret = request_irq(client->irq, synaptics_ts_irq_handler, 0, client->name, ts);
+ ret = request_irq(client->irq, synaptics_ts_irq_handler,
+ 0, client->name, ts);
if (ret == 0) {
- ret = i2c_smbus_write_byte_data(ts->client, 0xf1, 0x01); /* enable abs int */
+ ret = i2c_set(ts, 0xf1, 0x01, "enable abs int");
if (ret)
free_irq(client->irq, ts);
}
@@ -489,33 +472,28 @@ static int synaptics_ts_probe(
ts->timer.function = synaptics_ts_timer_func;
hrtimer_start(&ts->timer, ktime_set(1, 0), HRTIMER_MODE_REL);
}
-#ifdef CONFIG_HAS_EARLYSUSPEND
- ts->early_suspend.level = EARLY_SUSPEND_LEVEL_BLANK_SCREEN + 1;
- ts->early_suspend.suspend = synaptics_ts_early_suspend;
- ts->early_suspend.resume = synaptics_ts_late_resume;
- register_early_suspend(&ts->early_suspend);
-#endif
- printk(KERN_INFO "synaptics_ts_probe: Start touchscreen %s in %s mode\n", ts->input_dev->name, ts->use_irq ? "interrupt" : "polling");
+ pr_info("synaptics: Start touchscreen %s in %s mode\n",
+ ts->input_dev->name, ts->use_irq ? "interrupt" : "polling");
return 0;
-err_input_register_device_failed:
+ err_input_register_device_failed:
input_free_device(ts->input_dev);
-err_input_dev_alloc_failed:
-err_detect_failed:
-err_power_failed:
+ err_input_dev_alloc_failed:
+ err_detect_failed:
+ err_power_failed:
kfree(ts);
-err_alloc_data_failed:
-err_check_functionality_failed:
+ err_alloc_data_failed:
+ err_check_functionality_failed:
return ret;
}
static int synaptics_ts_remove(struct i2c_client *client)
{
struct synaptics_ts_data *ts = i2c_get_clientdata(client);
- unregister_early_suspend(&ts->early_suspend);
+
if (ts->use_irq)
free_irq(client->irq, ts);
else
@@ -537,17 +515,13 @@ static int synaptics_ts_suspend(struct i2c_client *client, pm_message_t mesg)
ret = cancel_work_sync(&ts->work);
if (ret && ts->use_irq) /* if work was pending disable-count is now 2 */
enable_irq(client->irq);
- ret = i2c_smbus_write_byte_data(ts->client, 0xf1, 0); /* disable interrupt */
- if (ret < 0)
- printk(KERN_ERR "synaptics_ts_suspend: i2c_smbus_write_byte_data failed\n");
+ i2c_set(ts, 0xf1, 0, "disable interrupt");
+ i2c_set(ts, 0xf0, 0x86, "deep sleep");
- ret = i2c_smbus_write_byte_data(client, 0xf0, 0x86); /* deep sleep */
- if (ret < 0)
- printk(KERN_ERR "synaptics_ts_suspend: i2c_smbus_write_byte_data failed\n");
if (ts->power) {
ret = ts->power(0);
if (ret < 0)
- printk(KERN_ERR "synaptics_ts_resume power off failed\n");
+ pr_err("synaptics_ts_suspend power off failed\n");
}
return 0;
}
@@ -560,37 +534,20 @@ static int synaptics_ts_resume(struct i2c_client *client)
if (ts->power) {
ret = ts->power(1);
if (ret < 0)
- printk(KERN_ERR "synaptics_ts_resume power on failed\n");
+ pr_err("synaptics_ts_resume power on failed\n");
}
synaptics_init_panel(ts);
- if (ts->use_irq)
+ if (ts->use_irq) {
enable_irq(client->irq);
-
- if (!ts->use_irq)
+ i2c_set(ts, 0xf1, 0x01, "enable abs int");
+ } else
hrtimer_start(&ts->timer, ktime_set(1, 0), HRTIMER_MODE_REL);
- else
- i2c_smbus_write_byte_data(ts->client, 0xf1, 0x01); /* enable abs int */
return 0;
}
-#ifdef CONFIG_HAS_EARLYSUSPEND
-static void synaptics_ts_early_suspend(struct early_suspend *h)
-{
- struct synaptics_ts_data *ts;
- ts = container_of(h, struct synaptics_ts_data, early_suspend);
- synaptics_ts_suspend(ts->client, PMSG_SUSPEND);
-}
-
-static void synaptics_ts_late_resume(struct early_suspend *h)
-{
- struct synaptics_ts_data *ts;
- ts = container_of(h, struct synaptics_ts_data, early_suspend);
- synaptics_ts_resume(ts->client);
-}
-#endif
static const struct i2c_device_id synaptics_ts_id[] = {
{ SYNAPTICS_I2C_RMI_NAME, 0 },
@@ -600,10 +557,8 @@ static const struct i2c_device_id synaptics_ts_id[] = {
static struct i2c_driver synaptics_ts_driver = {
.probe = synaptics_ts_probe,
.remove = synaptics_ts_remove,
-#ifndef CONFIG_HAS_EARLYSUSPEND
.suspend = synaptics_ts_suspend,
.resume = synaptics_ts_resume,
-#endif
.id_table = synaptics_ts_id,
.driver = {
.name = SYNAPTICS_I2C_RMI_NAME,
diff --git a/include/linux/synaptics_i2c_rmi.h b/include/linux/synaptics_i2c_rmi.h
index ca51b2f..73e1de7 100644
--- a/include/linux/synaptics_i2c_rmi.h
+++ b/include/linux/synaptics_i2c_rmi.h
@@ -1,5 +1,5 @@
/*
- * include/linux/synaptics_i2c_rmi.h - platform data structure for f75375s sensor
+ * synaptics_i2c_rmi.h - platform data structure for f75375s sensor
*
* Copyright (C) 2008 Google, Inc.
*
@@ -27,25 +27,25 @@ enum {
};
struct synaptics_i2c_rmi_platform_data {
- uint32_t version; /* Use this entry for panels with */
+ u32 version; /* Use this entry for panels with */
/* (major << 8 | minor) version or above. */
/* If non-zero another array entry follows */
int (*power)(int on); /* Only valid in first array entry */
- uint32_t flags;
- uint32_t inactive_left; /* 0x10000 = screen width */
- uint32_t inactive_right; /* 0x10000 = screen width */
- uint32_t inactive_top; /* 0x10000 = screen height */
- uint32_t inactive_bottom; /* 0x10000 = screen height */
- uint32_t snap_left_on; /* 0x10000 = screen width */
- uint32_t snap_left_off; /* 0x10000 = screen width */
- uint32_t snap_right_on; /* 0x10000 = screen width */
- uint32_t snap_right_off; /* 0x10000 = screen width */
- uint32_t snap_top_on; /* 0x10000 = screen height */
- uint32_t snap_top_off; /* 0x10000 = screen height */
- uint32_t snap_bottom_on; /* 0x10000 = screen height */
- uint32_t snap_bottom_off; /* 0x10000 = screen height */
- uint32_t fuzz_x; /* 0x10000 = screen width */
- uint32_t fuzz_y; /* 0x10000 = screen height */
+ u32 flags;
+ u32 inactive_left; /* 0x10000 = screen width */
+ u32 inactive_right; /* 0x10000 = screen width */
+ u32 inactive_top; /* 0x10000 = screen height */
+ u32 inactive_bottom; /* 0x10000 = screen height */
+ u32 snap_left_on; /* 0x10000 = screen width */
+ u32 snap_left_off; /* 0x10000 = screen width */
+ u32 snap_right_on; /* 0x10000 = screen width */
+ u32 snap_right_off; /* 0x10000 = screen width */
+ u32 snap_top_on; /* 0x10000 = screen height */
+ u32 snap_top_off; /* 0x10000 = screen height */
+ u32 snap_bottom_on; /* 0x10000 = screen height */
+ u32 snap_bottom_off; /* 0x10000 = screen height */
+ u32 fuzz_x; /* 0x10000 = screen width */
+ u32 fuzz_y; /* 0x10000 = screen height */
int fuzz_p;
int fuzz_w;
};
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
On Tue, Jul 14, 2009 at 2:46 AM, Pavel Machek<[email protected]> wrote:
>
>> > ? ? ? ?if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
>> > ? ? ? ? ? ? ? ?printk(KERN_ERR "synaptics_ts_probe: need I2C_FUNC_I2C\n");
>> > @@ -269,6 +354,9 @@ static int synaptics_ts_probe(
>> > ? ? ? ?pdata = client->dev.platform_data;
>> > ? ? ? ?if (pdata)
>> > ? ? ? ? ? ? ? ?ts->power = pdata->power;
>> > + ? ? ? else
>> > + ? ? ? ? ? ? ? pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
>> > +
>>
>> Where do you free this?
>
> Well, nowhere; but it should not actually matter. ... btw can this
> path (!pdata) actually trigger? The driver will not be working,
> anyway, in that case..
The driver should work fine without the pdata. The pdata is used to
align the touchscreen data with the screen behind it.
>> > + ? ? ? u32 flags;
>> > + ? ? ? u32 inactive_left; /* 0x10000 = screen width */
>> > + ? ? ? u32 inactive_right; /* 0x10000 = screen width */
>> > + ? ? ? u32 inactive_top; /* 0x10000 = screen height */
>> > + ? ? ? u32 inactive_bottom; /* 0x10000 = screen height */
>> > + ? ? ? u32 snap_left_on; /* 0x10000 = screen width */
>> > + ? ? ? u32 snap_left_off; /* 0x10000 = screen width */
>> > + ? ? ? u32 snap_right_on; /* 0x10000 = screen width */
>> > + ? ? ? u32 snap_right_off; /* 0x10000 = screen width */
>> > + ? ? ? u32 snap_top_on; /* 0x10000 = screen height */
>> > + ? ? ? u32 snap_top_off; /* 0x10000 = screen height */
>> > + ? ? ? u32 snap_bottom_on; /* 0x10000 = screen height */
>> > + ? ? ? u32 snap_bottom_off; /* 0x10000 = screen height */
>> > + ? ? ? u32 fuzz_x; /* 0x10000 = screen width */
>> > + ? ? ? u32 fuzz_y; /* 0x10000 = screen height */
>>
>> I prefer the existing C99 types.
>
> Yes, well, the rest of kernel disagrees with you.
The coding style document claims C99 types are allowed. If that is no
longer the case it should be updated.
>
>> This driver only supports a subset of Synaptics' devices so a more
>> generic driver will eventually be needed. The patch below adds support
>> for a more recent but similar panel.
>
> Ok, that should be simple enough to apply, but lets do improvements
> when we cleaned the code enough for the mainline...?
We need this change now. Your cleanup will cause conflicts for anyone
using our driver, so it would be better if it includes all our fixes.
--
Arve Hj?nnev?g
Hi!
> >> > ? ? ? ?if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
> >> > ? ? ? ? ? ? ? ?printk(KERN_ERR "synaptics_ts_probe: need I2C_FUNC_I2C\n");
> >> > @@ -269,6 +354,9 @@ static int synaptics_ts_probe(
> >> > ? ? ? ?pdata = client->dev.platform_data;
> >> > ? ? ? ?if (pdata)
> >> > ? ? ? ? ? ? ? ?ts->power = pdata->power;
> >> > + ? ? ? else
> >> > + ? ? ? ? ? ? ? pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
> >> > +
> >>
> >> Where do you free this?
> >
> > Well, nowhere; but it should not actually matter. ... btw can this
> > path (!pdata) actually trigger? The driver will not be working,
> > anyway, in that case..
>
> The driver should work fine without the pdata. The pdata is used to
> align the touchscreen data with the screen behind it.
Ok...
> >> This driver only supports a subset of Synaptics' devices so a more
> >> generic driver will eventually be needed. The patch below adds support
> >> for a more recent but similar panel.
> >
> > Ok, that should be simple enough to apply, but lets do improvements
> > when we cleaned the code enough for the mainline...?
>
> We need this change now. Your cleanup will cause conflicts for anyone
> using our driver, so it would be better if it includes all our fixes.
Well, I don't expect you to use the cleaned-up driver as-is: I had to
remove the wakelocks functionality as infrastructure is not in
mainline. (Plus, I do not have hardware to test your latest version).
Applying small patch on top of cleaned up driver should be better than
carrying whole driver itself, right?
[Alternatively... I can try to incorporate your change, but I'd need
your testing at that point.]
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
On Tue, Jul 14, 2009 at 3:16 PM, Pavel Machek<[email protected]> wrote:
...
>> >> This driver only supports a subset of Synaptics' devices so a more
>> >> generic driver will eventually be needed. The patch below adds support
>> >> for a more recent but similar panel.
>> >
>> > Ok, that should be simple enough to apply, but lets do improvements
>> > when we cleaned the code enough for the mainline...?
>>
>> We need this change now. Your cleanup will cause conflicts for anyone
>> using our driver, so it would be better if it includes all our fixes.
>
> Well, I don't expect you to use the cleaned-up driver as-is: I had to
> remove the wakelocks functionality as infrastructure is not in
> mainline.
OK. The driver does not use wakelocks tough, only earlysuspend, so
your cleaned up version should be fully functional. The early suspend
hooks are only used to save power in idle when the screen is off.
> (Plus, I do not have hardware to test your latest version).
True, but the protocol documentation is available:
http://www.synaptics.com/sites/default/files/511_000099_01F.pdf
>
> Applying small patch on top of cleaned up driver should be better than
> carrying whole driver itself, right?
Perhaps, but the only problem I encountered with this driver so far
was when calling disable_irq from the interrupt handler stopped
working on non-smp systems in 2.6.30 (which is another patch you
should probably apply first).
>
> [Alternatively... I can try to incorporate your change, but I'd need
> your testing at that point.]
> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?Pavel
> --
> (english) http://www.livejournal.com/~pavelmachek
> (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
>
--
Arve Hj?nnev?g
Hi Arve,
2009/7/15 Arve Hj?nnev?g <[email protected]>:
> On Tue, Jul 14, 2009 at 3:16 PM, Pavel Machek<[email protected]> wrote:
> ...
>>> >> This driver only supports a subset of Synaptics' devices so a more
>>> >> generic driver will eventually be needed. The patch below adds support
>>> >> for a more recent but similar panel.
>>> >
>>> > Ok, that should be simple enough to apply, but lets do improvements
>>> > when we cleaned the code enough for the mainline...?
>>>
>>> We need this change now. Your cleanup will cause conflicts for anyone
>>> using our driver, so it would be better if it includes all our fixes.
>>
>> Well, I don't expect you to use the cleaned-up driver as-is: I had to
>> remove the wakelocks functionality as infrastructure is not in
>> mainline.
>
> OK. The driver does not use wakelocks tough, only earlysuspend, so
> your cleaned up version should be fully functional. The early suspend
> hooks are only used to save power in idle when the screen is off.
>
>> (Plus, I do not have hardware to test your latest version).
>
> True, but the protocol documentation is available:
> http://www.synaptics.com/sites/default/files/511_000099_01F.pdf
>
>>
>> Applying small patch on top of cleaned up driver should be better than
>> carrying whole driver itself, right?
>
> Perhaps, but the only problem I encountered with this driver so far
> was when calling disable_irq from the interrupt handler stopped
> working on non-smp systems in 2.6.30 (which is another patch you
> should probably apply first).
disable_irq review comment is already given in the patch posted on
linux-input by Pavel. We should convert this driver to
request_threaded_irq infrastructure instead. I have added linux-input
ML in CC.
--
---Trilok Soni
http://triloksoni.wordpress.com
http://www.linkedin.com/in/triloksoni
2009/7/14 Trilok Soni <[email protected]>:
> Hi Arve,
>
> 2009/7/15 Arve Hj?nnev?g <[email protected]>:
>> On Tue, Jul 14, 2009 at 3:16 PM, Pavel Machek<[email protected]> wrote:
>> ...
>>>> >> This driver only supports a subset of Synaptics' devices so a more
>>>> >> generic driver will eventually be needed. The patch below adds support
>>>> >> for a more recent but similar panel.
>>>> >
>>>> > Ok, that should be simple enough to apply, but lets do improvements
>>>> > when we cleaned the code enough for the mainline...?
>>>>
>>>> We need this change now. Your cleanup will cause conflicts for anyone
>>>> using our driver, so it would be better if it includes all our fixes.
>>>
>>> Well, I don't expect you to use the cleaned-up driver as-is: I had to
>>> remove the wakelocks functionality as infrastructure is not in
>>> mainline.
>>
>> OK. The driver does not use wakelocks tough, only earlysuspend, so
>> your cleaned up version should be fully functional. The early suspend
>> hooks are only used to save power in idle when the screen is off.
>>
>>> (Plus, I do not have hardware to test your latest version).
>>
>> True, but the protocol documentation is available:
>> http://www.synaptics.com/sites/default/files/511_000099_01F.pdf
>>
>>>
>>> Applying small patch on top of cleaned up driver should be better than
>>> carrying whole driver itself, right?
>>
>> Perhaps, but the only problem I encountered with this driver so far
>> was when calling disable_irq from the interrupt handler stopped
>> working on non-smp systems in 2.6.30 (which is another patch you
>> should probably apply first).
>
> disable_irq review comment is already given in the patch posted on
> linux-input by Pavel. We should convert this driver to
> request_threaded_irq infrastructure instead. I have added linux-input
> ML in CC.
>
I looked into using request_threaded_irq a while ago, but decided it
was not worth it since I would still need to create the workqueue if
the interrupt was not available. However, if we drop support for
running without an irq then using request_threaded_irq should be
simpler.
--
Arve Hj?nnev?g
Joe Perches wrote:
> On Mon, 2009-07-13 at 18:29 -0700, Arve Hjønnevåg wrote:
>> On Mon, Jul 13, 2009 at 3:07 PM, Pavel Machek<[email protected]> wrote:
>>> - printk(KERN_ERR "synaptics_ts_work_func: i2c_transfer failed\n");
>>> + printk(KERN_ERR "ts_work: i2c_transfer failed\n");
>> This will make it harder to read the kernel logs since the driver is
>> no longer specified.
>
> How about converting to:
>
> #define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
> or
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>
> and pr_<level>()
dev_printk() and the related helpers in include/linux/device.h
might also be useful.
-Frank Rowand
---
Sony Corporation of America
> > Applying small patch on top of cleaned up driver should be better than
> > carrying whole driver itself, right?
>
> Perhaps, but the only problem I encountered with this driver so far
> was when calling disable_irq from the interrupt handler stopped
> working on non-smp systems in 2.6.30 (which is another patch you
> should probably apply first).
How do I get that patch? git pull on msm-2.6.29 tree?
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
On Sun, Jul 19, 2009 at 2:23 PM, Pavel Machek<[email protected]> wrote:
>
>> > Applying small patch on top of cleaned up driver should be better than
>> > carrying whole driver itself, right?
>>
>> Perhaps, but the only problem I encountered with this driver so far
>> was when calling disable_irq from the interrupt handler stopped
>> working on non-smp systems in 2.6.30 (which is another patch you
>> should probably apply first).
>
> How do I get that patch? git pull on msm-2.6.29 tree?
No it is in the android-msm-2.6.30-rc2-test branch at
git://android.git.kernel.org/kernel/experimental.git (commit
9f89902daf7a3c6fdd6b0c7494f3cc82d5e09217).
--
Arve Hj?nnev?g
Hi!
You probably want (something like) this to mostly fix !EARLY_SUSPEND
compilation.
Signed-off-by: Pavel Machek <[email protected]>
index a45634b..e916cea 100644
--- a/drivers/staging/dream/synaptics_i2c_rmi.c
+++ b/drivers/staging/dream/synaptics_i2c_rmi.c
@@ -45,7 +44,9 @@ struct synaptics_ts_data {
int snap_up[2];
uint32_t flags;
int (*power)(int on);
+#ifdef CONFIG_HAS_EARLYSUSPEND
struct early_suspend early_suspend;
+#endif
};
#ifdef CONFIG_HAS_EARLYSUSPEND
@@ -515,7 +516,9 @@ err_check_functionality_failed:
static int synaptics_ts_remove(struct i2c_client *client)
{
struct synaptics_ts_data *ts = i2c_get_clientdata(client);
+#ifdef CONFIG_HAS_EARLYSUSPEND
unregister_early_suspend(&ts->early_suspend);
+#endif
if (ts->use_irq)
free_irq(client->irq, ts);
else
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
On Sun 2009-07-19 20:43:10, Arve Hj?nnev?g wrote:
> On Sun, Jul 19, 2009 at 2:23 PM, Pavel Machek<[email protected]> wrote:
> >
> >> > Applying small patch on top of cleaned up driver should be better than
> >> > carrying whole driver itself, right?
> >>
> >> Perhaps, but the only problem I encountered with this driver so far
> >> was when calling disable_irq from the interrupt handler stopped
> >> working on non-smp systems in 2.6.30 (which is another patch you
> >> should probably apply first).
> >
> > How do I get that patch? git pull on msm-2.6.29 tree?
>
> No it is in the android-msm-2.6.30-rc2-test branch at
> git://android.git.kernel.org/kernel/experimental.git (commit
> 9f89902daf7a3c6fdd6b0c7494f3cc82d5e09217).
Could you inline the patch? I tried to pull it off the web interface,
but it did not work for some reason.
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
On Tue, Jul 21, 2009 at 3:11 AM, Pavel Machek<[email protected]> wrote:
> On Sun 2009-07-19 20:43:10, Arve Hj?nnev?g wrote:
>> On Sun, Jul 19, 2009 at 2:23 PM, Pavel Machek<[email protected]> wrote:
>> >
>> >> > Applying small patch on top of cleaned up driver should be better than
>> >> > carrying whole driver itself, right?
>> >>
>> >> Perhaps, but the only problem I encountered with this driver so far
>> >> was when calling disable_irq from the interrupt handler stopped
>> >> working on non-smp systems in 2.6.30 (which is another patch you
>> >> should probably apply first).
>> >
>> > How do I get that patch? git pull on msm-2.6.29 tree?
>>
>> No it is in the android-msm-2.6.30-rc2-test branch at
>> git://android.git.kernel.org/kernel/experimental.git (commit
>> 9f89902daf7a3c6fdd6b0c7494f3cc82d5e09217).
>
> Could you inline the patch? I tried to pull it off the web interface,
> but it did not work for some reason.
git fetch git://android.git.kernel.org/kernel/experimental.git
android-msm-2.6.30-rc2-test
git cherry-pick 9f89902daf7a3c6fdd6b0c7494f3cc82d5e09217
That way you will hopefully not add question marks to my name.
--
Arve Hj?nnev?g
On Tue 2009-07-21 18:12:03, Arve Hj?nnev?g wrote:
> On Tue, Jul 21, 2009 at 3:11 AM, Pavel Machek<[email protected]> wrote:
> > On Sun 2009-07-19 20:43:10, Arve Hj?nnev?g wrote:
> >> On Sun, Jul 19, 2009 at 2:23 PM, Pavel Machek<[email protected]> wrote:
> >> >
> >> >> > Applying small patch on top of cleaned up driver should be better than
> >> >> > carrying whole driver itself, right?
> >> >>
> >> >> Perhaps, but the only problem I encountered with this driver so far
> >> >> was when calling disable_irq from the interrupt handler stopped
> >> >> working on non-smp systems in 2.6.30 (which is another patch you
> >> >> should probably apply first).
> >> >
> >> > How do I get that patch? git pull on msm-2.6.29 tree?
> >>
> >> No it is in the android-msm-2.6.30-rc2-test branch at
> >> git://android.git.kernel.org/kernel/experimental.git (commit
> >> 9f89902daf7a3c6fdd6b0c7494f3cc82d5e09217).
> >
> > Could you inline the patch? I tried to pull it off the web interface,
> > but it did not work for some reason.
>
> git fetch git://android.git.kernel.org/kernel/experimental.git
> android-msm-2.6.30-rc2-test
> git cherry-pick 9f89902daf7a3c6fdd6b0c7494f3cc82d5e09217
So I spent 10 minutes downloading patch you could have inlined... only
to find out that review already pointed nosync issue (and I fixed swap
independetly)...
> That way you will hopefully not add question marks to my name.
...and I still don't know what your name is. My terminal displays "Arve
Hj#?nnev##g <[email protected]>" :-(.
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
On Thu, Jul 23, 2009 at 2:25 PM, Pavel Machek<[email protected]> wrote:
> On Tue 2009-07-21 18:12:03, Arve Hj?nnev?g wrote:
>> On Tue, Jul 21, 2009 at 3:11 AM, Pavel Machek<[email protected]> wrote:
>> > On Sun 2009-07-19 20:43:10, Arve Hj?nnev?g wrote:
>> >> On Sun, Jul 19, 2009 at 2:23 PM, Pavel Machek<[email protected]> wrote:
>> >> >
>> >> >> > Applying small patch on top of cleaned up driver should be better than
>> >> >> > carrying whole driver itself, right?
>> >> >>
>> >> >> Perhaps, but the only problem I encountered with this driver so far
>> >> >> was when calling disable_irq from the interrupt handler stopped
>> >> >> working on non-smp systems in 2.6.30 (which is another patch you
>> >> >> should probably apply first).
>> >> >
>> >> > How do I get that patch? git pull on msm-2.6.29 tree?
>> >>
>> >> No it is in the android-msm-2.6.30-rc2-test branch at
>> >> git://android.git.kernel.org/kernel/experimental.git (commit
>> >> 9f89902daf7a3c6fdd6b0c7494f3cc82d5e09217).
>> >
>> > Could you inline the patch? I tried to pull it off the web interface,
>> > but it did not work for some reason.
>>
>> git fetch git://android.git.kernel.org/kernel/experimental.git
>> android-msm-2.6.30-rc2-test
>> git cherry-pick 9f89902daf7a3c6fdd6b0c7494f3cc82d5e09217
>
> So I spent 10 minutes downloading patch you could have inlined... only
> to find out that review already pointed nosync issue (and I fixed swap
> independetly)...
Sorry, I thought it was clear what it contained.
I'm a little confused why you did not already have this though. This
is the same branch I pushed specifically so you could get at it a
month ago, and you said you got it booting back then.
>
>> That way you will hopefully not add question marks to my name.
>
> ...and I still don't know what your name is. My terminal displays "Arve
> Hj#罩nev##g <[email protected]>" :-(.
That does not look right. It displays correctly for me in the mailing
list archives:
http://lkml.org/lkml/2009/7/21/496
gitk also works for me. git log only works if you are using a utf8
terminal (or have set the character set in your gitconfig).
--
Arve Hjønnevåg
Hi!
> >> git fetch git://android.git.kernel.org/kernel/experimental.git
> >> android-msm-2.6.30-rc2-test
> >> git cherry-pick 9f89902daf7a3c6fdd6b0c7494f3cc82d5e09217
> >
> > So I spent 10 minutes downloading patch you could have inlined... only
> > to find out that review already pointed nosync issue (and I fixed swap
> > independetly)...
>
> Sorry, I thought it was clear what it contained.
Well, I guess I lost that in the mailflood.
> I'm a little confused why you did not already have this though. This
> is the same branch I pushed specifically so you could get at it a
> month ago, and you said you got it booting back then.
I already got the tree (thanks!) but I did not know that I had it, so
I ended up downloading another copy...
BTW... would you have 2.6.31-rcX (or linux-next?) working on dream by chance?
> >> That way you will hopefully not add question marks to my name.
> >
> > ...and I still don't know what your name is. My terminal displays "Arve
> > Hj#???nev##g <[email protected]>" :-(.
>
> That does not look right. It displays correctly for me in the mailing
> list archives:
> http://lkml.org/lkml/2009/7/21/496
>
> gitk also works for me. git log only works if you are using a utf8
> terminal (or have set the character set in your gitconfig).
Apparently my terminals don't speak utf8. (Which is no wonder, I had
to fall back to xterm when gnome-terminal stopped working). Web
browser displays your name correctly, so I now know what it is, and I
can even paste it (Arve Hjřnnevĺg). I wonder if it gets through the
mail system undamaged. (If not, is there acceptable transcription of
your name to us/ascii?)
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
On Mon, Jul 27, 2009 at 4:14 PM, Pavel Machek<[email protected]> wrote:
> Hi!
>
>> >> git fetch git://android.git.kernel.org/kernel/experimental.git
>> >> android-msm-2.6.30-rc2-test
>> >> git cherry-pick 9f89902daf7a3c6fdd6b0c7494f3cc82d5e09217
>> >
>> > So I spent 10 minutes downloading patch you could have inlined... only
>> > to find out that review already pointed nosync issue (and I fixed swap
>> > independetly)...
>>
>> Sorry, I thought it was clear what it contained.
>
> Well, I guess I lost that in the mailflood.
>
>> I'm a little confused why you did not already have this though. This
>> is the same branch I pushed specifically so you could get at it a
>> month ago, and you said you got it booting back then.
>
> I already got the tree (thanks!) but I did not know that I had it, so
> I ended up downloading another copy...
>
> BTW... would you have 2.6.31-rcX (or linux-next?) working on dream by chance?
No, I have not looked at 31 yet. I did push most of our changes to the
touchscreen driver, including a stab at the official multi-touch
protocol, to the android-2.6.29 branch in the public
git://android.git.kernel.org/kernel/common.git repository though.
>
>> >> That way you will hopefully not add question marks to my name.
>> >
>> > ...and I still don't know what your name is. My terminal displays "Arve
>> > Hj#???nev##g <[email protected]>" :-(.
>>
>> That does not look right. It displays correctly for me in the mailing
>> list archives:
>> http://lkml.org/lkml/2009/7/21/496
>>
>> gitk also works for me. git log only works if you are using a utf8
>> terminal (or have set the character set in your gitconfig).
>
> Apparently my terminals don't speak utf8. (Which is no wonder, I had
> to fall back to xterm when gnome-terminal stopped working). Web
> browser displays your name correctly, so I now know what it is, and I
> can even paste it (Arve Hjřnnevĺg). I wonder if it gets through the
> mail system undamaged. (If not, is there acceptable transcription of
It did not.
> your name to us/ascii?)
Acceptable, no, but I use "Arve Hjonnevag" for systems that only
support us-ascii.
>
> Pavel
> --
> (english) http://www.livejournal.com/~pavelmachek
> (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
>
--
Arve Hjønnevåg