iio: light: tsl2563: Do not hardcode interrupt trigger type
authorFerry Toth <ftoth@exalondelft.nl>
Wed, 7 Dec 2022 19:03:38 +0000 (21:03 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Mar 2023 08:33:29 +0000 (09:33 +0100)
[ Upstream commit 027641b52fe37b64af61025298ce160c8b9b7a73 ]

Instead of hardcoding IRQ trigger type to IRQF_TRIGGER_RAISING,
let's respect the settings specified in the firmware description.
To be compatible with the older firmware descriptions, if trigger
type is not set up there, we'll set it to default (raising edge).

Fixes: 388be4883952 ("staging:iio: tsl2563 abi fixes and interrupt handling")
Fixes: bdab1001738f ("staging:iio:light:tsl2563 remove old style event registration.")
Signed-off-by: Ferry Toth <ftoth@exalondelft.nl>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20221207190348.9347-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/iio/light/tsl2563.c

index 951f35ef3f41de994dd88f5339c7eb862ae3eb93..47a4626e9461029d61326efc8ad529ee9c3facf8 100644 (file)
@@ -705,6 +705,7 @@ static int tsl2563_probe(struct i2c_client *client,
        struct iio_dev *indio_dev;
        struct tsl2563_chip *chip;
        struct tsl2563_platform_data *pdata = client->dev.platform_data;
+       unsigned long irq_flags;
        int err = 0;
        u8 id = 0;
 
@@ -760,10 +761,15 @@ static int tsl2563_probe(struct i2c_client *client,
                indio_dev->info = &tsl2563_info_no_irq;
 
        if (client->irq) {
+               irq_flags = irq_get_trigger_type(client->irq);
+               if (irq_flags == IRQF_TRIGGER_NONE)
+                       irq_flags = IRQF_TRIGGER_RISING;
+               irq_flags |= IRQF_ONESHOT;
+
                err = devm_request_threaded_irq(&client->dev, client->irq,
                                           NULL,
                                           &tsl2563_event_handler,
-                                          IRQF_TRIGGER_RISING | IRQF_ONESHOT,
+                                          irq_flags,
                                           "tsl2563_event",
                                           indio_dev);
                if (err) {