Merge tag 'kgdb-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt...

[linux-2.6-microblaze.git] / drivers / rtc / rtc-hym8563.c

diff --git a/drivers/rtc/rtc-hym8563.c b/drivers/rtc/rtc-hym8563.c
index cc710d6..b018535 100644 (file)
--- a/drivers/rtc/rtc-hym8563.c
+++ b/drivers/rtc/rtc-hym8563.c
@@ -518,9 +518,14 @@ static int hym8563_probe(struct i2c_client *client)
        }
 
        if (client->irq > 0) {
+               unsigned long irqflags = IRQF_TRIGGER_LOW;
+
+               if (dev_fwnode(&client->dev))
+                       irqflags = 0;
+
                ret = devm_request_threaded_irq(&client->dev, client->irq,
                                                NULL, hym8563_irq,
-                                               IRQF_TRIGGER_LOW | IRQF_ONESHOT,
+                                               irqflags | IRQF_ONESHOT,
                                                client->name, hym8563);
                if (ret < 0) {
                        dev_err(&client->dev, "irq %d request failed, %d\n",
@@ -571,7 +576,7 @@ static struct i2c_driver hym8563_driver = {
                .pm     = &hym8563_pm_ops,
                .of_match_table = hym8563_dt_idtable,
        },
-       .probe_new      = hym8563_probe,
+       .probe          = hym8563_probe,
        .id_table       = hym8563_id,
 };