From patchwork Mon Oct 31 16:02:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Twiss X-Patchwork-Id: 9405853 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 71E8360722 for ; Mon, 31 Oct 2016 16:17:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5CA95292A9 for ; Mon, 31 Oct 2016 16:17:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 50D052933F; Mon, 31 Oct 2016 16:17:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A2702292A9 for ; Mon, 31 Oct 2016 16:17:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932441AbcJaQQ7 (ORCPT ); Mon, 31 Oct 2016 12:16:59 -0400 Received: from mail1.bemta5.messagelabs.com ([195.245.231.140]:38349 "EHLO mail1.bemta5.messagelabs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758640AbcJaQPn (ORCPT ); Mon, 31 Oct 2016 12:15:43 -0400 Received: from [85.158.139.35] by server-4.bemta-5.messagelabs.com id C3/E0-22514-A2E67185; Mon, 31 Oct 2016 16:15:38 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrNKsWRWlGSWpSXmKPExsUSt3Opsa5Wnni EwZUFUhZTHz5hs5h/5ByrxeFFLxgt5l+5xmpx/+tRRotvVzqYLG5++sZqcXnXHDaLz71HGC1u rNvHbvFk4Rkmi6XXLzJZtO49AuQ+7GOzuDyxk93i1owXrA4CHmvmrWH02DnrLrvHtc1iHov3v GTy2LSqk83jzrU9bB47vzewe3zeJBfAEcWamZeUX5HAmnHh/B7GggNyFX3LDrE1MB6T7GLk4h ASWM8osXnuMZYuRg4gp0Li6BMeEJNXIFli16tkEJNTwFHiS5dLFyMnUIGDxM6LV9hAbDYBQ4l 5b94zgtgsAqoS0/rOMoHYwgI2ElObJzGDTBcRWMEocWfGNjCHWeA2s8TnX4dYQap4BQQlTs58 wgJiMwtISBx88YIZ4gQtieXHIkHCEgL2EtPfXwULSwjoSzQei4UIG0p8n/WNBcI2l2hY1Mk4g VFwFpKhs5AMXcDItIpRozi1qCy1SNfQUi+pKDM9oyQ3MTNH19DAVC83tbg4MT01JzGpWC85P3 cTIzDi6hkYGHcwPur3O8QoycGkJMr7NUw8QogvKT+lMiOxOCO+qDQntfgQowwHh5IE7+4coJx gUWp6akVaZg4w9mHSEhw8SiK8XSBp3uKCxNzizHSI1ClGXY5vez4/YBJiycvPS5US5z0MUiQA UpRRmgc3ApaGLjHKSgnzMjIwMAjxFKQW5WaWoMq/YhTnYFQS5mXLBZrCk5lXArfpFdARTEBHp BWKgBxRkoiQkmpgrBeoUdzuev+14GXNZKclgo+uBHFlxW28afLKcX7NRPkk5p/nOTyvn5Pglb 7MX7/M5ElTuWH5W6GPUW0rE9y+lk6N9Vj4t6ClZrlJYZfq+VMxyws3dF45kbu8u5w/8TDjiQ8 HY+Mu/5L7seajQ8ZPz9+G7bOOFln5q/JdKzuox7jLeOqnk+naSizFGYmGWsxFxYkApaH5ij4D AAA= X-Env-Sender: stwiss.opensource@diasemi.com X-Msg-Ref: server-6.tower-179.messagelabs.com!1477930534!63574082!8 X-Originating-IP: [94.185.165.51] X-StarScan-Received: X-StarScan-Version: 9.0.13; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22647 invoked from network); 31 Oct 2016 16:15:38 -0000 Received: from mailrelay2.diasemi.com (HELO sw-ex-cashub01.diasemi.com) (94.185.165.51) by server-6.tower-179.messagelabs.com with AES128-SHA encrypted SMTP; 31 Oct 2016 16:15:38 -0000 Received: from swsrvapps-01.diasemi.com (10.20.28.141) by SW-EX-CASHUB01.diasemi.com (10.20.16.140) with Microsoft SMTP Server id 14.3.248.2; Mon, 31 Oct 2016 16:15:36 +0000 Received: by swsrvapps-01.diasemi.com (Postfix, from userid 22547) id 4B5103FBFC; Mon, 31 Oct 2016 16:15:33 +0000 (GMT) Message-ID: <45b99f01747a87dbee2529fa34e61883fceabcfc.1477929725.git.stwiss.opensource@diasemi.com> In-Reply-To: References: From: Steve Twiss Date: Mon, 31 Oct 2016 16:02:04 +0000 Subject: [PATCH V3 7/9] watchdog: da9062/61: watchdog driver To: Guenter Roeck , LINUX-KERNEL , LINUX-WATCHDOG , Wim Van Sebroeck CC: DEVICETREE , Dmitry Torokhov , Eduardo Valentin , LINUX-INPUT , LINUX-PM , Lee Jones , Liam Girdwood , Mark Brown , Mark Rutland , Rob Herring , Support Opensource , Zhang Rui MIME-Version: 1.0 X-KSE-AttachmentFiltering-Interceptor-Info: protection disabled X-KSE-ServerInfo: sw-ex-cashub01.diasemi.com, 9 X-KSE-Antivirus-Interceptor-Info: scan successful X-KSE-Antivirus-Info: Clean, bases: 31/10/2016 13:14:00 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Steve Twiss 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. 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 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. Signed-off-by: Steve Twiss Reviewed-by: Guenter Roeck --- This patch applies against linux-next and v4.8 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 Guenter, Alterations have been made in accordance with the previous e-mail thread on the use of compatible strings: https://lkml.org/lkml/2016/10/7/641 This patch now assumes the use of a fallback compatible string in the DTS. Of the form: compatible = "dlg,da9061-watchdog", "dlg,da9062-watchdog"; Regards, Steve Twiss, Dialog Semiconductor Ltd. drivers/watchdog/Kconfig | 4 ++-- drivers/watchdog/da9062_wdt.c | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 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. 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 driver can be built as a module. The module name is da9062_wdt. 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, }; +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); MODULE_AUTHOR("S Twiss "); -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");