[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20180219225918.2311-2-mdf@kernel.org>
Date: Mon, 19 Feb 2018 14:59:18 -0800
From: Moritz Fischer <mdf@...nel.org>
To: linux-kernel@...r.kernel.org
Cc: devicetree@...r.kernel.org, linux-pm@...r.kernel.org,
sre@...nel.org, Moritz Fischer <mdf@...nel.org>
Subject: [PATCH v2 2/2] power: reset: gpio-poweroff: Add support for timeout from DT
Add support for reading a timeout value from devicetree.
Fall back to previous default of 3s if nothing is specified.
Signed-off-by: Moritz Fischer <mdf@...nel.org>
---
Changes from v1:
- of_property_read_u32() overwrites the output only if it succeeds,
simplify error handling
---
drivers/power/reset/gpio-poweroff.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/power/reset/gpio-poweroff.c b/drivers/power/reset/gpio-poweroff.c
index be3d81ff51cc..265cc37646a9 100644
--- a/drivers/power/reset/gpio-poweroff.c
+++ b/drivers/power/reset/gpio-poweroff.c
@@ -19,11 +19,13 @@
#include <linux/of_platform.h>
#include <linux/module.h>
+#define DEFAULT_TIMEOUT_MS 3000
/*
* Hold configuration here, cannot be more than one instance of the driver
* since pm_power_off itself is global.
*/
static struct gpio_desc *reset_gpio;
+static u32 timeout = DEFAULT_TIMEOUT_MS;
static void gpio_poweroff_do_poweroff(void)
{
@@ -40,7 +42,7 @@ static void gpio_poweroff_do_poweroff(void)
gpiod_set_value(reset_gpio, 1);
/* give it some time */
- mdelay(3000);
+ mdelay(timeout);
WARN_ON(1);
}
@@ -64,6 +66,8 @@ static int gpio_poweroff_probe(struct platform_device *pdev)
else
flags = GPIOD_OUT_LOW;
+ of_property_read_u32(pdev->dev.of_node, "timeout_ms", &timeout);
+
reset_gpio = devm_gpiod_get(&pdev->dev, NULL, flags);
if (IS_ERR(reset_gpio))
return PTR_ERR(reset_gpio);
--
2.16.1
Powered by blists - more mailing lists