diff options
| author | andy.hu <andy.hu@starfivetech.com> | 2024-04-26 13:11:57 +0300 |
|---|---|---|
| committer | andy.hu <andy.hu@starfivetech.com> | 2024-04-26 13:11:57 +0300 |
| commit | 1031a563222d7c875e3e472b5cab095d8a32919d (patch) | |
| tree | 55927433e5a3030e5e717c48e645503d89990fa2 | |
| parent | 54da989d6b420e74bd334e19b7d615c39fa8a252 (diff) | |
| parent | 96a5c928a83983cc1162aee862e14547c712edca (diff) | |
| download | linux-1031a563222d7c875e3e472b5cab095d8a32919d.tar.xz | |
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
| -rw-r--r-- | arch/riscv/boot/dts/starfive/jh7110.dtsi | 1 | ||||
| -rw-r--r-- | drivers/input/touchscreen/goodix.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi index ef3dfe05ba51..3e6786bdc414 100644 --- a/arch/riscv/boot/dts/starfive/jh7110.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi @@ -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> / { diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c index b068ff8afbc9..b4d91d394c1b 100644 --- a/drivers/input/touchscreen/goodix.c +++ b/drivers/input/touchscreen/goodix.c @@ -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); } |