mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-03-16 04:04:06 +00:00
Merge branch 'CR_10494_vf2_6.6_mipi_touchscreen_shengyang.chen' into 'vf2-6.6.y-devel'
CR_10494_vf2_6.6: input: touchscreen: Add goodix gt911 touchscreen support for vf2 6.6 See merge request sbc/linux!211
This commit is contained in:
commit
1031a56322
2 changed files with 3 additions and 2 deletions
|
@ -8,6 +8,7 @@
|
|||
#include <dt-bindings/clock/starfive,jh7110-crg.h>
|
||||
#include <dt-bindings/power/starfive,jh7110-pmu.h>
|
||||
#include <dt-bindings/reset/starfive,jh7110-crg.h>
|
||||
#include <dt-bindings/interrupt-controller/irq.h>
|
||||
#include <dt-bindings/thermal/thermal.h>
|
||||
|
||||
/ {
|
||||
|
|
|
@ -515,12 +515,12 @@ static irqreturn_t goodix_ts_irq_handler(int irq, void *dev_id)
|
|||
|
||||
static void goodix_free_irq(struct goodix_ts_data *ts)
|
||||
{
|
||||
devm_free_irq(&ts->client->dev, ts->client->irq, ts);
|
||||
devm_free_irq(&ts->client->dev, gpiod_to_irq(ts->gpiod_int), ts);
|
||||
}
|
||||
|
||||
static int goodix_request_irq(struct goodix_ts_data *ts)
|
||||
{
|
||||
return devm_request_threaded_irq(&ts->client->dev, ts->client->irq,
|
||||
return devm_request_threaded_irq(&ts->client->dev, gpiod_to_irq(ts->gpiod_int),
|
||||
NULL, goodix_ts_irq_handler,
|
||||
ts->irq_flags, ts->client->name, ts);
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue