Commit db3e34d4 authored by Dmitry Torokhov's avatar Dmitry Torokhov

Input: bu21013_ts - use interrupt from I2C client

Instead of trying to map INT GPIO to interrupt, let's use one supplied by
I2C client. If there is none - bail. This will also allow us to treat INT
GPIO as optional, as per the binding.
Tested-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 1eb7b4ca
...@@ -4,6 +4,8 @@ Required properties: ...@@ -4,6 +4,8 @@ Required properties:
- compatible : "rohm,bu21013_tp" - compatible : "rohm,bu21013_tp"
- reg : I2C device address - reg : I2C device address
- reset-gpios : GPIO pin enabling (selecting) chip (CS) - reset-gpios : GPIO pin enabling (selecting) chip (CS)
- interrupt-parent : the phandle for the gpio controller
- interrupts : (gpio) interrupt to which the chip is connected
Optional properties: Optional properties:
- touch-gpios : GPIO pin registering a touch event - touch-gpios : GPIO pin registering a touch event
...@@ -19,7 +21,9 @@ Example: ...@@ -19,7 +21,9 @@ Example:
bu21013_tp@5c { bu21013_tp@5c {
compatible = "rohm,bu21013_tp"; compatible = "rohm,bu21013_tp";
reg = <0x5c>; reg = <0x5c>;
touch-gpio = <&gpio2 20 0x4>; interrupt-parent = <&gpio2>;
interrupts <&20 IRQ_TYPE_LEVEL_LOW>;
touch-gpio = <&gpio2 20 GPIO_ACTIVE_LOW>;
avdd-supply = <&ab8500_ldo_aux1_reg>; avdd-supply = <&ab8500_ldo_aux1_reg>;
rohm,touch-max-x = <384>; rohm,touch-max-x = <384>;
......
...@@ -141,7 +141,6 @@ ...@@ -141,7 +141,6 @@
* @regulator: pointer to the Regulator used for touch screen * @regulator: pointer to the Regulator used for touch screen
* @cs_gpiod: chip select GPIO line * @cs_gpiod: chip select GPIO line
* @int_gpiod: touch interrupt GPIO line * @int_gpiod: touch interrupt GPIO line
* @irq: interrupt number the device is using
* @touch_x_max: maximum X coordinate reported by the device * @touch_x_max: maximum X coordinate reported by the device
* @touch_y_max: maximum Y coordinate reported by the device * @touch_y_max: maximum Y coordinate reported by the device
* @x_flip: indicates that the driver should invert X coordinate before * @x_flip: indicates that the driver should invert X coordinate before
...@@ -158,7 +157,6 @@ struct bu21013_ts { ...@@ -158,7 +157,6 @@ struct bu21013_ts {
struct regulator *regulator; struct regulator *regulator;
struct gpio_desc *cs_gpiod; struct gpio_desc *cs_gpiod;
struct gpio_desc *int_gpiod; struct gpio_desc *int_gpiod;
unsigned int irq;
u32 touch_x_max; u32 touch_x_max;
u32 touch_y_max; u32 touch_y_max;
bool x_flip; bool x_flip;
...@@ -252,7 +250,8 @@ static irqreturn_t bu21013_gpio_irq(int irq, void *device_data) ...@@ -252,7 +250,8 @@ static irqreturn_t bu21013_gpio_irq(int irq, void *device_data)
if (unlikely(ts->touch_stopped)) if (unlikely(ts->touch_stopped))
break; break;
keep_polling = gpiod_get_value(ts->int_gpiod); keep_polling = ts->int_gpiod ?
gpiod_get_value(ts->int_gpiod) : false;
if (keep_polling) if (keep_polling)
usleep_range(2000, 2500); usleep_range(2000, 2500);
} while (keep_polling); } while (keep_polling);
...@@ -419,6 +418,11 @@ static int bu21013_probe(struct i2c_client *client, ...@@ -419,6 +418,11 @@ static int bu21013_probe(struct i2c_client *client,
return -EIO; return -EIO;
} }
if (!client->irq) {
dev_err(&client->dev, "No IRQ set up\n");
return -EINVAL;
}
ts = devm_kzalloc(&client->dev, sizeof(*ts), GFP_KERNEL); ts = devm_kzalloc(&client->dev, sizeof(*ts), GFP_KERNEL);
if (!ts) if (!ts)
return -ENOMEM; return -ENOMEM;
...@@ -491,13 +495,16 @@ static int bu21013_probe(struct i2c_client *client, ...@@ -491,13 +495,16 @@ static int bu21013_probe(struct i2c_client *client,
} }
/* Named "INT" on the chip, DT binding is "touch" */ /* Named "INT" on the chip, DT binding is "touch" */
ts->int_gpiod = devm_gpiod_get(&client->dev, "touch", GPIOD_IN); ts->int_gpiod = devm_gpiod_get_optional(&client->dev,
"touch", GPIOD_IN);
error = PTR_ERR_OR_ZERO(ts->int_gpiod); error = PTR_ERR_OR_ZERO(ts->int_gpiod);
if (error) { if (error) {
if (error != -EPROBE_DEFER) if (error != -EPROBE_DEFER)
dev_err(&client->dev, "failed to get INT GPIO\n"); dev_err(&client->dev, "failed to get INT GPIO\n");
return error; return error;
} }
if (ts->int_gpiod)
gpiod_set_consumer_name(ts->int_gpiod, "BU21013 INT"); gpiod_set_consumer_name(ts->int_gpiod, "BU21013 INT");
/* configure the touch panel controller */ /* configure the touch panel controller */
...@@ -507,16 +514,12 @@ static int bu21013_probe(struct i2c_client *client, ...@@ -507,16 +514,12 @@ static int bu21013_probe(struct i2c_client *client,
return error; return error;
} }
ts->irq = gpiod_to_irq(ts->int_gpiod); error = devm_request_threaded_irq(&client->dev, client->irq,
error = devm_request_threaded_irq(&client->dev, ts->irq,
NULL, bu21013_gpio_irq, NULL, bu21013_gpio_irq,
IRQF_TRIGGER_FALLING | IRQF_ONESHOT, DRIVER_TP, ts);
IRQF_SHARED |
IRQF_ONESHOT,
DRIVER_TP, ts);
if (error) { if (error) {
dev_err(&client->dev, "request irq %d failed\n", dev_err(&client->dev, "request irq %d failed\n",
ts->irq); client->irq);
return error; return error;
} }
...@@ -549,9 +552,9 @@ static int __maybe_unused bu21013_suspend(struct device *dev) ...@@ -549,9 +552,9 @@ static int __maybe_unused bu21013_suspend(struct device *dev)
ts->touch_stopped = true; ts->touch_stopped = true;
if (device_may_wakeup(&client->dev)) if (device_may_wakeup(&client->dev))
enable_irq_wake(ts->irq); enable_irq_wake(client->irq);
else else
disable_irq(ts->irq); disable_irq(client->irq);
regulator_disable(ts->regulator); regulator_disable(ts->regulator);
...@@ -579,9 +582,9 @@ static int __maybe_unused bu21013_resume(struct device *dev) ...@@ -579,9 +582,9 @@ static int __maybe_unused bu21013_resume(struct device *dev)
ts->touch_stopped = false; ts->touch_stopped = false;
if (device_may_wakeup(&client->dev)) if (device_may_wakeup(&client->dev))
disable_irq_wake(ts->irq); disable_irq_wake(client->irq);
else else
enable_irq(ts->irq); enable_irq(client->irq);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment