UPSTREAM: clk: rockchip: release io resource when failing to init clk

[firefly-linux-kernel-4.4.55.git] / drivers / rtc / rtc-isl12057.c

diff --git a/drivers/rtc/rtc-isl12057.c b/drivers/rtc/rtc-isl12057.c
index a0462e5430c79c2378fef402b4a5270e18cdefa9..54328d4ac0d31061a4afd76d5651279ef526449b 100644 (file)
--- a/drivers/rtc/rtc-isl12057.c
+++ b/drivers/rtc/rtc-isl12057.c
@@ -466,9 +466,8 @@ static int isl12057_check_rtc_status(struct device *dev, struct regmap *regmap)
  * is for instance the case on ReadyNAS 102, 104 and 2120. On those
  * devices with no IRQ driectly connected to the SoC, the RTC chip
  * can be forced as a wakeup source by stating that explicitly in
- * the device's .dts file using the "isil,irq2-can-wakeup-machine"
- * boolean property. This will guarantee 'wakealarm' sysfs entry is
- * available on the device.
+ * the device's .dts file using the "wakeup-source" boolean property.
+ * This will guarantee 'wakealarm' sysfs entry is available on the device.
  *
  * The function below returns 1, i.e. the capability of the chip to
  * wakeup the device, based on IRQ availability or if the boolean
@@ -479,8 +478,9 @@ static bool isl12057_can_wakeup_machine(struct device *dev)
 {
        struct isl12057_rtc_data *data = dev_get_drvdata(dev);
 
-       return (data->irq || of_property_read_bool(dev->of_node,
-                                             "isil,irq2-can-wakeup-machine"));
+       return data->irq || of_property_read_bool(dev->of_node, "wakeup-source")
+               || of_property_read_bool(dev->of_node, /* legacy */
+                                        "isil,irq2-can-wakeup-machine");
 }
 #else
 static bool isl12057_can_wakeup_machine(struct device *dev)