On 10/16/18 7:48 PM, Dmitry Torokhov wrote:
On Tue, Oct 16, 2018 at 11:22:48AM +0200, Richard Leitner wrote:
The sx8654 and sx8650 are quite similar, therefore add support for the
sx8650 within the sx8654 driver.
...
/* bits for I2C_REG_CHANMASK */
-#define CONV_X 0x80
-#define CONV_Y 0x40
+#define CONV_X BIT(7)
+#define CONV_Y BIT(6)
If you are using BIT() you need to include include/linux/bitops.h
I also would prefer conversion to using BIT() as a separate patch.
OK. I'll take it out of this patch.
Should I convert them (and the other #defines where it makes sense) to
BIT() at all?
/* coordinates rate: higher nibble of CTRL0 register */
#define RATE_MANUAL 0x00
@@ -71,14 +75,110 @@
/* power delay: lower nibble of CTRL0 register */
#define POWDLY_1_1MS 0x0b
+/* for sx8650, as we have no pen release IRQ there: timeout in ns following the
+ * last PENIRQ after which we assume the pen is lifted.
+ */
+#define SX8650_PENIRQ_TIMEOUT (80 * 1100 * 1000)
+
#define MAX_12BIT ((1 << 12) - 1)
+#define MAX_I2C_READ_LEN 10 /* see datasheet section 5.1.5 */
+
+/* channel definition */
+#define CH_X 0x00
+#define CH_Y 0x01
+
+struct sx865x_data {
+ u8 cmd_manual;
+ u8 chan_mask;
+ u8 has_irq_penrelease;
+ u8 has_reg_irqmask;
+ irq_handler_t irqh;
+};
struct sx8654 {
struct input_dev *input;
struct i2c_client *client;
struct gpio_desc *gpio_reset;
+ struct hrtimer timer;
Does this have to be hrtimer? Can regular timer be used?
I'll check again if it's feasible to reduce the timer delay to something
below the "normal" jiffy. If not I'll replace the hrtimer with a timer.
+
+ const struct sx865x_data *data;
};
+static enum hrtimer_restart sx865x_penrelease_timer_handler(struct hrtimer *h)
+{
+ struct sx8654 *ts = container_of(h, struct sx8654, timer);
+
+ input_report_key(ts->input, BTN_TOUCH, 0);
+ input_sync(ts->input);
+ dev_dbg(&ts->client->dev, "penrelease by timer\n");
+
+ return HRTIMER_NORESTART;
+}
+
...
@@ -196,10 +312,30 @@ static void sx8654_close(struct input_dev *dev)
}
#ifdef CONFIG_OF
+static const struct of_device_id sx8654_of_match[] = {
+ {
+ .compatible = "semtech,sx8650",
+ .data = &sx8650_data,
+ }, {
+ .compatible = "semtech,sx8654",
+ .data = &sx8654_data,
+ }, {
+ .compatible = "semtech,sx8655",
+ .data = &sx8654_data,
+ }, {
+ .compatible = "semtech,sx8656",
+ .data = &sx8654_data,
+ }, {},
+};
+MODULE_DEVICE_TABLE(of, sx8654_of_match);
+
static int sx8654_get_ofdata(struct sx8654 *ts)
{
struct device *dev = &ts->client->dev;
struct device_node *node = dev->of_node;
+ const struct of_device_id *of_id = of_match_device(sx8654_of_match,
+ dev);
If you use of_device_get_match_data() you do not need to move device
table around.
Thanks for that hint. I haven't known there's something like this ;-)
+ const struct sx865x_data *data = (struct sx865x_data *)of_id->data;
int err;
if (!node) {
...
@@ -327,6 +466,7 @@ static int sx8654_probe(struct i2c_client *client,
}
static const struct i2c_device_id sx8654_id_table[] = {
+ { "semtech_sx8650", 0 },
Can we add the data here as well?
Does it generate any benefit if we add it? Who should be using it?
I found in other drivers that it's used as a fallback when
of_device_get_match_data() returns NULL... Should I also implement it
that way?
{ "semtech_sx8654", 0 },
{ "semtech_sx8655", 0 },
{ "semtech_sx8656", 0 },
--
2.11.0
Thanks.
thanks®ards;Richard.L
