Hi Dan,
On Fri, Apr 22, 2016 at 06:01:08PM +0800, dan.huang wrote:
> From: "jeffrey.lin" <jeffrey.lin@xxxxxxxxxx>
>
> Raydium I2C touch driver.
>
> Signed-off-by: jeffrey.lin <jeffrey.lin@xxxxxxxxxx>
When you are sending a patch over you need to add your sign-off to it.
Also I am still getting compile errors/warnings:
CC [M] drivers/input/touchscreen/raydium_i2c_ts.o
drivers/input/touchscreen/raydium_i2c_ts.c: In function
‘raydium_i2c_probe’:
drivers/input/touchscreen/raydium_i2c_ts.c:1036:35: warning: ‘irqflags’
may be used uninitialized in this function [-Wmaybe-uninitialized]
error = devm_request_threaded_irq(&client->dev, client->irq,
Also please mention what is changed between previous and new version so
I do not need to hunt for surprises.
> +/*I2C command */
> +#define CMD_BOOT_WRT 0x11
> +#define CMD_BOOT_ACK 0x22
> +#define CMD_BOOT_CHK 0x33
> +#define CMD_BOOT_READ 0x44
> +#define CMD_BOOT_WAIT_READY 0x1A
> +#define CMD_BOOT_PATH_READY 0x1B
I see that in this version the command codes are completely redone. Why
is this? I think there is general confusion as to the encoding of the
"header" for the command message little endian vs big endian) and
position of the register in the header.
Would you mind spelling out the format of command message, please?
> +#define BOOT_RDY 0xFF
> +#define CMD_QUERY_BANK 0x2B
> +#define CMD_DATA_BANK 0x4D
> +#define CMD_ENTER_SLEEP 0x4E
> +#define CMD_BANK_SWITCH 0xAA
> +
> +/* Touch relative info */
> +#define MAX_RETRIES 3
> +#define MAX_FW_UPDATE_RETRIES 30
> +#define MAX_TOUCH_NUM 10
> +#define MAX_PACKET_SIZE 32
> +#define BOOT_DELAY_MS 100
> +
> +#define RAYDIUM_FW_PAGESIZE 128
> +#define RAYDIUM_POWERON_DELAY_USEC 500
> +#define RAYDIUM_RESET_DELAY_MSEC 50
> +
> +#define ADDR_INDEX 0x03
> +#define DATA_INDEX 0x04
> +
> +#define HEADER_SIZE 4
> +
> +enum raydium_boot_mode {
> + RAYDIUM_TS_MAIN = 0,
> + RAYDIUM_TS_BLDR,
> +};
> +
> +enum raydium_abs_idx {
> + POS_STATE = 0,/*1:touch, 0:no touch*/
> + POS_X,
> + POS_Y = 3,
> + POS_PRESSURE,
> + WIDTH_X,
> + WIDTH_Y,
> +};
> +
> +struct raydium_info {
> + u32 hw_ver; /*device ver, __le32*/
> + u8 main_ver;
> + u8 sub_ver;
> + u16 ft_ver; /*test ver, __le16*/
> + u8 x_num;
> + u8 y_num;
> + u16 x_max; /*disp reso, __le16*/
> + u16 y_max; /*disp reso, __le16*/
> + u8 x_res; /* units/mm */
> + u8 y_res; /* units/mm */
> +};
> +
> +struct raydium_object {
> + u32 data_bank_addr;
> + u8 pkg_size;
> + u8 tp_info_size;
> +};
> +
> +/* struct raydium_data - represents state of Raydium touchscreen device */
> +struct raydium_data {
> + struct i2c_client *client;
> + struct input_dev *input;
> +
> + struct regulator *avdd;
> + struct regulator *vccio;
> + struct gpio_desc *reset_gpio;
> +
> + u32 query_bank_info;
> +
> + struct raydium_info info;
> + struct raydium_object obj;
> + enum raydium_boot_mode boot_mode;
> +
> + struct mutex sysfs_mutex;
> + struct completion cmd_done;
> +
> + bool wake_irq_enabled;
> +};
> +
> +static int raydium_i2c_send(struct i2c_client *client,
> + u8 addr, u8 *data, size_t len)
> +{
> + u8 buf[MAX_PACKET_SIZE + 1], idx_i;
> + u16 pkg_len, use_len;
> + int tries = 0;
> +
> + buf[0] = addr;
> + use_len = len;
> + use_len = 0;
> +
> + while (use_len) {
> + pkg_len = (use_len < MAX_PACKET_SIZE) ?
> + use_len : MAX_PACKET_SIZE;
> + memcpy(&buf[1], data + idx_i*MAX_PACKET_SIZE, pkg_len);
> +
> + tries = 0;
> + do {
> + if (i2c_master_send(client, buf, pkg_len + 1)
> + == (pkg_len + 1))
> + break;
> + msleep(20);
> + } while (++tries < MAX_RETRIES);
> + idx_i++;
> + use_len = (use_len < MAX_PACKET_SIZE) ?
> + 0 : (use_len - MAX_PACKET_SIZE);
> + }
> +
> + dev_err(&client->dev, "%s: i2c send failed\n", __func__);
> +
> + return -EIO;
> +}
> +
> +static int raydium_i2c_read(struct i2c_client *client,
> + u8 addr, size_t len, void *data)
> +{
> + struct i2c_msg xfer[2];
> + int ret;
> +
> + /* Write register */
> + xfer[0].addr = client->addr;
> + xfer[0].flags = 0;
> + xfer[0].len = 1;
> + xfer[0].buf = &addr;
> +
> + /* Read data */
> + xfer[1].addr = client->addr;
> + xfer[1].flags = I2C_M_RD;
> + xfer[1].len = len;
> + xfer[1].buf = data;
> +
> + ret = i2c_transfer(client->adapter, xfer, ARRAY_SIZE(xfer));
> + if (ret < 0)
> + return ret;
> +
> + if (ret != ARRAY_SIZE(xfer))
> + return -EIO;
> +
> + return 0;
> +}
> +
> +static int raydium_i2c_read_message(struct i2c_client *client,
> + u32 addr, size_t len, void *data)
> +{
> + u16 pkg_size, use_len;
> + u8 buf[HEADER_SIZE], idx_i;
> + int error;
> +
> + use_len = len;
> + idx_i = 0;
> + while (use_len > 0) {
> + pkg_size = (use_len < MAX_PACKET_SIZE) ?
> + use_len : MAX_PACKET_SIZE;
> +
> + put_unaligned_be32(addr, buf);
> +
> + /*set data bank*/
> + error = raydium_i2c_send(client, CMD_BANK_SWITCH,
> + (u8 *)buf, HEADER_SIZE);
> + /*read potints data*/
> + if (!error)
> + error = raydium_i2c_read(client, buf[ADDR_INDEX],
> + pkg_size,
> + data + idx_i*MAX_PACKET_SIZE);
> +
> + pkg_size += MAX_PACKET_SIZE;
> + addr += MAX_PACKET_SIZE;
> + use_len = (use_len < MAX_PACKET_SIZE) ?
> + 0 : (use_len - MAX_PACKET_SIZE);
> + idx_i++;
> + }
> +
> + return error;
> +}
> +
> +static int raydium_i2c_send_message(struct i2c_client *client,
> + size_t len, void *data)
> +{
> + int error;
> + __le32 cmd;
> +
> + cmd = get_unaligned_le32(data);
> +
> + /*set data bank*/
> + error = raydium_i2c_send(client, CMD_BANK_SWITCH, (u8 *)&cmd,
> + HEADER_SIZE);
> +
> + /*send message*/
> + if (!error)
> + error = raydium_i2c_send(client, ((u8 *)data)[ADDR_INDEX],
> + data + DATA_INDEX, len);
> +
> + return error;
> +}
> +
> +static int raydium_i2c_sw_reset(struct i2c_client *client)
> +{
> + static const u8 soft_rst_cmd[] = {0x40, 0x00, 0x00, 0x04, 0x01};
> + int error;
> +
> + error = raydium_i2c_send_message(client, ARRAY_SIZE(soft_rst_cmd),
> + (void *)soft_rst_cmd);
> + if (error) {
> + dev_err(&client->dev, "software reset failed: %d\n", error);
> + return error;
> + }
> +
> + msleep(RAYDIUM_RESET_DELAY_MSEC);
> +
> + return 0;
> +}
> +
> +static int raydium_i2c_query_ts_info(struct raydium_data *ts)
> +{
> + struct i2c_client *client = ts->client;
> + int error, retry_cnt;
> +
> + for (retry_cnt = 0; retry_cnt < MAX_RETRIES; retry_cnt++) {
> + error = raydium_i2c_read(client, CMD_DATA_BANK,
> + sizeof(ts->obj), (void *)&ts->obj);
> + ts->obj.data_bank_addr =
> + get_unaligned_le32(&ts->obj.data_bank_addr);
> +
> + if (!error) {
> + error = raydium_i2c_read(client, CMD_QUERY_BANK,
> + sizeof(ts->query_bank_info),
> + (void *)&ts->query_bank_info);
> + if (!error) {
> + error = raydium_i2c_read_message(client,
> + ts->query_bank_info, sizeof(ts->info),
> + (void *)&ts->info);
> +
> + ts->info.hw_ver =
> + get_unaligned_le32(&ts->info.hw_ver);
> + ts->info.ft_ver =
> + get_unaligned_le16(&ts->info.ft_ver);
> + ts->info.x_max =
> + get_unaligned_le16(&ts->info.x_max);
> + ts->info.y_max =
> + get_unaligned_le16(&ts->info.y_max);
> + return 0;
> + }
> + }
> + }
> + dev_err(&client->dev, "Get touch data failed: %d\n", error);
> +
> + return -EINVAL;
> +}
> +
> +static int raydium_i2c_fastboot(struct i2c_client *client)
> +{
> + static const u8 boot_cmd[] = { 0x50, 0x00, 0x06, 0x20 };
> + u8 buf[HEADER_SIZE];
> + int error;
> +
> + error = raydium_i2c_read_message(client,
> + get_unaligned_be32(boot_cmd),
> + sizeof(boot_cmd), buf);
> +
> + if (!error) {
> + if (buf[0] == RM_BOOT_BLDR) {
> + dev_dbg(&client->dev, "boot in fastboot mode\n");
> + return -EINVAL;
> + }
> + dev_dbg(&client->dev, "boot success -- 0x%x\n", client->addr);
> + return 0;
> + }
> +
> + dev_err(&client->dev, "boot failed: %d\n", error);
> +
> + return error;
> +}
> +
> +static int raydium_i2c_check_fw_status(struct raydium_data *ts)
> +{
> + struct i2c_client *client = ts->client;
> + static const u8 bl_area[] = {0x62, 0x6f, 0x6f, 0x74};
> + static const u8 main_area[] = {0x66, 0x69, 0x72, 0x6d};
> + u8 buf[HEADER_SIZE];
> + int error;
> +
> + error = raydium_i2c_read(client, CMD_BOOT_READ, HEADER_SIZE,
> + (void *)buf);
> + if (!error) {
> + if (memcmp(buf, bl_area, sizeof(bl_area)))
> + ts->boot_mode = RAYDIUM_TS_BLDR;
> + else if (memcmp(buf, main_area, sizeof(main_area)))
> + ts->boot_mode = RAYDIUM_TS_MAIN;
> + else
> + return -EINVAL;
> +
> + return 0;
> + }
> +
> + dev_err(&client->dev, "check bl status failed: %d\n", error);
> +
> + return error;
> +}
> +
> +static int raydium_i2c_initialize(struct raydium_data *ts)
> +{
> + struct i2c_client *client = ts->client;
> + int error, retry_cnt;
> +
> + for (retry_cnt = 0; retry_cnt < MAX_RETRIES; retry_cnt++) {
> + error = raydium_i2c_fastboot(client);
> + if (error) {
> + /* Continue initializing if it's the last try */
> + if (retry_cnt < MAX_RETRIES - 1)
> + continue;
> + }
> + /* Wait for Hello packet */
> + msleep(BOOT_DELAY_MS);
> +
> + error = raydium_i2c_check_fw_status(ts);
> + if (error) {
> + dev_err(&client->dev,
> + "failed to read 'hello' packet: %d\n", error);
> + }
> + }
> +
> + if (error)
> + ts->boot_mode = RAYDIUM_TS_BLDR;
> + else
> + raydium_i2c_query_ts_info(ts);
> +
> + return error;
> +}
> +
> +static int raydium_i2c_recv(struct i2c_client *client, u8 *buf, size_t count)
> +{
> + int error = 0;
> +
> + error = i2c_master_recv(client, buf, count);
> +
> + if (error == count) {
> + error = 0;
> + } else if (error != count) {
> + error = (error < 0) ? error : -EIO;
> + dev_err(&client->dev, "i2c recv failed (%d)\n", error);
> + }
> +
> + return error;
> +}
> +
> +static int raydium_i2c_bl_chk_state(struct i2c_client *client, u8 state)
> +{
> + static const u8 ack_ok[] = { 0xFF, 0x39, 0x30, 0x30, 0x54 };
> + u8 rbuf[5];
> + u8 retry;
> + int error;
> +
> + for (retry = 0; retry < MAX_FW_UPDATE_RETRIES; retry++) {
> + if (state == CMD_BOOT_WAIT_READY) {
> + error = raydium_i2c_recv(client, &rbuf[0], 1);
> + if (!error) {
> + if (rbuf[0] == BOOT_RDY)
> + return 0;
> + }
> + } else if (state == CMD_BOOT_WAIT_READY) {
The condition on branches is the same (CMD_BOOT_WAIT_READY).
> + error = raydium_i2c_recv(client, &rbuf[0],
> + sizeof(ack_ok));
> + if (!error) {
> + if (memcmp(rbuf, ack_ok, sizeof(ack_ok)))
> + return 0;
> + }
> + } else
> + return -EINVAL;
> +
> + msleep(20);
> + }
> +
> + return -EINVAL;
> +}
> +
> +static int raydium_i2c_wrt_object(struct i2c_client *client,
> + u8 *data, size_t len, u8 state)
> +{
> + int error = 0;
> +
> + error = raydium_i2c_send(client, CMD_BOOT_WRT, data, len);
> + if (error) {
> + dev_err(&client->dev, "WRT obj command failed: %d\n", error);
> + return error;
> + }
> +
> + error = raydium_i2c_send(client, CMD_BOOT_ACK, (u8 *)NULL, 0);
> + if (error) {
> + dev_err(&client->dev, "Ack obj command failed: %d\n", error);
> + return error;
> + }
I am looking at raydium_i2c_send() implementation and it seemd to be a
no-op with len == 0, what gives?
> +
> + error = raydium_i2c_send(client, CMD_BOOT_CHK, (u8 *)NULL, 0);
> + if (error) {
> + dev_err(&client->dev, "Boot chk failed: %d\n", error);
> + return error;
> + }
Same here.
> +
> + error = raydium_i2c_bl_chk_state(client, state);
> + if (error) {
> + dev_err(&client->dev, "boot trigger state failed: %d\n", error);
> + return error;
> + }
> + return 0;
> +}
> +
> +static bool raydium_i2c_boot_trigger(struct i2c_client *client)
> +{
> + int error;
> + u8 u8_idx;
> + static const u8 cmd[7][6] = {
> + {0x08, 0x0C, 0x09, 0x00, 0x50, 0xD7},
> + {0x08, 0x04, 0x09, 0x00, 0x50, 0xA5},
> + {0x08, 0x04, 0x09, 0x00, 0x50, 0x00},
> + {0x08, 0x04, 0x09, 0x00, 0x50, 0xA5},
> + {0x08, 0x0C, 0x09, 0x00, 0x50, 0x00},
> + {0x06, 0x01},
> + {0x02, 0xA2},
> + };
> +
> + for (u8_idx = 0 ; u8_idx < 7 ; u8_idx++) {
> + error = raydium_i2c_wrt_object(client, (u8 *)cmd[u8_idx],
> + sizeof(cmd[u8_idx]), CMD_BOOT_WAIT_READY);
If you expect that for last 2 elements the sizeof(cmd[u8_idx]) will
return 2 you are mistaken, they all will be 6.
> + if (error) {
> + dev_err(&client->dev, "send boot trigger cmd failed: %d\n",
> + error);
> + return error;
> + }
> + }
> +
> + return 0;
> +}
> +
> +static int raydium_i2c_check_path(struct i2c_client *client)
> +{
> + static const u8 cmd[] = {0x09, 0x00, 0x09, 0x00, 0x50, 0x10, 0x00};
> + int error;
> +
> + error = raydium_i2c_wrt_object(client, (u8 *)cmd, sizeof(cmd),
> + CMD_BOOT_PATH_READY);
> + if (error) {
> + dev_err(&client->dev, "send chk path cmd fail: %d\n", error);
> + return error;
> + }
> +
> + return error;
> +}
> +
> +static int raydium_i2c_enter_bl(struct i2c_client *client)
> +{
> + static const u8 cal_cmd[] = {0x00, 0x01, 0x52};
> + int error;
> +
> + error = raydium_i2c_wrt_object(client, (u8 *)cal_cmd,
> + sizeof(cal_cmd), CMD_BOOT_WAIT_READY);
> + if (error) {
> + dev_err(&client->dev, "send jump loader cmd fail: %d\n", error);
> + return error;
> + }
> + return 0;
> +}
> +
> +static int raydium_i2c_leave_bl(struct i2c_client *client)
> +{
> + static const u8 leave_cmd[] = {0x05, 0x00};
> + int error;
> +
> + error = raydium_i2c_wrt_object(client, (u8 *)leave_cmd,
> + sizeof(leave_cmd), CMD_BOOT_WAIT_READY);
> + if (error) {
> + dev_err(&client->dev, "send leave bl cmd fail: %d\n", error);
> + return error;
> + }
> +
> + return 0;
> +}
> +
> +static int raydium_i2c_write_checksum(struct i2c_client *client,
> + u16 length, u16 checksum)
> +{
> + u8 checksum_cmd[] = {0x00, 0x05, 0x6D, 0x00, 0x00, 0x00, 0x00};
> + int error = 0;
> +
> + checksum_cmd[3] = (u8)(length & 0xFF);
> + checksum_cmd[4] = (u8)((length & 0xFF00) >> 8);
> + checksum_cmd[5] = (u8)(checksum & 0xFF);
> + checksum_cmd[6] = (u8)((checksum & 0xFF00) >> 8);
> +
> + error = raydium_i2c_wrt_object(client, (u8 *)checksum_cmd,
> + sizeof(checksum_cmd), CMD_BOOT_WAIT_READY);
> + if (error) {
> + dev_err(&client->dev, "send wrt checksum cmd fail: %d\n",
> + error);
> + return error;
> + }
> +
> + return 0;
> +}
> +
> +static int raydium_i2c_disable_watch_dog(struct i2c_client *client)
> +{
> + static const u8 cmd[] = {0x0A, 0xAA};
> + int error = 0;
> +
> + error = raydium_i2c_wrt_object(client, (u8 *)cmd, sizeof(cmd),
> + CMD_BOOT_WAIT_READY);
> + if (error) {
> + dev_err(&client->dev, "send disable watchdog cmd fail: %d\n",
> + error);
> + return error;
> + }
> +
> + return 0;
> +}
> +
> +static int raydium_i2c_fw_write_page(struct i2c_client *client,
> + const void *page, size_t len)
> +{
> + int error;
> +
> + error = raydium_i2c_wrt_object(client, (u8 *)page, len,
> + CMD_BOOT_WAIT_READY);
> + if (error) {
> + dev_err(&client->dev, "send page wrt cmd failed: %d\n", error);
> + return error;
> + }
> +
> + return error;
> +}
> +
> +static int raydium_i2c_do_update_firmware(struct raydium_data *ts,
> + const struct firmware *fw)
> +{
> + struct i2c_client *client = ts->client;
> + u8 u8_idx;
> + u16 fw_length;
> + u16 fw_checksum;
> + u8 buf[RAYDIUM_FW_PAGESIZE + 2];
> + int page, n_fw_pages;
> + int error;
> +
> + fw_length = (int)(fw->size);
> + if (fw_length == 0) {
> + dev_err(&client->dev, "Invalid firmware length\n");
> + return -EINVAL;
> + }
> +
> + if (fw_length % RAYDIUM_FW_PAGESIZE)
> + n_fw_pages = fw_length/RAYDIUM_FW_PAGESIZE;
> + else
> + n_fw_pages = fw_length/RAYDIUM_FW_PAGESIZE + 1;
> +
> + error = raydium_i2c_check_fw_status(ts);
> + if (error) {
> + dev_err(&client->dev, "Unable to access IC %d\n", error);
> + return error;
> + }
> +
> + if (ts->boot_mode == RAYDIUM_TS_MAIN) {
> + error = raydium_i2c_enter_bl(client);
> + if (error) {
> + dev_err(&client->dev, "Unable jump to boot loader %d\n",
> + error);
> + return error;
> + }
> + }
> +
> + error = raydium_i2c_disable_watch_dog(client);
> + if (error) {
> + dev_err(&client->dev, "send disable watchdog cmd fail, %d\n",
> + error);
> + return error;
> + }
> +
> + error = raydium_i2c_check_path(client);
> + if (error) {
> + dev_err(&client->dev, "send chk path fail, %d\n", error);
> + return error;
> + }
> +
> + error = raydium_i2c_boot_trigger(client);
> + if (error) {
> + dev_err(&client->dev, "send boot trigger fail, %d\n", error);
> + return error;
> + }
> +
> + fw_checksum = 0;
> + for (page = 0 ; page < n_fw_pages ; page++) {
> + memset(buf, 0xFF, sizeof(buf));
> + buf[0] = 0x03;
> + if (page == 0)
> + buf[1] = 0x00;
> +
> + memcpy(&buf[2], fw->data + page * RAYDIUM_FW_PAGESIZE,
> + RAYDIUM_FW_PAGESIZE);
> + /*calculate chksum*/
> + for (u8_idx = 0; u8_idx < RAYDIUM_FW_PAGESIZE; u8_idx++)
> + fw_checksum += buf[2 + u8_idx];
> +
> + error = raydium_i2c_fw_write_page(client, (const void *)buf,
> + sizeof(buf));
> + if (error) {
> + dev_err(&client->dev, "flash page write fail, %d\n",
> + error);
> + return error;
> + }
> +
> + msleep(20);
> + }
> +
> + error = raydium_i2c_leave_bl(client);
> + if (error) {
> + dev_err(&client->dev, "leave boot loader fail: %d\n", error);
> + return error;
> + }
> +
> + msleep(BOOT_DELAY_MS);
> +
> + error = raydium_i2c_check_fw_status(ts);
> + if (error) {
> + dev_err(&client->dev, "Unable to access IC %d\n", error);
> + return error;
> + }
> +
> + if (ts->boot_mode == RAYDIUM_TS_MAIN) {
> + error = raydium_i2c_write_checksum(client, fw_length,
> + fw_checksum);
> + if (error) {
> + dev_err(&client->dev, "write checksum fail %d\n",
> + error);
> + return error;
> + }
> + } else {
> + dev_err(&client->dev, "switch to main_fw fail %d\n", error);
> + return -EINVAL;
> + }
> +
> + return 0;
> +}
> +
> +static int raydium_i2c_fw_update(struct raydium_data *ts)
> +{
> + struct i2c_client *client = ts->client;
> + const struct firmware *fw = NULL;
> + const char *fn = "raydium.fw";
> + int error;
> +
> + error = request_firmware(&fw, fn, &client->dev);
> + if (error) {
> + dev_err(&client->dev, "Unable to open firmware %s\n", fn);
> + return error;
> + }
> + /*disable irq*/
> + disable_irq(client->irq);
> +
> + error = raydium_i2c_do_update_firmware(ts, fw);
> + if (error) {
> + dev_err(&client->dev, "firmware update failed: %d\n", error);
> + ts->boot_mode = RAYDIUM_TS_BLDR;
> + goto out_enable_irq;
> + }
> +
> + error = raydium_i2c_initialize(ts);
> + if (error) {
> + dev_err(&client->dev,
> + "failed to initialize device after firmware update: %d\n",
> + error);
> + ts->boot_mode = RAYDIUM_TS_BLDR;
> + goto out_enable_irq;
> + }
> +
> + ts->boot_mode = RAYDIUM_TS_MAIN;
> +
> +out_enable_irq:
> + enable_irq(client->irq);
> + msleep(100);
> +
> + return error;
> +}
> +
> +static void raydium_mt_event(struct raydium_data *ts)
> +{
> + u8 data[MAX_PACKET_SIZE];
> + int error, i;
> + int x, y, f_state, pressure, wx, wy;
> +
> + error = raydium_i2c_read_message(ts->client, ts->obj.data_bank_addr,
> + ts->obj.pkg_size, (void *)data);
> +
> + if (error < 0) {
> + dev_err(&ts->client->dev, "%s: failed to read data: %d\n",
> + __func__, error);
> + return;
> + }
> +
> + for (i = 0; i < MAX_TOUCH_NUM; i++) {
> + f_state = (data + i * ts->obj.tp_info_size)[POS_STATE];
> + pressure = (data + i * ts->obj.tp_info_size)[POS_PRESSURE];
> + wx = (data + i * ts->obj.tp_info_size)[WIDTH_X];
> + wy = (data + i * ts->obj.tp_info_size)[WIDTH_Y];
> +
> + input_mt_slot(ts->input, i);
> + input_mt_report_slot_state(ts->input,
> + MT_TOOL_FINGER, f_state != 0);
> +
> + if (!f_state)
> + continue;
> + x = get_unaligned_le16(&data[i * ts->obj.tp_info_size + POS_X]);
> + y = get_unaligned_le16(&data[i * ts->obj.tp_info_size + POS_Y]);
> +
> + input_report_abs(ts->input, ABS_MT_POSITION_X, x);
> + input_report_abs(ts->input, ABS_MT_POSITION_Y, y);
> + input_report_abs(ts->input, ABS_MT_PRESSURE, pressure);
> + input_report_abs(ts->input, ABS_MT_TOUCH_MAJOR,
> + max(wx, wy));
> + input_report_abs(ts->input, ABS_MT_TOUCH_MINOR,
> + min(wx, wy));
> + }
> +
> + input_mt_sync_frame(ts->input);
> + input_sync(ts->input);
> +}
> +
> +static irqreturn_t raydium_i2c_irq(int irq, void *_dev)
> +{
> + struct raydium_data *ts = _dev;
> +
> + if (ts->boot_mode != RAYDIUM_TS_BLDR)
> + raydium_mt_event(ts);
> +
> + return IRQ_HANDLED;
> +}
> +
> +static ssize_t raydium_calibrate(struct device *dev,
> + struct device_attribute *attr,
> + const char *buf, size_t count)
> +{
> + struct raydium_data *ts = dev_get_drvdata(dev);
> + struct i2c_client *client = ts->client;
> +
> + static const u8 cal_cmd[] = {0x00, 0x01, 0x9E};
> + int error = 0;
> +
> + error = raydium_i2c_wrt_object(client, (u8 *)cal_cmd, sizeof(cal_cmd),
> + CMD_BOOT_WAIT_READY);
> + if (error) {
> + dev_err(&client->dev, "send chk path cmd fail: %d\n", error);
> + return error;
> + }
> +
> + return error;
> +}
> +
> +static ssize_t write_update_fw(struct device *dev,
> + struct device_attribute *attr,
> + const char *buf, size_t count)
> +{
> + struct raydium_data *ts = dev_get_drvdata(dev);
> + int error;
> +
> + error = mutex_lock_interruptible(&ts->sysfs_mutex);
> + if (error)
> + return error;
> +
> + error = raydium_i2c_fw_update(ts);
> + dev_dbg(dev, "firmware update result: %d\n", error);
> +
> + mutex_unlock(&ts->sysfs_mutex);
> + return error ?: count;
> +}
> +
> +static ssize_t raydium_bootmode_show(struct device *dev,
> + struct device_attribute *attr, char *buf)
> +{
> + struct raydium_data *ts = dev_get_drvdata(dev);
> +
> + return sprintf(buf, "%s\n", ts->boot_mode == RAYDIUM_TS_MAIN ?
> + "Normal" : "Recovery");
> +}
> +
> +static ssize_t raydium_fw_ver_show(struct device *dev,
> + struct device_attribute *attr, char *buf)
> +{
> + struct raydium_data *ts = dev_get_drvdata(dev);
> +
> + return sprintf(buf, "%d.%d\n", ts->info.main_ver, ts->info.sub_ver);
> +}
> +
> +static ssize_t raydium_hw_ver_show(struct device *dev,
> + struct device_attribute *attr, char *buf)
> +{
> + struct raydium_data *ts = dev_get_drvdata(dev);
> +
> + return sprintf(buf, "0x%04x\n", ts->info.hw_ver);
"%#04x\n"
> +}
> +
> +static DEVICE_ATTR(fw_version, S_IRUGO, raydium_fw_ver_show, NULL);
> +static DEVICE_ATTR(hw_version, S_IRUGO, raydium_hw_ver_show, NULL);
> +static DEVICE_ATTR(boot_mode, S_IRUGO, raydium_bootmode_show, NULL);
> +static DEVICE_ATTR(update_fw, S_IWUSR, NULL, write_update_fw);
> +static DEVICE_ATTR(calibrate, S_IWUSR, NULL, raydium_calibrate);
> +
> +static struct attribute *raydium_attributes[] = {
> + &dev_attr_update_fw.attr,
> + &dev_attr_boot_mode.attr,
> + &dev_attr_fw_version.attr,
> + &dev_attr_hw_version.attr,
> + &dev_attr_calibrate.attr,
> + NULL
> +};
> +
> +static struct attribute_group raydium_attribute_group = {
> + .attrs = raydium_attributes,
> +};
> +
> +static void raydium_i2c_remove_sysfs_group(void *_data)
> +{
> + struct raydium_data *ts = _data;
> +
> + sysfs_remove_group(&ts->client->dev.kobj, &raydium_attribute_group);
> +}
> +
> +static int raydium_i2c_power_on(struct raydium_data *ts)
> +{
> + int error;
> +
> + if (IS_ERR_OR_NULL(ts->reset_gpio))
> + return 0;
> +
> + gpiod_set_value_cansleep(ts->reset_gpio, 1);
> +
> + error = regulator_enable(ts->avdd);
> + if (error) {
> + dev_err(&ts->client->dev,
> + "failed to enable avdd regulator: %d\n", error);
> + goto release_reset_gpio;
> + }
> +
> + error = regulator_enable(ts->vccio);
> + if (error) {
> + regulator_disable(ts->avdd);
> + dev_err(&ts->client->dev,
> + "failed to enable vccio regulator: %d\n", error);
> + goto release_reset_gpio;
> + }
> +
> + udelay(RAYDIUM_POWERON_DELAY_USEC);
> +
> +release_reset_gpio:
> + gpiod_set_value_cansleep(ts->reset_gpio, 0);
> +
> + if (error)
> + return error;
> +
> + msleep(RAYDIUM_RESET_DELAY_MSEC);
> +
> + return 0;
> +}
> +
> +static void raydium_i2c_power_off(void *_data)
> +{
> + struct raydium_data *ts = _data;
> +
> + if (!IS_ERR_OR_NULL(ts->reset_gpio)) {
> + gpiod_set_value_cansleep(ts->reset_gpio, 1);
> + regulator_disable(ts->vccio);
> + regulator_disable(ts->avdd);
> + }
> +}
> +
> +static int raydium_i2c_probe(struct i2c_client *client,
> + const struct i2c_device_id *id)
> +{
> + union i2c_smbus_data dummy;
> + struct raydium_data *ts;
> + unsigned long irqflags;
> + int error;
> +
> + if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
> + dev_err(&client->dev,
> + "%s: i2c check functionality error\n", DEVICE_NAME);
> + return -ENXIO;
> + }
> +
> + ts = devm_kzalloc(&client->dev, sizeof(struct raydium_data),
> + GFP_KERNEL);
> + if (!ts)
> + return -ENOMEM;
> +
> + mutex_init(&ts->sysfs_mutex);
> + init_completion(&ts->cmd_done);
> +
> + ts->client = client;
> + i2c_set_clientdata(client, ts);
> +
> + ts->avdd = devm_regulator_get(&client->dev, "avdd");
> + if (IS_ERR(ts->avdd)) {
> + error = PTR_ERR(ts->avdd);
> + if (error != -EPROBE_DEFER)
> + dev_err(&client->dev,
> + "Failed to get 'avdd' regulator: %d\n", error);
> + return error;
> + }
> +
> + ts->vccio = devm_regulator_get(&client->dev, "vccio");
> + if (IS_ERR(ts->vccio)) {
> + error = PTR_ERR(ts->vccio);
> + if (error != -EPROBE_DEFER)
> + dev_err(&client->dev,
> + "Failed to get 'vccio' regulator: %d\n", error);
> + return error;
> + }
> +
> + ts->reset_gpio = devm_gpiod_get_optional(&client->dev, "reset",
> + GPIOD_OUT_LOW);
> + if (IS_ERR(ts->reset_gpio)) {
> + error = PTR_ERR(ts->reset_gpio);
> + if (error != -EPROBE_DEFER) {
> + dev_err(&client->dev,
> + "failed to get reset gpio: %d\n", error);
> + return error;
> + }
> + }
> +
> + error = raydium_i2c_power_on(ts);
> + if (error)
> + return error;
> +
> + error = devm_add_action(&client->dev, raydium_i2c_power_off, ts);
> + if (error) {
> + dev_err(&client->dev,
> + "failed to install power off action: %d\n", error);
> + raydium_i2c_power_off(ts);
> + return error;
> + }
> +
> + /* Make sure there is something at this address */
> + if (i2c_smbus_xfer(client->adapter, client->addr, 0,
> + I2C_SMBUS_READ, 0, I2C_SMBUS_BYTE, &dummy) < 0) {
> + dev_err(&client->dev, "nothing at this address\n");
> + return -ENXIO;
> + }
> +
> + error = raydium_i2c_initialize(ts);
> + if (error) {
> + dev_err(&client->dev, "failed to initialize: %d\n", error);
> + return error;
> + }
> +
> + ts->input = devm_input_allocate_device(&client->dev);
> + if (!ts->input) {
> + dev_err(&client->dev, "Failed to allocate input device\n");
> + return -ENOMEM;
> + }
> +
> + ts->input->name = "Raydium Touchscreen";
> + ts->input->id.bustype = BUS_I2C;
> +
> + __set_bit(BTN_TOUCH, ts->input->keybit);
> + __set_bit(EV_ABS, ts->input->evbit);
> + __set_bit(EV_KEY, ts->input->evbit);
These 3 __set_bits() are not needed, the calls below will take care of
setting needed bits.
> +
> + /* Multitouch input params setup */
> + input_set_abs_params(ts->input, ABS_MT_POSITION_X, 0,
> + ts->info.x_max, 0, 0);
> + input_set_abs_params(ts->input, ABS_MT_POSITION_Y,
> + 0, ts->info.y_max, 0, 0);
> + input_set_abs_params(ts->input, ABS_MT_TOUCH_MAJOR, 0, 255, 0, 0);
> + input_set_abs_params(ts->input, ABS_MT_PRESSURE, 0, 255, 0, 0);
> + input_abs_set_res(ts->input, ABS_MT_POSITION_X, ts->info.x_res);
> + input_abs_set_res(ts->input, ABS_MT_POSITION_Y, ts->info.y_res);
> +
> + input_set_drvdata(ts->input, ts);
> +
> + error = input_mt_init_slots(ts->input, MAX_TOUCH_NUM,
> + INPUT_MT_DIRECT | INPUT_MT_DROP_UNUSED);
> + if (error) {
> + dev_err(&client->dev,
> + "failed to initialize MT slots: %d\n", error);
> + return error;
> + }
> +
> + error = input_register_device(ts->input);
> + if (error) {
> + dev_err(&client->dev,
> + "unable to register input device: %d\n", error);
> + return error;
> + }
> +
> + error = devm_request_threaded_irq(&client->dev, client->irq,
> + NULL, raydium_i2c_irq, irqflags | IRQF_ONESHOT,
> + client->name, ts);
> + if (error) {
> + dev_err(&client->dev, "Failed to register interrupt\n");
> + return error;
> + }
> +
> + device_init_wakeup(&client->dev, true);
Please remove and rely on I2C core to enable wakeup for the device.
I know that is does not do that for ACPI-backed devices yet, but that is
something that we need to change there, not in the driver.
> +
> + error = sysfs_create_group(&client->dev.kobj, &raydium_attribute_group);
> + if (error) {
> + dev_err(&client->dev, "failed to create sysfs attributes: %d\n",
> + error);
> + return error;
> + }
> +
> + error = devm_add_action(&client->dev,
> + raydium_i2c_remove_sysfs_group, ts);
> + if (error) {
> + raydium_i2c_remove_sysfs_group(ts);
> + dev_err(&client->dev,
> + "Failed to add sysfs cleanup action: %d\n", error);
> + return error;
> + }
> +
> + return 0;
> +}
> +
> +static int raydium_i2c_remove(struct i2c_client *client)
> +{
> + struct raydium_data *ts = i2c_get_clientdata(client);
> +
> + input_unregister_device(ts->input);
This call is not needed.
> +
> + device_init_wakeup(&client->dev, false);
If we rely on platform/i2c core to set up wakeup flag we do not need to
reset it here.
> +
> + mutex_destroy(&ts->sysfs_mutex);
This is not needed. Because nothing in raydium_i2c_remove() is needed
you can remove to altogether.
> +
> + return 0;
> +}
> +
> +static void __maybe_unused raydium_enter_sleep(struct i2c_client *client)
> +{
> + static const u8 sleep_cmd[] = { 0x5A, 0xff, 0x00, 0x0f };
> + int error;
> +
> + error = raydium_i2c_send(client, CMD_ENTER_SLEEP, (u8 *)sleep_cmd,
> + sizeof(sleep_cmd));
> + if (error)
> + dev_err(&client->dev,
> + "Send sleep failed: %d\n", error);
> +}
> +
> +static int __maybe_unused raydium_i2c_suspend(struct device *dev)
> +{
> + struct i2c_client *client = to_i2c_client(dev);
> + struct raydium_data *ts = i2c_get_clientdata(client);
> +
> + /* Command not support in BLDR recovery mode */
> + if (ts->boot_mode != RAYDIUM_TS_MAIN)
> + return -EBUSY;
> +
> + disable_irq(client->irq);
> +
> + if (device_may_wakeup(dev)) {
> + raydium_enter_sleep(client);
> +
> + ts->wake_irq_enabled = (enable_irq_wake(client->irq) == 0);
> + } else {
> + raydium_i2c_power_off(ts);
> + }
> +
> + return 0;
> +}
> +
> +static int __maybe_unused raydium_i2c_resume(struct device *dev)
> +{
> + struct i2c_client *client = to_i2c_client(dev);
> + struct raydium_data *ts = i2c_get_clientdata(client);
> +
> + if (device_may_wakeup(dev)) {
> + if (ts->wake_irq_enabled)
> + disable_irq_wake(client->irq);
> + raydium_i2c_sw_reset(client);
> + } else {
> + raydium_i2c_power_on(ts);
> + raydium_i2c_initialize(ts);
> + }
> +
> + enable_irq(client->irq);
> +
> + return 0;
> +}
> +
> +static SIMPLE_DEV_PM_OPS(raydium_i2c_pm_ops,
> + raydium_i2c_suspend, raydium_i2c_resume);
> +
> +static const struct i2c_device_id raydium_i2c_id[] = {
> + { DEVICE_NAME, 0 },
> + { }
> +};
> +MODULE_DEVICE_TABLE(i2c, raydium_i2c_id);
> +
> +#ifdef CONFIG_ACPI
> +static const struct acpi_device_id raydium_acpi_id[] = {
> + { "RAYD0001", 0 },
> + { }
> +};
> +MODULE_DEVICE_TABLE(acpi, raydium_acpi_id);
> +#endif
> +
> +#ifdef CONFIG_OF
> +static const struct of_device_id raydium_of_match[] = {
> + { .compatible = "raydium,rm32380",},
> + { /* sentinel */ }
> +};
> +MODULE_DEVICE_TABLE(of, raydium_of_match);
> +#endif
> +
> +static struct i2c_driver raydium_i2c_driver = {
> + .probe = raydium_i2c_probe,
> + .remove = raydium_i2c_remove,
> + .id_table = raydium_i2c_id,
> + .driver = {
> + .name = "raydium_ts",
> + .pm = &raydium_i2c_pm_ops,
> + .acpi_match_table = ACPI_PTR(raydium_acpi_id),
> + .of_match_table = of_match_ptr(raydium_of_match),
> + },
> +};
> +
> +module_i2c_driver(raydium_i2c_driver);
> +
> +MODULE_AUTHOR("Raydium");
> +MODULE_DESCRIPTION("Raydium I2c Touchscreen driver");
> +MODULE_LICENSE("GPL v2");
> --
> 2.1.2
>
Thanks.
--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
