From patchwork Mon Jun 22 10:03:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?Sm9obnNvbiBDSCBDaGVuICjpmbPmmK3li7Mp?= X-Patchwork-Id: 11617399 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7198D60D for ; Mon, 22 Jun 2020 10:03:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 556E82071A for ; Mon, 22 Jun 2020 10:03:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=moxa.com header.i=@moxa.com header.b="PQoB7WjT" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728118AbgFVKDf (ORCPT ); Mon, 22 Jun 2020 06:03:35 -0400 Received: from mail-eopbgr1320044.outbound.protection.outlook.com ([40.107.132.44]:38144 "EHLO APC01-PU1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726898AbgFVKDd (ORCPT ); Mon, 22 Jun 2020 06:03:33 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mfG8SlCVPhzsIVUjZfpjzfzHigS8pT6aws5OFOr1oTBUf2x6Kb/TJ8mPoWgIiGPLSIR/0y/lGKbtUDa2nkv33yUoesDldmXuts04vuLzzio24D7uQdUapGy1A1jhubMwYYm3ggOkgy88DCEa4sMEUp44sJRnFpihodp9Gmjfc2qym8Bbr+WMkGk3lneyylumKoKyQ890arv/oFhE8jeFSWt0X+n2XUNQgUSKT2PBeFE1KVnAMXGm7eLFvJg3/j9UUF6uh6JMgtp2lzSPLfo5K9UPtBQMqqiJSFT83wJsKzqU9b9E2JzJGUsvWWbPAMPfEkEJw9h23XWZyyA5kvlP1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YRVd2eUuzMtB+96qfIGRAkQjXSg15Wl8LXHYRc8Unss=; b=DRC/RY2uXylti4ESjnLEvXho0vdwd4tuO1ooArehGBBFoce0vQi2Wfx83u5DKXguq958DlbhcvR4VE0hNxnfAvSEyAnZvLIlI8S3vU35mhxsDFnL+ecds9kqmCbtRnC0zI5SU50ihRPQHGOV2YtVlVKWmYnIk9YYhQG4ptzm9LGYpS3LDoITlcXxCjJZLn3yzIgRpIBEetUEJdv+02DgtUsBYXqPqwzPRDb1E/d+cGTAScl6IffxvuXJp7vlrWWGcI0cc873Bg9Fl+P3M6EsIs5QShRu/oCSoadNcoUn7KT0YFkNtq3Vh8mhh3AYoBk4zHt0ufSvnF8slJnVDWIvnw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=moxa.com; dmarc=pass action=none header.from=moxa.com; dkim=pass header.d=moxa.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=moxa.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YRVd2eUuzMtB+96qfIGRAkQjXSg15Wl8LXHYRc8Unss=; b=PQoB7WjTgBtsRG3zV47WpK6rpyS3/hdJEK2zZ+GjWmmdwf/xCSYkhV+mt8OOIBzw30M+IeGiQav/TsfxQH5iYON+EaBpCM0k/h0KzFyy1jihEYyXgeAErOEfjga+Ig+P3sIl6ZRB5fvlXhUZX3/I12rBw1WJZAvqKikwymccGcI= Received: from HK2PR01MB3281.apcprd01.prod.exchangelabs.com (2603:1096:202:22::12) by HK2PR01MB3217.apcprd01.prod.exchangelabs.com (2603:1096:202:24::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3109.22; Mon, 22 Jun 2020 10:03:27 +0000 Received: from HK2PR01MB3281.apcprd01.prod.exchangelabs.com ([fe80::712b:170d:f873:68a3]) by HK2PR01MB3281.apcprd01.prod.exchangelabs.com ([fe80::712b:170d:f873:68a3%6]) with mapi id 15.20.3109.027; Mon, 22 Jun 2020 10:03:27 +0000 From: =?big5_tw?b?Sm9obnNvbiBDSCBDaGVuICizr6xMvrEp?= To: "linux-kernel@vger.kernel.org" CC: "linux-rtc@vger.kernel.org" , "linux-watchdog@vger.kernel.org" , Alessandro Zummo , Alexandre Belloni , Wim Van Sebroeck , "linux@roeck-us.net" , Lee Jones Subject: [PATCH 1/3] mfd: ds1374: Introduce Dallas/Maxim DS1374 MFD core driver Thread-Topic: [PATCH 1/3] mfd: ds1374: Introduce Dallas/Maxim DS1374 MFD core driver Thread-Index: AQHWSHlxmpPaA0sQIkC/QuBIC/9aPw== Date: Mon, 22 Jun 2020 10:03:27 +0000 Message-ID: Accept-Language: zh-TW, en-US Content-Language: zh-TW X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=moxa.com; x-originating-ip: [123.51.145.16] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: e7845bb2-10b9-42f2-6302-08d816938237 x-ms-traffictypediagnostic: HK2PR01MB3217: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5236; x-forefront-prvs: 0442E569BC x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: M6m7K9wn6nbD9Ev0E1+afhFmqJ+1juZBy6OT7Kaf3Ihp0AYBANBIFfoWn9GL+17c9OB2BlFkqlrSymMe80xhoT2fgjnj5jp0c+6HefPmXyBwhLrdGpBfwQI+rGpGxHNjRfYh0adrkHA+IGqkhfyDLx9VNkaPQM0XqTXW2QRQCK2fMTlKOhdc9f+kLsMoWajzBhcR018nbipT2XFDpP0Jz/qZ1RH1pYbbk2d5hkUFzvxgFRAbpXVSdkuHBDJ07QDFRFOuT8eIFj7fe/kCqb0NYsLdvc4ouo+Ad0lvJ6NU5gZZxxGW8RheyFx0ric3RieWhr4HiYOIYycinnRDgz/48Q== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HK2PR01MB3281.apcprd01.prod.exchangelabs.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(136003)(366004)(346002)(396003)(376002)(39850400004)(186003)(85182001)(6506007)(26005)(8936002)(6916009)(7696005)(8676002)(71200400001)(4326008)(83380400001)(316002)(2906002)(86362001)(33656002)(52536014)(9686003)(66946007)(76116006)(64756008)(55016002)(54906003)(5660300002)(478600001)(66446008)(66556008)(66476007);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata: OWPyVmRYqOsF3pcLAjHhu4Mmx59L6qSzbIukG3IKvX5bftu+WsdQgyfhVRoe9D4kXMUCAKPhxJpEh8shHjE4oHo8wHFmZ9AnLQ3+OYOr1c7oylqMuubmCwscRFcy9uD8j6T8xx86BmMfl8P3vfNNRH3DzxRvAk4jUbs8DWyphX3vJbiuDtoE97zBWgCTQofRjei6CBshtks6pSaRqeMqS+qxCm1tYj8yr4KsMdNUFPKNzripndXlv6YR/jMIlCmNlEXaZM7PuDm2BZrvEIp5GqLz3GqNKQC6140oSF7TnEL/OgT5oOML4N23JoaXIDj6idxbA3y1xjMDK3X3AK6LnuW2/P2WoPCCrkW8ROSuOfdmk7r3lXHlWsEry8mPgoTAKhMAshNK7CJptLo4wV0sRyCCCAty0BRf+AQ/67sR4lHRV87D5304t+Ldi7oKNOdg4zPjZ9JWZ4JyuTYjDK6/cVxK1fD8jK+yAx1uW2iNwfI= x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: moxa.com X-MS-Exchange-CrossTenant-Network-Message-Id: e7845bb2-10b9-42f2-6302-08d816938237 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Jun 2020 10:03:27.1967 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 5571c7d4-286b-47f6-9dd5-0aa688773c8e X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: GWhYuFitC/YwWEvIVaLm0TZxPYiaA85rMPbvQDZong6NavTLpuLsLyQzYYMcjm/l3R9zNDJHWcojzYR2ZyjN4Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR01MB3217 Sender: linux-watchdog-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org Dallas/Maxim DS1374 is a counter designed to continuously count time in seconds. It provides an I2C interface to the host to access RTC clock or Alarm/Watchdog timer. Add MFD Core driver, supporting the I2C communication to RTC and Watchdog devices. Signed-off-by: Johnson Chen Reported-by: kernel test robot --- drivers/mfd/Kconfig | 11 +++++ drivers/mfd/Makefile | 2 + drivers/mfd/ds1374.c | 101 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+) create mode 100644 drivers/mfd/ds1374.c diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 687e9c848053..d16031f4b487 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -1980,6 +1980,17 @@ config MFD_STM32_LPTIMER To compile this driver as a module, choose M here: the module will be called stm32-lptimer. +config MFD_DS1374 + tristate "Support for Dallas/Maxim DS1374" + depends on I2C + select MFD_CORE + help + Say yes here to add support for Dallas/Maxim DS1374 Semiconductor. + This driver provides RTC and watchdog. + + This driver can also be built as a module. If so, module will be + called ds1374. + config MFD_STM32_TIMERS tristate "Support for STM32 Timers" depends on (ARCH_STM32 && OF) || COMPILE_TEST diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index bea2be419822..a6463dd4aa33 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -243,6 +243,8 @@ obj-$(CONFIG_INTEL_SOC_PMIC_CHTWC) += intel_soc_pmic_chtwc.o obj-$(CONFIG_INTEL_SOC_PMIC_CHTDC_TI) += intel_soc_pmic_chtdc_ti.o mt6397-objs := mt6397-core.o mt6397-irq.o obj-$(CONFIG_MFD_MT6397) += mt6397.o +obj-$(CONFIG_MFD_DS1374) += ds1374.o + obj-$(CONFIG_INTEL_SOC_PMIC_MRFLD) += intel_soc_pmic_mrfld.o obj-$(CONFIG_MFD_ALTERA_A10SR) += altera-a10sr.o diff --git a/drivers/mfd/ds1374.c b/drivers/mfd/ds1374.c new file mode 100644 index 000000000000..6e9041aba5d2 --- /dev/null +++ b/drivers/mfd/ds1374.c @@ -0,0 +1,101 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Mamim/Dallas DS1374 MFD Core Driver. + * + * Copyright (C) 2020 Johnson Chen + */ + +#include +#include +#include +#include +#include + + +static struct mfd_cell ds1374_cell[] = { + { .name = "ds1374_rtc", }, + { .name = "ds1374_wdt", }, +}; + +static int ds1374_probe(struct i2c_client *client, + const struct i2c_device_id *id) +{ + int ret; + + ret = i2c_check_functionality(client->adapter, + I2C_FUNC_SMBUS_BYTE_DATA | + I2C_FUNC_SMBUS_WORD_DATA | + I2C_FUNC_SMBUS_BYTE); + if (!ret) + return -ENODEV; + + ret = devm_mfd_add_devices(&client->dev, 0, ds1374_cell, + ARRAY_SIZE(ds1374_cell), NULL, 0, NULL); + + if (ret < 0) { + dev_err(&client->dev, "failed to add DS1374 sub-devices\n"); + return ret; + } + + return 0; +} + +static int ds1374_remove(struct i2c_client *client) +{ + mfd_remove_devices(&client->dev); + + return 0; +} + +#ifdef CONFIG_PM_SLEEP +static int ds1374_suspend(struct device *dev) +{ + struct i2c_client *client = to_i2c_client(dev); + + if (client->irq > 0 && device_may_wakeup(&client->dev)) + enable_irq_wake(client->irq); + return 0; +} + +static int ds1374_resume(struct device *dev) +{ + struct i2c_client *client = to_i2c_client(dev); + + if (client->irq > 0 && device_may_wakeup(&client->dev)) + disable_irq_wake(client->irq); + return 0; +} +#endif + +static const struct i2c_device_id ds1374_id[] = { + { "ds1374", 0 }, + { } +}; +MODULE_DEVICE_TABLE(i2c, ds1374_id); + +#ifdef CONFIG_OF +static const struct of_device_id ds1374_of_match[] = { + { .compatible = "dallas,ds1374" }, + { } +}; +MODULE_DEVICE_TABLE(of, ds1374_of_match); +#endif + +static SIMPLE_DEV_PM_OPS(ds1374_pm, ds1374_suspend, ds1374_resume); + +static struct i2c_driver ds1374_driver = { + .driver = { + .name = "ds1374", + .of_match_table = of_match_ptr(ds1374_of_match), + .pm = &ds1374_pm, + }, + .probe = ds1374_probe, + .remove = ds1374_remove, + .id_table = ds1374_id, +}; + +module_i2c_driver(ds1374_driver); + +MODULE_DESCRIPTION("Dallas/Maxim DS1374 MFD Core Driver"); +MODULE_AUTHOR("Johnson Chen "); +MODULE_LICENSE("GPL"); From patchwork Mon Jun 22 10:03:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?Sm9obnNvbiBDSCBDaGVuICjpmbPmmK3li7Mp?= X-Patchwork-Id: 11617401 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8AA2C13A0 for ; Mon, 22 Jun 2020 10:03:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6473E20706 for ; Mon, 22 Jun 2020 10:03:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=moxa.com header.i=@moxa.com header.b="JlkvBRBB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728129AbgFVKDl (ORCPT ); Mon, 22 Jun 2020 06:03:41 -0400 Received: from mail-eopbgr1320044.outbound.protection.outlook.com ([40.107.132.44]:38144 "EHLO APC01-PU1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726942AbgFVKDk (ORCPT ); Mon, 22 Jun 2020 06:03:40 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P+cjCkZ9C03a3nk/acH//PAwS7khvGipZrLrlFat3HTj52iH8xDTAMZH/gDtoQV7gThtZ7G893Jl904R0fEVezsSMlU+CwA8vRWV42vw2n4O0g58cNgFNDnzB+bO3z5kaOT3X+6uhIALHjm3XXePoLtacOc8qUm0qxZojiT+XpCt4VYxgsAIw8fsYJrJ8oeiHAeh5kARAw8cPdUpKWxVPTNcQyNGRu1XoAKHxZaMCEKqh+sGrYKvJNiPkZGFv+DK/8QjvYLxhDagBDk5AyQM+f7vYn4rVRzVlYibw61VkkrgMwtduEhmj8W+ws3YLPewzyGP59Hi+zf7MS4KVJ8o/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=C7Yow9m3wuoT3s2vPHaij8M5L7pJY583nocBG7pru5U=; b=RMeUL4TA37IdsTv07qMZ3JjnbUj0MXvLEmPKJgQ1XyeaFoYcM67T3HV/rHgwZUtcSTIi5Z14b1q3WHZ4rhkm4PtpMED6z0jWpXrU2Fn03Y0F8T3Ag+bhqLy52qO12k6v6xXY/jvymfJDrqUF7H9njNXvPEunaBPWXLOc7RkWq6zQzhxHXevJ0CfLg0zRGeqAP+o//rHqBALLW6JPuuEtDYyujL31p8Z63igv9MnsDsntuaGPKbE+ELv2NdJzkBbXALtGdb7WjW+5nsCGjd/zBa2F+I1dAZvi79Vm9IkiPVRzM4mDMavI/4HCip59lJY5IxnqA1eioyOFlB8d2cOWJQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=moxa.com; dmarc=pass action=none header.from=moxa.com; dkim=pass header.d=moxa.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=moxa.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=C7Yow9m3wuoT3s2vPHaij8M5L7pJY583nocBG7pru5U=; b=JlkvBRBBdUBYY5DDSj8imlfuVn5Wzbnhd3O4p0FbFOctOB/5alnHXt7cVTZd2JQAnxYbmtkVKXnQxttck1AVYngnHbB4lEYBb3cBTnHAxKCThpMAM7z5+pnkGxlDpRSHREGy3pAS3JDYgcbIYG31rilCH/Jim/rmGJ13Qsda5uI= Received: from HK2PR01MB3281.apcprd01.prod.exchangelabs.com (2603:1096:202:22::12) by HK2PR01MB3217.apcprd01.prod.exchangelabs.com (2603:1096:202:24::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3109.22; Mon, 22 Jun 2020 10:03:30 +0000 Received: from HK2PR01MB3281.apcprd01.prod.exchangelabs.com ([fe80::712b:170d:f873:68a3]) by HK2PR01MB3281.apcprd01.prod.exchangelabs.com ([fe80::712b:170d:f873:68a3%6]) with mapi id 15.20.3109.027; Mon, 22 Jun 2020 10:03:29 +0000 From: =?big5_tw?b?Sm9obnNvbiBDSCBDaGVuICizr6xMvrEp?= To: "linux-kernel@vger.kernel.org" CC: "linux-rtc@vger.kernel.org" , "linux-watchdog@vger.kernel.org" , Alessandro Zummo , Alexandre Belloni , Wim Van Sebroeck , "linux@roeck-us.net" , Lee Jones Subject: [PATCH 2/3] rtc: rtc-ds1374: Move out Watchdog function and I2C client Thread-Topic: [PATCH 2/3] rtc: rtc-ds1374: Move out Watchdog function and I2C client Thread-Index: AQHWSHmg3EA8AI+Xik+Rhl82TcLPCA== Date: Mon, 22 Jun 2020 10:03:28 +0000 Message-ID: Accept-Language: zh-TW, en-US Content-Language: zh-TW X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=moxa.com; x-originating-ip: [123.51.145.16] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 180a7668-0019-429c-1abf-08d81693834b x-ms-traffictypediagnostic: HK2PR01MB3217: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5236; x-forefront-prvs: 0442E569BC x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: YsvzzVsrlg/v1BYXcK4NsXKDV110BKYZDDMHV6rAV24PptQ8vJCPzAOdD4V2YBPD0LYyI9ojEIgv6b2i/XsZ6pqHD1t47iW3GY4v6gmrZbsQutAcJSlDX5c4Wcdi/qEpujR/yErRN9CfBErfuIwLk7orc3+TytwXc4lyx+HIGePptrLLj+sq2OlQronE2s3tYK95SKxzowJ8rCeNmgDjwKd8sqB/5AnibAJ8j1ILnV9J2G4Vo3ag+78yhrSofpLFpS+sHsrypO5Ae2klb1NsVlq2fM5p9vVltlmEm8vZbhThvbxUDJD670ASINHi3/IoqNnhu3B0T9npLGnkT6dxWQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HK2PR01MB3281.apcprd01.prod.exchangelabs.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(136003)(366004)(346002)(396003)(376002)(39850400004)(186003)(85182001)(6506007)(26005)(8936002)(6916009)(7696005)(8676002)(71200400001)(4326008)(83380400001)(316002)(2906002)(86362001)(30864003)(33656002)(52536014)(9686003)(66946007)(76116006)(64756008)(55016002)(54906003)(5660300002)(478600001)(66446008)(66556008)(66476007);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata: eUu/862zdh2F/rdMoQAmMDdBkrVu5mwW7eglLJILu2GdMgDQW+4kkdoDRZCKYBhjc1Y+LxJk1dgd5LesmkaKsRS66XrjJMCdKf6up3sjEJ7Z4b73jIMP1VUIww2rkES6vA9Pqnz/1Ol1uXYspNIA5mqtGwMtpplPrR0s6zAfjD83d7SCwyaAHA8jpXdliVRhuCOR6zS7lblHglKMyeFSDS86NGszWFPUPX4g1wagVQjawgvwABko0IXzQvtaVWmNIDRT3kArMhzKhGymw7CZDQ53Tu1k2KkY5lSNAgsAM+kSr/FUcKL8Hbuu6EdRvIABsk5+X01wS7Da5zAVnId5l495xtpYwwHfCdmKigdc4iHd9RYslrVMlnIKVl6b7KibQ8tdvgDvzgivZlW7vcc+2Kkq36aJmqlXW+tptjwhPe19KMnFrdh27ok/QG+Eox8VCF/nRqAo+Au4mk38JSB7G0fBgmEaXb0GCEV6vcsMi2A= x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: moxa.com X-MS-Exchange-CrossTenant-Network-Message-Id: 180a7668-0019-429c-1abf-08d81693834b X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Jun 2020 10:03:28.9677 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 5571c7d4-286b-47f6-9dd5-0aa688773c8e X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 0gKfKWv6DHgTfMbqsmcDJsHac1hgzPtO5K/YstJjz0Aduyds/z9GN6Mk7gaj2+2tEZRSvJwhGNytW8eiREiDZA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR01MB3217 Sender: linux-watchdog-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org Move Watchdog function to ds1374_wdt.c which is in the Watchdog subsystem, and just keep RTC and Alarm function in rtc-ds1374.c. Besides, Move I2C client to ds1374.c which is in MFD subsystem. Signed-off-by: Johnson Chen --- drivers/rtc/Kconfig | 9 +- drivers/rtc/rtc-ds1374.c | 458 +++++++-------------------------------- 2 files changed, 76 insertions(+), 391 deletions(-) diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index ec873f09c763..cc020fb7a2a9 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -271,6 +271,8 @@ config RTC_DRV_DS1307_CENTURY config RTC_DRV_DS1374 tristate "Dallas/Maxim DS1374" + depends on MFD_DS1374 + help If you say yes here you get support for Dallas Semiconductor DS1374 real-time clock chips. If an interrupt is associated @@ -279,13 +281,6 @@ config RTC_DRV_DS1374 This driver can also be built as a module. If so, the module will be called rtc-ds1374. -config RTC_DRV_DS1374_WDT - bool "Dallas/Maxim DS1374 watchdog timer" - depends on RTC_DRV_DS1374 - help - If you say Y here you will get support for the - watchdog timer in the Dallas Semiconductor DS1374 - real-time clock chips. config RTC_DRV_DS1672 tristate "Dallas/Maxim DS1672" diff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c index 9c51a12cf70f..d8ff0fbba52c 100644 --- a/drivers/rtc/rtc-ds1374.c +++ b/drivers/rtc/rtc-ds1374.c @@ -1,17 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0 /* * RTC client/driver for the Maxim/Dallas DS1374 Real-Time Clock over I2C * * Based on code by Randy Vinson , * which was based on the m41t00.c by Mark Greer . * + * Copyright (C) 2020 Johnson Chen * Copyright (C) 2014 Rose Technology * Copyright (C) 2006-2007 Freescale Semiconductor - * - * 2005 (c) MontaVista Software, Inc. This file is licensed under - * the terms of the GNU General Public License version 2. This program - * is licensed "as is" without any warranty of any kind, whether express - * or implied. + * Copyright (C) 2005 MontaVista Software, Inc. */ + /* * It would be more efficient to use i2c msgs/i2c_transfer directly but, as * recommended in .../Documentation/i2c/writing-clients.rst section @@ -25,17 +24,10 @@ #include #include #include -#include #include -#include -#include -#ifdef CONFIG_RTC_DRV_DS1374_WDT -#include -#include -#include -#include -#include -#endif +#include + +#define DEVNAME "ds1374_rtc" #define DS1374_REG_TOD0 0x00 /* Time of Day */ #define DS1374_REG_TOD1 0x01 @@ -53,21 +45,7 @@ #define DS1374_REG_SR_AF 0x01 /* Alarm Flag */ #define DS1374_REG_TCR 0x09 /* Trickle Charge */ -static const struct i2c_device_id ds1374_id[] = { - { "ds1374", 0 }, - { } -}; -MODULE_DEVICE_TABLE(i2c, ds1374_id); - -#ifdef CONFIG_OF -static const struct of_device_id ds1374_of_match[] = { - { .compatible = "dallas,ds1374" }, - { } -}; -MODULE_DEVICE_TABLE(of, ds1374_of_match); -#endif - -struct ds1374 { +struct ds1374_rtc { struct i2c_client *client; struct rtc_device *rtc; struct work_struct work; @@ -80,8 +58,6 @@ struct ds1374 { int exiting; }; -static struct i2c_driver ds1374_driver; - static int ds1374_read_rtc(struct i2c_client *client, u32 *time, int reg, int nbytes) { @@ -158,7 +134,7 @@ static int ds1374_check_rtc_status(struct i2c_client *client) static int ds1374_read_time(struct device *dev, struct rtc_time *time) { - struct i2c_client *client = to_i2c_client(dev); + struct i2c_client *client = to_i2c_client(dev->parent); u32 itime; int ret; @@ -171,21 +147,21 @@ static int ds1374_read_time(struct device *dev, struct rtc_time *time) static int ds1374_set_time(struct device *dev, struct rtc_time *time) { - struct i2c_client *client = to_i2c_client(dev); + struct i2c_client *client = to_i2c_client(dev->parent); unsigned long itime = rtc_tm_to_time64(time); return ds1374_write_rtc(client, itime, DS1374_REG_TOD0, 4); } -#ifndef CONFIG_RTC_DRV_DS1374_WDT +#ifndef CONFIG_DS1374_WATCHDOG /* The ds1374 has a decrementer for an alarm, rather than a comparator. * If the time of day is changed, then the alarm will need to be * reset. */ static int ds1374_read_alarm(struct device *dev, struct rtc_wkalrm *alarm) { - struct i2c_client *client = to_i2c_client(dev); - struct ds1374 *ds1374 = i2c_get_clientdata(client); + struct i2c_client *client = to_i2c_client(dev->parent); + struct ds1374_rtc *drv_data = dev->driver_data; u32 now, cur_alarm; int cr, sr; int ret = 0; @@ -193,7 +169,7 @@ static int ds1374_read_alarm(struct device *dev, struct rtc_wkalrm *alarm) if (client->irq <= 0) return -EINVAL; - mutex_lock(&ds1374->mutex); + mutex_lock(&drv_data->mutex); cr = ret = i2c_smbus_read_byte_data(client, DS1374_REG_CR); if (ret < 0) @@ -216,14 +192,14 @@ static int ds1374_read_alarm(struct device *dev, struct rtc_wkalrm *alarm) alarm->pending = !!(sr & DS1374_REG_SR_AF); out: - mutex_unlock(&ds1374->mutex); + mutex_unlock(&drv_data->mutex); return ret; } static int ds1374_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) { - struct i2c_client *client = to_i2c_client(dev); - struct ds1374 *ds1374 = i2c_get_clientdata(client); + struct i2c_client *client = to_i2c_client(dev->parent); + struct ds1374_rtc *drv_data = dev->driver_data; struct rtc_time now; unsigned long new_alarm, itime; int cr; @@ -250,7 +226,7 @@ static int ds1374_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) else new_alarm -= itime; - mutex_lock(&ds1374->mutex); + mutex_lock(&drv_data->mutex); ret = cr = i2c_smbus_read_byte_data(client, DS1374_REG_CR); if (ret < 0) @@ -276,28 +252,29 @@ static int ds1374_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) } out: - mutex_unlock(&ds1374->mutex); + mutex_unlock(&drv_data->mutex); return ret; } #endif static irqreturn_t ds1374_irq(int irq, void *dev_id) { - struct i2c_client *client = dev_id; - struct ds1374 *ds1374 = i2c_get_clientdata(client); + struct platform_device *pdev = dev_id; + struct ds1374_rtc *drv_data = platform_get_drvdata(pdev); disable_irq_nosync(irq); - schedule_work(&ds1374->work); + schedule_work(&drv_data->work); return IRQ_HANDLED; } static void ds1374_work(struct work_struct *work) { - struct ds1374 *ds1374 = container_of(work, struct ds1374, work); - struct i2c_client *client = ds1374->client; + struct ds1374_rtc *drv_data = container_of(work, + struct ds1374_rtc, work); + struct i2c_client *client = drv_data->client; int stat, control; - mutex_lock(&ds1374->mutex); + mutex_lock(&drv_data->mutex); stat = i2c_smbus_read_byte_data(client, DS1374_REG_SR); if (stat < 0) @@ -314,24 +291,24 @@ static void ds1374_work(struct work_struct *work) control &= ~(DS1374_REG_CR_WACE | DS1374_REG_CR_AIE); i2c_smbus_write_byte_data(client, DS1374_REG_CR, control); - rtc_update_irq(ds1374->rtc, 1, RTC_AF | RTC_IRQF); + rtc_update_irq(drv_data->rtc, 1, RTC_AF | RTC_IRQF); } out: - if (!ds1374->exiting) + if (!drv_data->exiting) enable_irq(client->irq); unlock: - mutex_unlock(&ds1374->mutex); + mutex_unlock(&drv_data->mutex); } -#ifndef CONFIG_RTC_DRV_DS1374_WDT +#ifndef CONFIG_DS1374_WATCHDOG static int ds1374_alarm_irq_enable(struct device *dev, unsigned int enabled) { - struct i2c_client *client = to_i2c_client(dev); - struct ds1374 *ds1374 = i2c_get_clientdata(client); + struct i2c_client *client = to_i2c_client(dev->parent); + struct ds1374_rtc *drv_data = dev->driver_data; int ret; - mutex_lock(&ds1374->mutex); + mutex_lock(&drv_data->mutex); ret = i2c_smbus_read_byte_data(client, DS1374_REG_CR); if (ret < 0) @@ -346,383 +323,96 @@ static int ds1374_alarm_irq_enable(struct device *dev, unsigned int enabled) ret = i2c_smbus_write_byte_data(client, DS1374_REG_CR, ret); out: - mutex_unlock(&ds1374->mutex); + mutex_unlock(&drv_data->mutex); return ret; } #endif static const struct rtc_class_ops ds1374_rtc_ops = { - .read_time = ds1374_read_time, - .set_time = ds1374_set_time, -#ifndef CONFIG_RTC_DRV_DS1374_WDT - .read_alarm = ds1374_read_alarm, - .set_alarm = ds1374_set_alarm, + .read_time = ds1374_read_time, + .set_time = ds1374_set_time, +#ifndef CONFIG_DS1374_WATCHDOG + .read_alarm = ds1374_read_alarm, + .set_alarm = ds1374_set_alarm, .alarm_irq_enable = ds1374_alarm_irq_enable, #endif }; -#ifdef CONFIG_RTC_DRV_DS1374_WDT -/* - ***************************************************************************** - * - * Watchdog Driver - * - ***************************************************************************** - */ -static struct i2c_client *save_client; -/* Default margin */ -#define WD_TIMO 131762 - -#define DRV_NAME "DS1374 Watchdog" - -static int wdt_margin = WD_TIMO; -static unsigned long wdt_is_open; -module_param(wdt_margin, int, 0); -MODULE_PARM_DESC(wdt_margin, "Watchdog timeout in seconds (default 32s)"); - -static const struct watchdog_info ds1374_wdt_info = { - .identity = "DS1374 WTD", - .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | - WDIOF_MAGICCLOSE, -}; - -static int ds1374_wdt_settimeout(unsigned int timeout) +static int ds1374_rtc_probe(struct platform_device *pdev) { - int ret = -ENOIOCTLCMD; - int cr; - - ret = cr = i2c_smbus_read_byte_data(save_client, DS1374_REG_CR); - if (ret < 0) - goto out; - - /* Disable any existing watchdog/alarm before setting the new one */ - cr &= ~DS1374_REG_CR_WACE; - - ret = i2c_smbus_write_byte_data(save_client, DS1374_REG_CR, cr); - if (ret < 0) - goto out; - - /* Set new watchdog time */ - ret = ds1374_write_rtc(save_client, timeout, DS1374_REG_WDALM0, 3); - if (ret) { - pr_info("couldn't set new watchdog time\n"); - goto out; - } - - /* Enable watchdog timer */ - cr |= DS1374_REG_CR_WACE | DS1374_REG_CR_WDALM; - cr &= ~DS1374_REG_CR_AIE; - - ret = i2c_smbus_write_byte_data(save_client, DS1374_REG_CR, cr); - if (ret < 0) - goto out; - - return 0; -out: - return ret; -} - - -/* - * Reload the watchdog timer. (ie, pat the watchdog) - */ -static void ds1374_wdt_ping(void) -{ - u32 val; - int ret = 0; - - ret = ds1374_read_rtc(save_client, &val, DS1374_REG_WDALM0, 3); - if (ret) - pr_info("WD TICK FAIL!!!!!!!!!! %i\n", ret); -} - -static void ds1374_wdt_disable(void) -{ - int cr; - - cr = i2c_smbus_read_byte_data(save_client, DS1374_REG_CR); - /* Disable watchdog timer */ - cr &= ~DS1374_REG_CR_WACE; - - i2c_smbus_write_byte_data(save_client, DS1374_REG_CR, cr); -} - -/* - * Watchdog device is opened, and watchdog starts running. - */ -static int ds1374_wdt_open(struct inode *inode, struct file *file) -{ - struct ds1374 *ds1374 = i2c_get_clientdata(save_client); - - if (MINOR(inode->i_rdev) == WATCHDOG_MINOR) { - mutex_lock(&ds1374->mutex); - if (test_and_set_bit(0, &wdt_is_open)) { - mutex_unlock(&ds1374->mutex); - return -EBUSY; - } - /* - * Activate - */ - wdt_is_open = 1; - mutex_unlock(&ds1374->mutex); - return stream_open(inode, file); - } - return -ENODEV; -} - -/* - * Close the watchdog device. - */ -static int ds1374_wdt_release(struct inode *inode, struct file *file) -{ - if (MINOR(inode->i_rdev) == WATCHDOG_MINOR) - clear_bit(0, &wdt_is_open); - - return 0; -} - -/* - * Pat the watchdog whenever device is written to. - */ -static ssize_t ds1374_wdt_write(struct file *file, const char __user *data, - size_t len, loff_t *ppos) -{ - if (len) { - ds1374_wdt_ping(); - return 1; - } - return 0; -} - -static ssize_t ds1374_wdt_read(struct file *file, char __user *data, - size_t len, loff_t *ppos) -{ - return 0; -} - -/* - * Handle commands from user-space. - */ -static long ds1374_wdt_ioctl(struct file *file, unsigned int cmd, - unsigned long arg) -{ - int new_margin, options; - - switch (cmd) { - case WDIOC_GETSUPPORT: - return copy_to_user((struct watchdog_info __user *)arg, - &ds1374_wdt_info, sizeof(ds1374_wdt_info)) ? -EFAULT : 0; - - case WDIOC_GETSTATUS: - case WDIOC_GETBOOTSTATUS: - return put_user(0, (int __user *)arg); - case WDIOC_KEEPALIVE: - ds1374_wdt_ping(); - return 0; - case WDIOC_SETTIMEOUT: - if (get_user(new_margin, (int __user *)arg)) - return -EFAULT; - - /* the hardware's tick rate is 4096 Hz, so - * the counter value needs to be scaled accordingly - */ - new_margin <<= 12; - if (new_margin < 1 || new_margin > 16777216) - return -EINVAL; - - wdt_margin = new_margin; - ds1374_wdt_settimeout(new_margin); - ds1374_wdt_ping(); - /* fallthrough */ - case WDIOC_GETTIMEOUT: - /* when returning ... inverse is true */ - return put_user((wdt_margin >> 12), (int __user *)arg); - case WDIOC_SETOPTIONS: - if (copy_from_user(&options, (int __user *)arg, sizeof(int))) - return -EFAULT; - - if (options & WDIOS_DISABLECARD) { - pr_info("disable watchdog\n"); - ds1374_wdt_disable(); - return 0; - } - - if (options & WDIOS_ENABLECARD) { - pr_info("enable watchdog\n"); - ds1374_wdt_settimeout(wdt_margin); - ds1374_wdt_ping(); - return 0; - } - return -EINVAL; - } - return -ENOTTY; -} - -static long ds1374_wdt_unlocked_ioctl(struct file *file, unsigned int cmd, - unsigned long arg) -{ - int ret; - struct ds1374 *ds1374 = i2c_get_clientdata(save_client); - - mutex_lock(&ds1374->mutex); - ret = ds1374_wdt_ioctl(file, cmd, arg); - mutex_unlock(&ds1374->mutex); - - return ret; -} - -static int ds1374_wdt_notify_sys(struct notifier_block *this, - unsigned long code, void *unused) -{ - if (code == SYS_DOWN || code == SYS_HALT) - /* Disable Watchdog */ - ds1374_wdt_disable(); - return NOTIFY_DONE; -} - -static const struct file_operations ds1374_wdt_fops = { - .owner = THIS_MODULE, - .read = ds1374_wdt_read, - .unlocked_ioctl = ds1374_wdt_unlocked_ioctl, - .compat_ioctl = compat_ptr_ioctl, - .write = ds1374_wdt_write, - .open = ds1374_wdt_open, - .release = ds1374_wdt_release, - .llseek = no_llseek, -}; - -static struct miscdevice ds1374_miscdev = { - .minor = WATCHDOG_MINOR, - .name = "watchdog", - .fops = &ds1374_wdt_fops, -}; - -static struct notifier_block ds1374_wdt_notifier = { - .notifier_call = ds1374_wdt_notify_sys, -}; - -#endif /*CONFIG_RTC_DRV_DS1374_WDT*/ -/* - ***************************************************************************** - * - * Driver Interface - * - ***************************************************************************** - */ -static int ds1374_probe(struct i2c_client *client, - const struct i2c_device_id *id) -{ - struct ds1374 *ds1374; + struct ds1374_rtc *drv_data; + struct i2c_client *client = to_i2c_client(pdev->dev.parent); int ret; - ds1374 = devm_kzalloc(&client->dev, sizeof(struct ds1374), GFP_KERNEL); - if (!ds1374) + drv_data = devm_kzalloc(&pdev->dev, sizeof(struct ds1374_rtc), + GFP_KERNEL); + if (!drv_data) return -ENOMEM; - ds1374->rtc = devm_rtc_allocate_device(&client->dev); - if (IS_ERR(ds1374->rtc)) - return PTR_ERR(ds1374->rtc); + drv_data->rtc = devm_rtc_allocate_device(&pdev->dev); + if (IS_ERR(drv_data->rtc)) + return PTR_ERR(drv_data->rtc); - ds1374->client = client; - i2c_set_clientdata(client, ds1374); + drv_data->client = client; - INIT_WORK(&ds1374->work, ds1374_work); - mutex_init(&ds1374->mutex); + INIT_WORK(&drv_data->work, ds1374_work); + mutex_init(&drv_data->mutex); ret = ds1374_check_rtc_status(client); if (ret) return ret; if (client->irq > 0) { - ret = devm_request_irq(&client->dev, client->irq, ds1374_irq, 0, - "ds1374", client); + ret = devm_request_irq(&pdev->dev, client->irq, ds1374_irq, 0, + "ds1374_rtc", pdev); if (ret) { - dev_err(&client->dev, "unable to request IRQ\n"); + dev_err(&pdev->dev, "unable to request IRQ\n"); return ret; } - device_set_wakeup_capable(&client->dev, 1); + device_set_wakeup_capable(&pdev->dev, 1); } - ds1374->rtc->ops = &ds1374_rtc_ops; - ds1374->rtc->range_max = U32_MAX; + drv_data->rtc->ops = &ds1374_rtc_ops; + drv_data->rtc->range_max = U32_MAX; + platform_set_drvdata(pdev, drv_data); - ret = rtc_register_device(ds1374->rtc); + ret = rtc_register_device(drv_data->rtc); if (ret) return ret; -#ifdef CONFIG_RTC_DRV_DS1374_WDT - save_client = client; - ret = misc_register(&ds1374_miscdev); - if (ret) - return ret; - ret = register_reboot_notifier(&ds1374_wdt_notifier); - if (ret) { - misc_deregister(&ds1374_miscdev); - return ret; - } - ds1374_wdt_settimeout(131072); -#endif - return 0; } -static int ds1374_remove(struct i2c_client *client) +static int ds1374_rtc_remove(struct platform_device *pdev) { - struct ds1374 *ds1374 = i2c_get_clientdata(client); -#ifdef CONFIG_RTC_DRV_DS1374_WDT - misc_deregister(&ds1374_miscdev); - ds1374_miscdev.parent = NULL; - unregister_reboot_notifier(&ds1374_wdt_notifier); -#endif + struct ds1374_rtc *drv_data = platform_get_drvdata(pdev); + struct i2c_client *client = to_i2c_client(pdev->dev.parent); if (client->irq > 0) { - mutex_lock(&ds1374->mutex); - ds1374->exiting = 1; - mutex_unlock(&ds1374->mutex); + mutex_lock(&drv_data->mutex); + drv_data->exiting = 1; + mutex_unlock(&drv_data->mutex); devm_free_irq(&client->dev, client->irq, client); - cancel_work_sync(&ds1374->work); + cancel_work_sync(&drv_data->work); } return 0; } -#ifdef CONFIG_PM_SLEEP -static int ds1374_suspend(struct device *dev) -{ - struct i2c_client *client = to_i2c_client(dev); - - if (client->irq > 0 && device_may_wakeup(&client->dev)) - enable_irq_wake(client->irq); - return 0; -} - -static int ds1374_resume(struct device *dev) -{ - struct i2c_client *client = to_i2c_client(dev); - - if (client->irq > 0 && device_may_wakeup(&client->dev)) - disable_irq_wake(client->irq); - return 0; -} -#endif - -static SIMPLE_DEV_PM_OPS(ds1374_pm, ds1374_suspend, ds1374_resume); - -static struct i2c_driver ds1374_driver = { - .driver = { - .name = "rtc-ds1374", - .of_match_table = of_match_ptr(ds1374_of_match), - .pm = &ds1374_pm, +static struct platform_driver ds1374_rtc = { + .driver = { + .owner = THIS_MODULE, + .name = DEVNAME, }, - .probe = ds1374_probe, - .remove = ds1374_remove, - .id_table = ds1374_id, + .probe = ds1374_rtc_probe, + .remove = ds1374_rtc_remove, }; -module_i2c_driver(ds1374_driver); +module_platform_driver(ds1374_rtc); MODULE_AUTHOR("Scott Wood "); MODULE_DESCRIPTION("Maxim/Dallas DS1374 RTC Driver"); MODULE_LICENSE("GPL"); +MODULE_ALIAS("Platform:ds1374_rtc"); From patchwork Mon Jun 22 10:03:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?Sm9obnNvbiBDSCBDaGVuICjpmbPmmK3li7Mp?= X-Patchwork-Id: 11617403 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 647F513A0 for ; Mon, 22 Jun 2020 10:03:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 38A4E20739 for ; Mon, 22 Jun 2020 10:03:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=moxa.com header.i=@moxa.com header.b="WDJ3VfRi" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728121AbgFVKDp (ORCPT ); Mon, 22 Jun 2020 06:03:45 -0400 Received: from mail-eopbgr1320044.outbound.protection.outlook.com ([40.107.132.44]:38144 "EHLO APC01-PU1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728128AbgFVKDo (ORCPT ); Mon, 22 Jun 2020 06:03:44 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lkPKKTsvv/oePcoYQ5nBGe3fujO08DOW/kW1pz7ea8Jag1fBADQJ0BN/kfJBQLVNMKvgneF3fPrjAnu8Io4H1GeRWzLGLZx+kZNG20spSvyet7hccnApIBMADnXeDeeDbBz2NLHMaCXelQZLbZNVnuXRDVVrOobkh+XaY1mDFXufFIggIC8WHPZNTOOEZ2f53lrNtEmoZvJffruBkPfN08B6VFfdwAicDZZbCW79+ILm6OAVOvMcMK0EiVuvTGJhpOUhp31dpYYdYd4nAKEX+b1WqRFLZOsi7qu8vnW/HdZ0YaYb1Xn4fzKgmn8JHvKD+q3i88twiE5OApmTO/SvOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WTwPjxfqZ1N5hs9Ccg1wgj0VCEOW/gJof1dCiMQt7Do=; b=lSe49dKt4+163lLoSEAph7RWwvrU/ID5k7CiqfCIVrMB5QVTaVhclp9h0H+xf6RQLocfDRuxHpLLH0OLmWAQBWawKmGth4SIt9u1emBsYCrzhG033znJRZF+h/SyLunIgymfDtZa+s9bb9EOgTHTutm4iNwuWbTptrE4e+duWgt6WuJFQz5/enai+0jkorJQUpJGV9pG2TcIW8PC3EcIDZFDwTz0Ucwp4MSrs4tIA9YFc3n61R7+K8UPpF3ypiSbRPxPfXSpglMn6/eCd7pmij16XlaPSc4VTdF7X3RP9nwJkVyfAh1Bs3dnhOO9tF/xpvVKWzIczSIE+1j8ZllDxA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=moxa.com; dmarc=pass action=none header.from=moxa.com; dkim=pass header.d=moxa.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=moxa.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WTwPjxfqZ1N5hs9Ccg1wgj0VCEOW/gJof1dCiMQt7Do=; b=WDJ3VfRiB+5QRVD5DikanjJITG4Mbp1BezDrANXJ0xsBYGW28HlxVvDH8mTTrRpfMhIYkviL8TKFASx16IM9vBposyhyDHl11GPTei07ZleVSBcDT6snJnMhuHf4l/bcSMq2VjhgDCeJ7uydzX2JcOkw7iLFFP7FS0/zOalFikM= Received: from HK2PR01MB3281.apcprd01.prod.exchangelabs.com (2603:1096:202:22::12) by HK2PR01MB3217.apcprd01.prod.exchangelabs.com (2603:1096:202:24::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3109.22; Mon, 22 Jun 2020 10:03:30 +0000 Received: from HK2PR01MB3281.apcprd01.prod.exchangelabs.com ([fe80::712b:170d:f873:68a3]) by HK2PR01MB3281.apcprd01.prod.exchangelabs.com ([fe80::712b:170d:f873:68a3%6]) with mapi id 15.20.3109.027; Mon, 22 Jun 2020 10:03:30 +0000 From: =?big5_tw?b?Sm9obnNvbiBDSCBDaGVuICizr6xMvrEp?= To: "linux-kernel@vger.kernel.org" CC: "linux-rtc@vger.kernel.org" , "linux-watchdog@vger.kernel.org" , Alessandro Zummo , Alexandre Belloni , Wim Van Sebroeck , "linux@roeck-us.net" , Lee Jones Subject: [PATCH 3/3] watchdog: ds1374_wdt: Introduce Dallas/Maxim DS1374 Watchdog driver Thread-Topic: [PATCH 3/3] watchdog: ds1374_wdt: Introduce Dallas/Maxim DS1374 Watchdog driver Thread-Index: AQHWSHna/474gwN7IEac2d+5BLEYJQ== Date: Mon, 22 Jun 2020 10:03:29 +0000 Message-ID: Accept-Language: zh-TW, en-US Content-Language: zh-TW X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=moxa.com; x-originating-ip: [123.51.145.16] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 8014a703-7559-440b-40a3-08d816938448 x-ms-traffictypediagnostic: HK2PR01MB3217: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5236; x-forefront-prvs: 0442E569BC x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: rE/KxogpBbkQ9vT+ifcYTzwVn2VN+mg/TeEMAd5xeEv9k8DnXIGKgBXyMk7zMDYve3yN54aXXnmwV+Q2inuo8bC29nyfjIWQ7CxsNGiJeSbBAUhZUUV7XRInNEheWDAU9OyJGU7BLM9pc8zhMyHcd0Io5c2llCswOadbL2uybhKUZ51oFjex0ePiy8U1p1FoNIa5w7Cp3WgbI2Qrz+0WzrDx49cwtCEFvynNkqg2WU3v/izUb3p37Q3QgjTSxCykWdb2CCBPneQswHZQ9ASKA++ERx3CJrvzKFtY5zXqy9xi/8Z5VhbvtfopEEIC396h9SajpgiF9w9IPNVZ2dyg/A== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HK2PR01MB3281.apcprd01.prod.exchangelabs.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(136003)(366004)(346002)(396003)(376002)(39850400004)(186003)(85182001)(6506007)(26005)(8936002)(6916009)(7696005)(8676002)(71200400001)(4326008)(83380400001)(316002)(2906002)(86362001)(33656002)(52536014)(9686003)(66946007)(76116006)(64756008)(55016002)(54906003)(5660300002)(478600001)(66446008)(66556008)(66476007);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata: MhBI/XuRK71sqMhpksETLyhhdT6qcp1+TfYRb5VtoJF1Ojrnrsh3JMHBOLDoy6TOukOmHzpK6XdnScGwD+ld5IeRWdoE8+r+1dtpcDBLPau9msNptwJHLPnHPqn91+0BayoJEsU7H6YDw37WdnM53abZjAdh5NmLnYQuvPKMCkpuOq9eHovojCOHYDmYbIzYNtaMmx2xpSqZ9nQgTY7Sa1Rd3fXcOr6//Hgr1lhrE+8CHWjg7p9dnFr/ofa1Qlh7GOocyRee01IfdkzmThtXvBsOiH3hKQsHaGHXxHqeERe57K7lJAW7hslPRNgcpNLWJMhpssZxVPWiHu8jwPWlLPttI7rrRqr2pKyW1Wd1UtfkGvIkHV6PtlelpcZ06X6Kcs3NJ9gvqxjvNqtJYh1nFj8vBFWV4HV/eWdzDcszLqp5fbPWfGFIHaGBN0pbfNdulnmRc1Rb9IdBTCR5ksVryTTwVboLPmTDaE4Ygp92bv8= x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: moxa.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8014a703-7559-440b-40a3-08d816938448 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Jun 2020 10:03:29.9831 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 5571c7d4-286b-47f6-9dd5-0aa688773c8e X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 1gHpnYmTKwDuAdyzFvAWaItmzlTvjNqihnD4FGke1WljzSf+yJ3EzvvVmZr7RrLqL/lZ3j9gVskpWfj7bcTxHA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR01MB3217 Sender: linux-watchdog-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org Here provide Watchdog function from rtc-ds1374.c which is in RTC subsystem originally. Besides, add nowayout and implement Watchdog margin time when DS1374 Watchdog device is found. Signed-off-by: Johnson Chen --- drivers/watchdog/Kconfig | 11 ++ drivers/watchdog/Makefile | 1 + drivers/watchdog/ds1374_wdt.c | 330 ++++++++++++++++++++++++++++++++++ 3 files changed, 342 insertions(+) create mode 100644 drivers/watchdog/ds1374_wdt.c diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index b739c476955b..b4ff4b3c18da 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -316,6 +316,17 @@ config ZIIRAVE_WATCHDOG To compile this driver as a module, choose M here: the module will be called ziirave_wdt. +config DS1374_WATCHDOG + tristate "Dallas/Maxim DS1374 Watchdog timer" + depends on MFD_DS1374 + select WATCHDOG_CORE + help + If you say Y here you will get support for the watchdog timer + in the Dallas/Maxim Semiconductor DS1374 real-time clock chips. + + This driver can also be built as a module. If so the module + will be called ds1374_wdt. + config RAVE_SP_WATCHDOG tristate "RAVE SP Watchdog timer" depends on RAVE_SP_CORE diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index 6de2e4ceef19..1c468f5d9e5f 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -224,3 +224,4 @@ obj-$(CONFIG_MENF21BMC_WATCHDOG) += menf21bmc_wdt.o obj-$(CONFIG_MENZ069_WATCHDOG) += menz69_wdt.o obj-$(CONFIG_RAVE_SP_WATCHDOG) += rave-sp-wdt.o obj-$(CONFIG_STPMIC1_WATCHDOG) += stpmic1_wdt.o +obj-$(CONFIG_DS1374_WATCHDOG) += ds1374_wdt.o diff --git a/drivers/watchdog/ds1374_wdt.c b/drivers/watchdog/ds1374_wdt.c new file mode 100644 index 000000000000..ce69e45973fd --- /dev/null +++ b/drivers/watchdog/ds1374_wdt.c @@ -0,0 +1,330 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * RTC client/driver for the Maxim/Dallas DS1374 Real-Time Clock over I2C + * + * Based on code by Randy Vinson , + * which was based on the m41t00.c by Mark Greer . + * + * Copyright (C) 2020 Johnson Chen + * Copyright (C) 2014 Rose Technology + * Copyright (C) 2006-2007 Freescale Semiconductor + * Copyright (C) 2005 MontaVista Software, Inc. + */ + +/* + * It would be more efficient to use i2c msgs/i2c_transfer directly but, as + * recommened in .../Documentation/i2c/writing-clients section + * "Sending and receiving", using SMBus level communication is preferred. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define DEVNAME "ds1374_wdt" + +#define DS1374_REG_WDALM0 0x04 /* Watchdog/Alarm */ +#define DS1374_REG_WDALM1 0x05 +#define DS1374_REG_WDALM2 0x06 +#define DS1374_REG_CR 0x07 /* Control */ +#define DS1374_REG_CR_AIE 0x01 /* Alarm Int. Enable */ +#define DS1374_REG_CR_WDSTR 0x08 /* 1=INT, 0=RST */ +#define DS1374_REG_CR_WDALM 0x20 /* 1=Watchdog, 0=Alarm */ +#define DS1374_REG_CR_WACE 0x40 /* WD/Alarm counter enable */ + +/* Default margin */ +#define WD_TIMO 131762 +#define TIMER_MARGIN_MIN 4096 /* 1s */ +#define TIMER_MARGIN_MAX (60*60*24*4096) /* one day */ + +static int wdt_margin = WD_TIMO; +module_param(wdt_margin, int, 0); +MODULE_PARM_DESC(wdt_margin, "Watchdog timeout in seconds (default 32s)"); + +static bool nowayout = WATCHDOG_NOWAYOUT; +module_param(nowayout, bool, 0); +MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started default =" + __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); + +struct ds1374_wdt { + struct i2c_client *client; + struct watchdog_device *wdt; + struct work_struct work; + + /* The mutex protects alarm operations, and prevents a race + * between the enable_irq() in the workqueue and the free_irq() + * in the remove function. + */ + struct mutex mutex; +}; + +static const struct watchdog_info ds1374_wdt_info = { + .identity = DEVNAME, + .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | + WDIOF_MAGICCLOSE, +}; + +static struct watchdog_device ds1374_wdd; + +static int ds1374_wdt_settimeout(struct watchdog_device *wdt, + unsigned int timeout) +{ + int ret = -ENOIOCTLCMD; + u8 buf[4]; + int cr, i; + struct ds1374_wdt *drv_data = watchdog_get_drvdata(wdt); + + ret = cr = i2c_smbus_read_byte_data(drv_data->client, DS1374_REG_CR); + if (ret < 0) + goto out; + + /* Disable any existing watchdog/alarm before setting the new one */ + cr &= ~DS1374_REG_CR_WACE; + + ret = i2c_smbus_write_byte_data(drv_data->client, DS1374_REG_CR, cr); + if (ret < 0) + goto out; + + /* Set new watchdog time */ + for (i = 0; i < 3; i++) { + buf[i] = timeout & 0xff; + timeout >>= 8; + } + + ret = i2c_smbus_write_i2c_block_data(drv_data->client, + DS1374_REG_WDALM0, 3, buf); + if (ret) { + pr_info("couldn't set new watchdog time\n"); + goto out; + } + + /* Enable watchdog timer */ + cr |= DS1374_REG_CR_WACE | DS1374_REG_CR_WDALM; + cr &= ~DS1374_REG_CR_WDSTR;/* for RST PIN */ + cr &= ~DS1374_REG_CR_AIE; + + ret = i2c_smbus_write_byte_data(drv_data->client, DS1374_REG_CR, cr); + if (ret < 0) + goto out; + + return 0; +out: + return ret; +} + + +/* + * Read WD/Alarm counter to reload the watchdog timer. (ie, pat the watchdog) + */ +static int ds1374_wdt_ping(struct watchdog_device *wdt) +{ + struct ds1374_wdt *drv_data = watchdog_get_drvdata(wdt); + int ret; + u8 buf[4]; + + ret = i2c_smbus_read_i2c_block_data(drv_data->client, + DS1374_REG_WDALM0, 3, buf); + + if (ret < 0 || ret < 3) + pr_info("WD TICK FAIL!!!!!!!!!! %i\n", ret); + + return ret; +} + +static int ds1374_wdt_start(struct watchdog_device *wdt) +{ + int ret; + + ret = ds1374_wdt_settimeout(wdt, wdt_margin); + if (ret) + return ret; + + ds1374_wdt_ping(wdt); + + return 0; +} + +static int ds1374_wdt_stop(struct watchdog_device *wdt) +{ + struct ds1374_wdt *drv_data = watchdog_get_drvdata(wdt); + int cr; + + if (nowayout) + return 0; + + cr = i2c_smbus_read_byte_data(drv_data->client, DS1374_REG_CR); + /* Disable watchdog timer */ + cr &= ~DS1374_REG_CR_WACE; + + return i2c_smbus_write_byte_data(drv_data->client, DS1374_REG_CR, cr); +} + +/* + * Handle commands from user-space. + */ +static long ds1374_wdt_ioctl(struct watchdog_device *wdt, unsigned int cmd, + unsigned long arg) +{ + int new_margin, options; + + switch (cmd) { + case WDIOC_GETSUPPORT: + return copy_to_user((struct watchdog_info __user *)arg, + &ds1374_wdt_info, sizeof(ds1374_wdt_info)) ? -EFAULT : 0; + + case WDIOC_GETSTATUS: + case WDIOC_GETBOOTSTATUS: + return put_user(0, (int __user *)arg); + case WDIOC_KEEPALIVE: + ds1374_wdt_ping(wdt); + return 0; + case WDIOC_SETTIMEOUT: + if (get_user(new_margin, (int __user *)arg)) + return -EFAULT; + + /* the hardware's tick rate is 4096 Hz, so + * the counter value needs to be scaled accordingly + */ + new_margin <<= 12; + if (new_margin < 1 || new_margin > 16777216) + return -EINVAL; + + wdt_margin = new_margin; + ds1374_wdt_settimeout(wdt, new_margin); + ds1374_wdt_ping(wdt); + fallthrough; + case WDIOC_GETTIMEOUT: + /* when returning ... inverse is true */ + return put_user((wdt_margin >> 12), (int __user *)arg); + case WDIOC_SETOPTIONS: + if (copy_from_user(&options, (int __user *)arg, sizeof(int))) + return -EFAULT; + + if (options & WDIOS_DISABLECARD) { + pr_info("disable watchdog\n"); + ds1374_wdt_stop(wdt); + return 0; + } + + if (options & WDIOS_ENABLECARD) { + pr_info("enable watchdog\n"); + ds1374_wdt_settimeout(wdt, wdt_margin); + ds1374_wdt_ping(wdt); + return 0; + } + return -EINVAL; + } + return -ENOTTY; +} + +static int ds1374_wdt_notify_sys(struct notifier_block *this, + unsigned long code, void *unused) +{ + if (code == SYS_DOWN || code == SYS_HALT) + /* Disable Watchdog */ + ds1374_wdt_stop(&ds1374_wdd); + return NOTIFY_DONE; +} + +static struct notifier_block ds1374_wdt_notifier = { + .notifier_call = ds1374_wdt_notify_sys, +}; + +static int ds1374_wdt_probe(struct platform_device *pdev) +{ + struct ds1374_wdt *drv_data; + struct i2c_client *client = to_i2c_client(pdev->dev.parent); + int ret; + + drv_data = devm_kzalloc(&pdev->dev, sizeof(struct ds1374_wdt), + GFP_KERNEL); + if (!drv_data) + return -ENOMEM; + + drv_data->wdt = &ds1374_wdd; + drv_data->client = client; + mutex_init(&drv_data->mutex); + + watchdog_init_timeout(drv_data->wdt, wdt_margin, &pdev->dev); + watchdog_set_nowayout(drv_data->wdt, nowayout); + + watchdog_set_drvdata(drv_data->wdt, drv_data); + platform_set_drvdata(pdev, drv_data); + + ret = watchdog_register_device(drv_data->wdt); + if (ret) { + dev_err(&pdev->dev, "failed to register Watchdog device\n"); + return ret; + } + + ret = register_reboot_notifier(&ds1374_wdt_notifier); + if (ret) { + watchdog_unregister_device(drv_data->wdt); + return ret; + } + + ds1374_wdt_settimeout(drv_data->wdt, wdt_margin); + dev_info(&pdev->dev, "Dallas/Maxim DS1374 watchdog device enabled\n"); + + return 0; +} + +static int ds1374_wdt_remove(struct platform_device *pdev) +{ + struct ds1374_wdt *drv_data = platform_get_drvdata(pdev); + + dev_warn(&pdev->dev, "Unregister DS1374 watchdog device\n"); + watchdog_unregister_device(drv_data->wdt); + unregister_reboot_notifier(&ds1374_wdt_notifier); + + return 0; +} + +static void ds1374_wdt_shutdown(struct platform_device *pdev) +{ + struct ds1374_wdt *drv_data = platform_get_drvdata(pdev); + + mutex_lock(&drv_data->mutex); + ds1374_wdt_stop(drv_data->wdt); + mutex_unlock(&drv_data->mutex); +} + +static const struct watchdog_ops ds1374_wdt_fops = { + .owner = THIS_MODULE, + .start = ds1374_wdt_start, + .stop = ds1374_wdt_stop, + .ping = ds1374_wdt_ping, + .set_timeout = ds1374_wdt_settimeout, + .ioctl = ds1374_wdt_ioctl, +}; + +static struct watchdog_device ds1374_wdd = { + .info = &ds1374_wdt_info, + .ops = &ds1374_wdt_fops, + .min_timeout = TIMER_MARGIN_MIN, + .max_timeout = TIMER_MARGIN_MAX, +}; + +static struct platform_driver ds1374_wdt = { + .driver = { + .owner = THIS_MODULE, + .name = DEVNAME, + }, + .probe = ds1374_wdt_probe, + .remove = ds1374_wdt_remove, + .shutdown = ds1374_wdt_shutdown, +}; + +module_platform_driver(ds1374_wdt); + +MODULE_AUTHOR("Johnson Chen "); +MODULE_DESCRIPTION("Dallas/Maxim DS1374 Watchdog Driver"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("Platform:ds1374_wdt");