From patchwork Mon Nov 14 08:22:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Twiss X-Patchwork-Id: 9426801 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 4DCE460471 for ; Mon, 14 Nov 2016 08:30:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3CCA4287F7 for ; Mon, 14 Nov 2016 08:30:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2E796287FC; Mon, 14 Nov 2016 08:30:13 +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 A8F45287F7 for ; Mon, 14 Nov 2016 08:30:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936179AbcKNI34 (ORCPT ); Mon, 14 Nov 2016 03:29:56 -0500 Received: from mail1.bemta3.messagelabs.com ([195.245.230.168]:40192 "EHLO mail1.bemta3.messagelabs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753030AbcKNI1t (ORCPT ); Mon, 14 Nov 2016 03:27:49 -0500 Received: from [85.158.137.3] by server-8.bemta-3.messagelabs.com id C9/7C-26755-35579285; Mon, 14 Nov 2016 08:26:59 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrLKsWRWlGSWpSXmKPExsUSt3OpsW5QqWa EwdlGLYupD5+wWcw/co7V4vCiF4wW869cY7W4//Uoo8W3Kx1MFjc/fWO1uLxrDpvF594jjBY3 1u1jt3iy8AyTxdLrF5ksWvceAXIf9rFZXJ7YyW5xa8YLVgcBjzXz1jB67Jx1l93j2mYxj8V7X jJ5bFrVyeZx59oeNo+d3xvYPT5vkgvgiGLNzEvKr0hgzXg/vY+54LFcxf95L5kbGK9IdjFycQ gJrGeUWLJrPlsXIyeQUyGxtvEyO4jNK5Assbx9EpDNwcEp4CjxcjYXRImDROeC+UwgNpuAocS 8N+8ZQWwWAVWJp/Nugo0RFrCRuPP0LivIfBGBFYwSd2ZsYwZxmAVuM0t8/nWIFWKBoMTJmU9Y QGxmAQmJgy9eMIMsExLQklh+LBIkLCFgLzH9/VWwsISAvkTjsViIsKHE91nfWCBsc4mr276yT mAUnIVk6CwkQxcwMq1i1ChOLSpLLdI1MtFLKspMzyjJTczM0TU0MNbLTS0uTkxPzUlMKtZLzs /dxAiMunoGBsYdjK+O+x1ilORgUhLljY/UjBDiS8pPqcxILM6ILyrNSS0+xCjDwaEkwdtRApQ TLEpNT61Iy8wBxj9MWoKDR0mEdylImre4IDG3ODMdInWKUZfj257PD5iEWPLy81KlxHnbQIoE QIoySvPgRsBS0SVGWSlhXkYGBgYhnoLUotzMElT5V4ziHIxKwrwNIFN4MvNK4Da9AjqCCeiIX eYaIEeUJCKkpBoY28/y+r44YXe+wzDN4P6326LygausX7sce/Txeo1PtuCK9Te+lSX8/2bEIv 197cRt9/vd8ic/iPls1RMpmnzDwX/z8g2n4vZdaJrw6WxkS4frriCBXz4TOf61K5ZszeyoFfT dOPdb2SXTYtMlodNWNV/nWt1X5NeqeLp+7Z8JnYxScQ7unHPWKLEUZyQaajEXFScCADvgmWFA AwAA X-Env-Sender: stwiss.opensource@diasemi.com X-Msg-Ref: server-14.tower-38.messagelabs.com!1479112016!62255366!7 X-Originating-IP: [94.185.165.51] X-StarScan-Received: X-StarScan-Version: 9.0.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21191 invoked from network); 14 Nov 2016 08:26:58 -0000 Received: from mailrelay2.diasemi.com (HELO sw-ex-cashub01.diasemi.com) (94.185.165.51) by server-14.tower-38.messagelabs.com with AES128-SHA encrypted SMTP; 14 Nov 2016 08:26:58 -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, 14 Nov 2016 08:26:56 +0000 Received: by swsrvapps-01.diasemi.com (Postfix, from userid 22547) id 6CF903FC01; Mon, 14 Nov 2016 08:26:55 +0000 (GMT) Message-ID: In-Reply-To: References: From: Steve Twiss Date: Mon, 14 Nov 2016 08:22:45 +0000 Subject: [PATCH V4 6/8] 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: 14/11/2016 02:25: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. Reviewed-by: Guenter Roeck Signed-off-by: Steve Twiss --- 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. 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");