--- v4
+++ v1
@@ -1,117 +1,74 @@
-From: Steve Twiss <stwiss.opensource@diasemi.com>
+From: Steve Twiss <stwiss.opensource-WBD+wuPFNBhBDgjK7y7TUQ@public.gmane.org>
-The of_device_id match array is added to support "dlg,da9062-watchdog"
-as a valid .compatible string. A MODULE_DEVICE_TABLE() macro is added.
+Add binding information for DA9061 onkey.
-This patch assumes the use of a DA9062 fallback compatible string for the
-DTS to pick up the DA9062 device driver for use with the DA9061 watchdog
-hardware
+This patch updates the compatible string "dlg,da9061-onkey" to support
+DA9061, removes ther reference to KEY_SLEEP (which the driver no longer
+supports) and fixes a typo in the example.
-Copyright header is updated to add DA9061 in its description and the module
-description macro is extended to include DA9061.
-
-Kconfig is updated to reflect support for DA9061/62.
-
-Reviewed-by: Guenter Roeck <linux@roeck-us.net>
-Signed-off-by: Steve Twiss <stwiss.opensource@diasemi.com>
+Signed-off-by: Steve Twiss <stwiss.opensource-WBD+wuPFNBhBDgjK7y7TUQ@public.gmane.org>
---
This patch applies against linux-next and v4.8
-v3 -> v4
- - NO CODE CHANGE
- - Patch renamed from [PATCH V3 7/9] to [PATCH V4 6/8]
- - Added reviewed by Guenter Roeck
-
-v2 -> v3
- - Patch renamed from [PATCH V2 08/10] to [PATCH V3 7/9]
- - Removal of match->data and of_match_node search. There is only one
- compatible string now. and delete the .data = &da9062_watchdog_info
- association in the struct of_device_id compatible table.
- - Addition of MODULE_DEVICE_TABLE macro to allow modinfo additions:
- da9062_wdt.ko platform:da9062_watchdog
- of:N*T*Cdlg,da9062_watchdogC*
- of:N*T*Cdlg,da9062_watchdog
-
-v1 -> v2
- - Patch renamed from [PATCH V1 04/10] to [PATCH V2 08/10] -- these
- changes were made to fix checkpatch warnings caused by the patch
- set dependency order
- - Removal of the DA9061 compatible entries for this device driver.
- - Additional explanation in the patch description for the use of a
- fall-back compatible DTS string
-
Hi,
-There are no code changes to this patch compared to the previous
-submission in [PATCH V3 7/9]. The differences are in the patch version
-rename and Reviewed-by tag.
+This patch depends on the acceptance of the main code for the onkey:
+ [PATCH V1 3/10] Input: da9061: onkey driver.
Regards,
Steve Twiss, Dialog Semiconductor Ltd.
- drivers/watchdog/Kconfig | 4 ++--
- drivers/watchdog/da9062_wdt.c | 12 ++++++++++--
- 2 files changed, 12 insertions(+), 4 deletions(-)
+ .../devicetree/bindings/input/da9062-onkey.txt | 19 +++++++++----------
+ 1 file changed, 9 insertions(+), 10 deletions(-)
-diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
-index 1bffe00..d6b4088 100644
---- a/drivers/watchdog/Kconfig
-+++ b/drivers/watchdog/Kconfig
-@@ -104,11 +104,11 @@ config DA9063_WATCHDOG
- This driver can be built as a module. The module name is da9063_wdt.
+diff --git a/Documentation/devicetree/bindings/input/da9062-onkey.txt b/Documentation/devicetree/bindings/input/da9062-onkey.txt
+index ab0e048..ce45436 100644
+--- a/Documentation/devicetree/bindings/input/da9062-onkey.txt
++++ b/Documentation/devicetree/bindings/input/da9062-onkey.txt
+@@ -1,28 +1,27 @@
+-* Dialog DA9062/63 OnKey Module
++* Dialog DA9061/62/63 OnKey Module
- config DA9062_WATCHDOG
-- tristate "Dialog DA9062 Watchdog"
-+ tristate "Dialog DA9062/61 Watchdog"
- depends on MFD_DA9062
- select WATCHDOG_CORE
- help
-- Support for the watchdog in the DA9062 PMIC.
-+ Support for the watchdog in the DA9062 and DA9061 PMICs.
+-This module is part of the DA9062/DA9063. For more details about entire
+-chips see Documentation/devicetree/bindings/mfd/da9062.txt and
+-Documentation/devicetree/bindings/mfd/da9063.txt
++This module is part of the DA9061/DA9062/DA9063. For more details about entire
++DA9062 and DA9061 chips see Documentation/devicetree/bindings/mfd/da9062.txt
++For DA9063 see Documentation/devicetree/bindings/mfd/da9063.txt
- This driver can be built as a module. The module name is da9062_wdt.
+-This module provides KEY_POWER, KEY_SLEEP and events.
++This module provides the KEY_POWER event.
-diff --git a/drivers/watchdog/da9062_wdt.c b/drivers/watchdog/da9062_wdt.c
-index 7386111..a02cee6 100644
---- a/drivers/watchdog/da9062_wdt.c
-+++ b/drivers/watchdog/da9062_wdt.c
-@@ -1,5 +1,5 @@
- /*
-- * da9062_wdt.c - WDT device driver for DA9062
-+ * Watchdog device driver for DA9062 and DA9061 PMICs
- * Copyright (C) 2015 Dialog Semiconductor Ltd.
- *
- * This program is free software; you can redistribute it and/or
-@@ -188,6 +188,13 @@ static const struct watchdog_ops da9062_watchdog_ops = {
- .set_timeout = da9062_wdt_set_timeout,
- };
+ Required properties:
-+static const struct of_device_id da9062_compatible_id_table[] = {
-+ { .compatible = "dlg,da9062-watchdog", },
-+ { },
-+};
-+
-+MODULE_DEVICE_TABLE(of, da9062_compatible_id_table);
-+
- static int da9062_wdt_probe(struct platform_device *pdev)
- {
- int ret;
-@@ -244,11 +251,12 @@ static struct platform_driver da9062_wdt_driver = {
- .remove = da9062_wdt_remove,
- .driver = {
- .name = "da9062-watchdog",
-+ .of_match_table = da9062_compatible_id_table,
- },
- };
- module_platform_driver(da9062_wdt_driver);
+ - compatible: should be one of:
++ dlg,da9061-onkey
+ dlg,da9062-onkey
+ dlg,da9063-onkey
- MODULE_AUTHOR("S Twiss <stwiss.opensource@diasemi.com>");
--MODULE_DESCRIPTION("WDT device driver for Dialog DA9062");
-+MODULE_DESCRIPTION("WDT device driver for Dialog DA9062 and DA9061");
- MODULE_LICENSE("GPL");
- MODULE_ALIAS("platform:da9062-watchdog");
+ Optional properties:
+
+- - dlg,disable-key-power : Disable power-down using a long key-press. If this
++- dlg,disable-key-power : Disable power-down using a long key-press. If this
+ entry exists the OnKey driver will remove support for the KEY_POWER key
+- press. If this entry does not exist then by default the key-press
+- triggered power down is enabled and the OnKey will support both KEY_POWER
+- and KEY_SLEEP.
++ press when triggered using a long press of the OnKey.
+
+ Example:
+
+- pmic0: da9062@58 {
++ pmic0: da9063@58 {
+
+ onkey {
+ compatible = "dlg,da9063-onkey";
--
-end-of-patch for PATCH V4
+end-of-patch for PATCH V1
+--
+To unsubscribe from this list: send the line "unsubscribe devicetree" in
+the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
+More majordomo info at http://vger.kernel.org/majordomo-info.html