linux-kernel - [PATCH 2/2] power: gpio-charger: support disable the wakeup event

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 10 Feb 2015 16:12:25 +0800
From:	Chris Zhong <zyw@...k-chips.com>
To:	heiko@...ech.de, dianders@...omium.org, dtor@...omium.org,
	djkurtz@...omium.org, sonnyrao@...omium.org
Cc:	linux-rockchip@...ts.infradead.org,
	Chris Zhong <zyw@...k-chips.com>,
	Sebastian Reichel <sre@...nel.org>,
	Dmitry Eremin-Solenikov <dbaryshkov@...il.com>,
	David Woodhouse <dwmw2@...radead.org>,
	linux-pm@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [PATCH 2/2] power: gpio-charger: support disable the wakeup event

Support disable the wakeup event of gpio-charger by setting device tree.

Signed-off-by: Chris Zhong <zyw@...k-chips.com>

---

 drivers/power/gpio-charger.c       | 5 ++++-
 include/linux/power/gpio-charger.h | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/power/gpio-charger.c b/drivers/power/gpio-charger.c
index b7424c8..06ed22e 100644
--- a/drivers/power/gpio-charger.c
+++ b/drivers/power/gpio-charger.c
@@ -98,6 +98,9 @@ struct gpio_charger_platform_data *gpio_charger_parse_dt(struct device *dev)
 
 	pdata->gpio_active_low = !!(flags & OF_GPIO_ACTIVE_LOW);
 
+	pdata->wakeup = !of_get_property(np, "gpio-charger,disable-wakeup",
+					 NULL);
+
 	pdata->type = POWER_SUPPLY_TYPE_UNKNOWN;
 	ret = of_property_read_string(np, "charger-type", &chargetype);
 	if (ret >= 0) {
@@ -198,7 +201,7 @@ static int gpio_charger_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, gpio_charger);
 
-	device_init_wakeup(&pdev->dev, 1);
+	device_init_wakeup(&pdev->dev, pdata->wakeup);
 
 	return 0;
 
diff --git a/include/linux/power/gpio-charger.h b/include/linux/power/gpio-charger.h
index de1dfe0..a5fdef3 100644
--- a/include/linux/power/gpio-charger.h
+++ b/include/linux/power/gpio-charger.h
@@ -33,6 +33,7 @@ struct gpio_charger_platform_data {
 
 	int gpio;
 	int gpio_active_low;
+	int wakeup;
 
 	char **supplied_to;
 	size_t num_supplicants;
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/