From patchwork Thu Apr 8 02:40:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liam Beguin X-Patchwork-Id: 1463631 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-rtc-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=JB26clC6; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4FG59B5jD5z9sWQ for ; Thu, 8 Apr 2021 12:40:46 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229514AbhDHCky (ORCPT ); Wed, 7 Apr 2021 22:40:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229523AbhDHCkv (ORCPT ); Wed, 7 Apr 2021 22:40:51 -0400 Received: from mail-qk1-x72e.google.com (mail-qk1-x72e.google.com [IPv6:2607:f8b0:4864:20::72e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4671EC061762 for ; Wed, 7 Apr 2021 19:40:40 -0700 (PDT) Received: by mail-qk1-x72e.google.com with SMTP id g20so823715qkk.1 for ; Wed, 07 Apr 2021 19:40:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kaqo7uOnV2YyBNUijp7UcFWN/avBdDP9EEhdzkkl5WE=; b=JB26clC6ULXtWG80k48Zh7UWjUPR9nqP7NqGXkoLlF2gJe5dhr9Ad0v2HYReSSxf60 JaitaBkorL8BryI85xwUJEd+4cYVlP6at+ZqWRfxyxKCYMz0yk0Lbst/E9JfwC+4X3N5 8Sk18NJuHMV33ZMFq1an6JlebOdoLC8q2/y83mCGMNqsmHCAIibEIjTc2s6HHvW2Fvj/ Bqjk6nwv5DWN6lWMbTogkfOJvxIojigrDNJXCuzTMxHqKhZ65WworVGty5+8MoowmKn3 9r4CfGmpCAIDAZmM1bMTuIiKp0Vw4cyk3LvTYnC9CK4iXCHwI/GZF+0Ix3DTGtsVDfwh sBoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kaqo7uOnV2YyBNUijp7UcFWN/avBdDP9EEhdzkkl5WE=; b=QiIAENe9hf0nZ9zC+uyQfR7z3ubweI4+8CXs95SejKbKVB3OPCNdbdEwkGe18I5W04 y74co1VP1MeCq7fGAsG63ujfyWe7RRpPdBvt4utSjeBCQC/3rsG174cAeZbxo4QNL30U /dNAt1lkaEgevee9N1AsFKh4/mT7B/92WqAgSXH8XirTUuFRpBtm/hw1lD7b5hwNS0eD 3o/eUUhcUqw5ydbZWJvj6u+dKGMb6X5ec0rSi4wEcta7GKjxRGbrbFESBfU5AMUa7hs8 5WFEOT5AzveTG6nPBUaZDzBj7HXFqn7MxBHbmxa/IXEUOd4GinfKDObvms86EdZyfZpD 58xQ== X-Gm-Message-State: AOAM531GbdoC0KNdURrSPHC23axYQYXwq6s9s+04LZU19rqe+BHPhNYS vfiYrQpUbZ1hl2J56+CMoFupuPO2aQoMuJyt X-Google-Smtp-Source: ABdhPJy/+ZflvwL02/Qw/Nxh3DNwtQtDjDgMtWXu1oGRWjyqG0rKlFBt3KhlA2iQNJgt1bDTaN7WPg== X-Received: by 2002:a05:620a:1502:: with SMTP id i2mr6474066qkk.373.1617849638643; Wed, 07 Apr 2021 19:40:38 -0700 (PDT) Received: from shaak.xiphos.ca (198-48-202-89.cpe.pppoe.ca. [198.48.202.89]) by smtp.gmail.com with ESMTPSA id v128sm20102383qkc.127.2021.04.07.19.40.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Apr 2021 19:40:38 -0700 (PDT) From: Liam Beguin To: liambeguin@gmail.com, a.zummo@towertech.it, alexandre.belloni@bootlin.com, panfilov.artyom@gmail.com Cc: linux-rtc@vger.kernel.org Subject: [PATCH v2 1/3] rtc: ab-eoz9: set regmap max_register Date: Wed, 7 Apr 2021 22:40:26 -0400 Message-Id: <20210408024028.3526564-2-liambeguin@gmail.com> X-Mailer: git-send-email 2.30.1.489.g328c10930387 In-Reply-To: <20210408024028.3526564-1-liambeguin@gmail.com> References: <20210408024028.3526564-1-liambeguin@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-rtc@vger.kernel.org From: Liam Beguin Set regmap's max_register property to allow users to dump registers using debufgs. Signed-off-by: Liam Beguin --- drivers/rtc/rtc-ab-eoz9.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/rtc/rtc-ab-eoz9.c b/drivers/rtc/rtc-ab-eoz9.c index b20d8f26dcdb..dee17a76a72b 100644 --- a/drivers/rtc/rtc-ab-eoz9.c +++ b/drivers/rtc/rtc-ab-eoz9.c @@ -264,6 +264,7 @@ static const struct rtc_class_ops rtc_ops = { static const struct regmap_config abeoz9_rtc_regmap_config = { .reg_bits = 8, .val_bits = 8, + .max_register = 0x3f, }; #if IS_REACHABLE(CONFIG_HWMON) From patchwork Thu Apr 8 02:40:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liam Beguin X-Patchwork-Id: 1463629 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-rtc-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=jNUL3xCu; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4FG59B36bVz9sWH for ; Thu, 8 Apr 2021 12:40:46 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229510AbhDHCkx (ORCPT ); Wed, 7 Apr 2021 22:40:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229514AbhDHCkv (ORCPT ); Wed, 7 Apr 2021 22:40:51 -0400 Received: from mail-qt1-x830.google.com (mail-qt1-x830.google.com [IPv6:2607:f8b0:4864:20::830]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3385BC061761 for ; Wed, 7 Apr 2021 19:40:40 -0700 (PDT) Received: by mail-qt1-x830.google.com with SMTP id x9so353604qto.8 for ; Wed, 07 Apr 2021 19:40:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=a8H2er2hoE6OOaPTRGgvr+9HfPOXdtcl19DMyXTtMiw=; b=jNUL3xCu1si/pCkWllw/O4OEC4fb3IKNGXmt1stE40JTuFEyrwTNy+oKe6o/68Htph sBgprbD8q+ZQJboBM33k1ISvYnlagdBDyPjmRabb2ti3qZZW6KsBIqSJTmGvC+Kv6Vmg PTALBnhMzbQzQ2mW3WAaOBey86t099DqmekJ2hYlcy5HsQ8VV94Jjs8T45hfO813FucR 5p2Ehob360L9SE3aDgaCHYPKVLZF8TfRbPTZt4qAhxC+PYolWpnF4cZEa+qSSRxex/uN CIXIq//LQIxdMqQnI3ZliLMwA236HmHR/GMrqQbUHH3jldQAMAk+w0BbJGJbwfiWztC3 NTcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=a8H2er2hoE6OOaPTRGgvr+9HfPOXdtcl19DMyXTtMiw=; b=kyxTNxBjywftlzyhFnjyABeSIr8SqD5U76M/bT4AQT/SI5sEjm2bgJoL7xW+VTL2O8 sjnEzJ3gsXSQ2jRtbuaKsk+iLmnvkgGdYEVp8IScOJ3kmSe4ZLbUwhQRyQO3LsGsyFnQ DSuzibIhJYqN4miHwHNIzIFx079cnC5jUXiLALKg+Vbk4gQ9vU4PQIYORr+LlZnEU6ex fto2XuLbw0YqHNlYbmRPEVjUg4oOPheoUKyWgeDzR58xlGensb7CUBlyHX2O5kyDBrih RtdBr3fMSj13Z1nnIg2nxlT5B1LWChVUt0wsIhfNtM7UbghPzbhG33c6L1OhmDK75NgR 6Ksw== X-Gm-Message-State: AOAM533MUYhpbV2HIUg5xcDwNp/JB0Q2P9OfKHcBdIrycJxLJ3z3ZFnn fgXnCuYIzr8BvyFBWnHJZeM= X-Google-Smtp-Source: ABdhPJwNPiYXP0IIvydV7SUpsXoBUdauTqwyX8gS4J1YFnm5pWEA3SM5239n3dGiUB4NGOHNkbWEwg== X-Received: by 2002:ac8:5cd2:: with SMTP id s18mr5616668qta.202.1617849639482; Wed, 07 Apr 2021 19:40:39 -0700 (PDT) Received: from shaak.xiphos.ca (198-48-202-89.cpe.pppoe.ca. [198.48.202.89]) by smtp.gmail.com with ESMTPSA id v128sm20102383qkc.127.2021.04.07.19.40.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Apr 2021 19:40:39 -0700 (PDT) From: Liam Beguin To: liambeguin@gmail.com, a.zummo@towertech.it, alexandre.belloni@bootlin.com, panfilov.artyom@gmail.com Cc: linux-rtc@vger.kernel.org Subject: [PATCH v2 2/3] rtc: ab-eoz9: add alarm support Date: Wed, 7 Apr 2021 22:40:27 -0400 Message-Id: <20210408024028.3526564-3-liambeguin@gmail.com> X-Mailer: git-send-email 2.30.1.489.g328c10930387 In-Reply-To: <20210408024028.3526564-1-liambeguin@gmail.com> References: <20210408024028.3526564-1-liambeguin@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-rtc@vger.kernel.org From: Liam Beguin Add alarm support for the rtc-ab-eoz9. Signed-off-by: Liam Beguin --- drivers/rtc/rtc-ab-eoz9.c | 136 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) diff --git a/drivers/rtc/rtc-ab-eoz9.c b/drivers/rtc/rtc-ab-eoz9.c index dee17a76a72b..7dc96fabc76f 100644 --- a/drivers/rtc/rtc-ab-eoz9.c +++ b/drivers/rtc/rtc-ab-eoz9.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -57,6 +58,24 @@ #define ABEOZ9_SEC_LEN 7 +#define ABEOZ9_REG_ALARM_SEC 0x10 +#define ABEOZ9_BIT_ALARM_SEC GENMASK(6, 0) +#define ABEOZ9_REG_ALARM_MIN 0x11 +#define ABEOZ9_BIT_ALARM_MIN GENMASK(6, 0) +#define ABEOZ9_REG_ALARM_HOURS 0x12 +#define ABEOZ9_BIT_ALARM_HOURS_PM BIT(5) +#define ABEOZ9_BIT_ALARM_HOURS GENMASK(4, 0) +#define ABEOZ9_REG_ALARM_DAYS 0x13 +#define ABEOZ9_BIT_ALARM_DAYS GENMASK(5, 0) +#define ABEOZ9_REG_ALARM_WEEKDAYS 0x14 +#define ABEOZ9_BIT_ALARM_WEEKDAYS GENMASK(2, 0) +#define ABEOZ9_REG_ALARM_MONTHS 0x15 +#define ABEOZ9_BIT_ALARM_MONTHS GENMASK(4, 0) +#define ABEOZ9_REG_ALARM_YEARS 0x16 + +#define ABEOZ9_ALARM_LEN 7 +#define ABEOZ9_BIT_ALARM_AE BIT(7) + #define ABEOZ9_REG_REG_TEMP 0x20 #define ABEOZ953_TEMP_MAX 120 #define ABEOZ953_TEMP_MIN -60 @@ -186,6 +205,98 @@ static int abeoz9_rtc_set_time(struct device *dev, struct rtc_time *tm) return abeoz9_reset_validity(regmap); } +static int abeoz9_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm) +{ + struct abeoz9_rtc_data *data = dev_get_drvdata(dev); + struct regmap *regmap = data->regmap; + u8 regs[ABEOZ9_ALARM_LEN]; + u8 val[2]; + int ret; + + ret = abeoz9_check_validity(dev); + if (ret) + return ret; + + ret = regmap_bulk_read(regmap, ABEOZ9_REG_CTRL_INT, val, sizeof(val)); + if (ret) + return ret; + + alarm->enabled = val[0] & ABEOZ9_REG_CTRL_INT_AIE; + alarm->pending = val[1] & ABEOZ9_REG_CTRL_INT_FLAG_AF; + + ret = regmap_bulk_read(regmap, ABEOZ9_REG_ALARM_SEC, regs, sizeof(regs)); + if (ret) + return ret; + + alarm->time.tm_sec = bcd2bin(FIELD_GET(ABEOZ9_BIT_ALARM_SEC, regs[0])); + alarm->time.tm_min = bcd2bin(FIELD_GET(ABEOZ9_BIT_ALARM_MIN, regs[1])); + alarm->time.tm_hour = bcd2bin(FIELD_GET(ABEOZ9_BIT_ALARM_HOURS, regs[2])); + if (FIELD_GET(ABEOZ9_BIT_ALARM_HOURS_PM, regs[2])) + alarm->time.tm_hour += 12; + + alarm->time.tm_mday = bcd2bin(FIELD_GET(ABEOZ9_BIT_ALARM_DAYS, regs[3])); + + return 0; +} + +static int abeoz9_rtc_alarm_irq_enable(struct device *dev, u32 enable) +{ + struct abeoz9_rtc_data *data = dev_get_drvdata(dev); + + return regmap_update_bits(data->regmap, ABEOZ9_REG_CTRL_INT, + ABEOZ9_REG_CTRL_INT_AIE, + FIELD_PREP(ABEOZ9_REG_CTRL_INT_AIE, enable)); +} + +static int abeoz9_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) +{ + struct abeoz9_rtc_data *data = dev_get_drvdata(dev); + u8 regs[ABEOZ9_ALARM_LEN] = {0}; + int ret; + + ret = regmap_update_bits(data->regmap, ABEOZ9_REG_CTRL_INT_FLAG, + ABEOZ9_REG_CTRL_INT_FLAG_AF, 0); + if (ret) + return ret; + + regs[0] = ABEOZ9_BIT_ALARM_AE | FIELD_PREP(ABEOZ9_BIT_ALARM_SEC, + bin2bcd(alarm->time.tm_sec)); + regs[1] = ABEOZ9_BIT_ALARM_AE | FIELD_PREP(ABEOZ9_BIT_ALARM_MIN, + bin2bcd(alarm->time.tm_min)); + regs[2] = ABEOZ9_BIT_ALARM_AE | FIELD_PREP(ABEOZ9_BIT_ALARM_HOURS, + bin2bcd(alarm->time.tm_hour)); + regs[3] = ABEOZ9_BIT_ALARM_AE | FIELD_PREP(ABEOZ9_BIT_ALARM_DAYS, + bin2bcd(alarm->time.tm_mday)); + + ret = regmap_bulk_write(data->regmap, ABEOZ9_REG_ALARM_SEC, regs, + sizeof(regs)); + if (ret) + return ret; + + return abeoz9_rtc_alarm_irq_enable(dev, alarm->enabled); +} + +static irqreturn_t abeoz9_rtc_irq(int irq, void *dev) +{ + struct abeoz9_rtc_data *data = dev_get_drvdata(dev); + unsigned int val; + int ret; + + ret = regmap_read(data->regmap, ABEOZ9_REG_CTRL_INT_FLAG, &val); + if (ret) + return IRQ_NONE; + + if (!FIELD_GET(ABEOZ9_REG_CTRL_INT_FLAG_AF, val)) + return IRQ_NONE; + + regmap_update_bits(data->regmap, ABEOZ9_REG_CTRL_INT_FLAG, + ABEOZ9_REG_CTRL_INT_FLAG_AF, 0); + + rtc_update_irq(data->rtc, 1, RTC_IRQF | RTC_AF); + + return IRQ_HANDLED; +} + static int abeoz9_trickle_parse_dt(struct device_node *node) { u32 ohms = 0; @@ -261,6 +372,14 @@ static const struct rtc_class_ops rtc_ops = { .set_time = abeoz9_rtc_set_time, }; +static const struct rtc_class_ops rtc_alarm_ops = { + .read_time = abeoz9_rtc_get_time, + .set_time = abeoz9_rtc_set_time, + .read_alarm = abeoz9_rtc_read_alarm, + .set_alarm = abeoz9_rtc_set_alarm, + .alarm_irq_enable = abeoz9_rtc_alarm_irq_enable, +}; + static const struct regmap_config abeoz9_rtc_regmap_config = { .reg_bits = 8, .val_bits = 8, @@ -420,6 +539,23 @@ static int abeoz9_probe(struct i2c_client *client, data->rtc->ops = &rtc_ops; data->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000; data->rtc->range_max = RTC_TIMESTAMP_END_2099; + data->rtc->uie_unsupported = 1; + + if (client->irq > 0) { + ret = devm_request_threaded_irq(dev, client->irq, NULL, + abeoz9_rtc_irq, + IRQF_TRIGGER_LOW | IRQF_ONESHOT, + dev_name(dev), dev); + if (ret) { + dev_err(dev, "failed to request alarm irq\n"); + return ret; + } + } + + if (client->irq > 0 || device_property_read_bool(dev, "wakeup-source")) { + ret = device_init_wakeup(dev, true); + data->rtc->ops = &rtc_alarm_ops; + } ret = devm_rtc_register_device(data->rtc); if (ret) From patchwork Thu Apr 8 02:40:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liam Beguin X-Patchwork-Id: 1463632 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-rtc-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=ZehiU5qm; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4FG59C0tVxz9sWX for ; Thu, 8 Apr 2021 12:40:47 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229523AbhDHCky (ORCPT ); Wed, 7 Apr 2021 22:40:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38540 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229544AbhDHCkw (ORCPT ); Wed, 7 Apr 2021 22:40:52 -0400 Received: from mail-qk1-x731.google.com (mail-qk1-x731.google.com [IPv6:2607:f8b0:4864:20::731]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 33093C061763 for ; Wed, 7 Apr 2021 19:40:41 -0700 (PDT) Received: by mail-qk1-x731.google.com with SMTP id o5so859583qkb.0 for ; Wed, 07 Apr 2021 19:40:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VUFebjQxbI/iJvtepGmyWqsiQ7fkgzG2SEQ9jV39Iro=; b=ZehiU5qmLIhL2dvgjl7uqEb5IP2yhpROzk4+iMcI6ug/wjGojgUR97n6DdPsiouTXn Sy/MopWa4NArq2qP0zwqF5ZQnKQiRHjNDvOCpnBkOo2naRlE5JoLkFtpTW2WYk6Ngo78 t7fousLwS0Y8GzMcewBL6JS/7Oe8WUemOFoFvIjrK2lFc+doIMQZC8yeAsVab/hAfLry JlGBwbbGc6SRPvzppxAk9tqtriBpbrUFACtICoZzudNDL57Ynu3L7+v3X/4Xe0JgOgnK 1FYg4sD+z3UBgOSuulXC/gPrATFRCFIiel7cND6aAo0BfPqWHA+yEFoZfoaXpSasIR76 X7zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VUFebjQxbI/iJvtepGmyWqsiQ7fkgzG2SEQ9jV39Iro=; b=ibBp3tKa0AQrCk62ZQ1fAr+LlPVxOuv1f9i6Ilm+fADt5J+VS353a2H5BHem/6Hkii d7L4V8v2PvDe5+PL/wcPH+EBKS0yHXGm/nm3s/PSIpMYWf9/y+Fawri1/4H2v5hlEapd HDQ5Pcm5/EmgZ9+qVZ32dMAZnXCN9WzqbNFSrrRd4VNfxtsjSSpYvEXxljQBC9pzGteX 334wnyBsl1RrhKUQhISQ2L6yEJSxmO0Qz0VmT2rOTD94jfdQhFaQOL6+HilgV/nuf4oK oCBxBaP7PDOQQUAHtWQIIcECKHQxM6Ikps5fIdn/vEQN3/84CEWFBT5OxYMsjmtdox2m 8Piw== X-Gm-Message-State: AOAM530vcTcQSQB9hD8w5irgViIJgeIT5z4gyC3qmZIr+xkmXFots8e1 KgicXwDpaKjDFSwi0WK8igo= X-Google-Smtp-Source: ABdhPJyWna4MVmXS+KEQr2w6btnSOeWqJoh0yKD6+QkuMb2oC6NhZf4QW/8SlssCQf4s3EzeA6QaCA== X-Received: by 2002:ae9:e817:: with SMTP id a23mr6565365qkg.124.1617849640506; Wed, 07 Apr 2021 19:40:40 -0700 (PDT) Received: from shaak.xiphos.ca (198-48-202-89.cpe.pppoe.ca. [198.48.202.89]) by smtp.gmail.com with ESMTPSA id v128sm20102383qkc.127.2021.04.07.19.40.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Apr 2021 19:40:40 -0700 (PDT) From: Liam Beguin To: liambeguin@gmail.com, a.zummo@towertech.it, alexandre.belloni@bootlin.com, panfilov.artyom@gmail.com Cc: linux-rtc@vger.kernel.org Subject: [PATCH v2 3/3] rtc: ab-eoz9: make use of RTC_FEATURE_ALARM Date: Wed, 7 Apr 2021 22:40:28 -0400 Message-Id: <20210408024028.3526564-4-liambeguin@gmail.com> X-Mailer: git-send-email 2.30.1.489.g328c10930387 In-Reply-To: <20210408024028.3526564-1-liambeguin@gmail.com> References: <20210408024028.3526564-1-liambeguin@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-rtc@vger.kernel.org From: Liam Beguin Move the alarm callbacks in rtc_ops and use RTC_FEATURE_ALARM to notify the core whether alarm capabilities are available or not. Signed-off-by: Liam Beguin --- drivers/rtc/rtc-ab-eoz9.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/rtc/rtc-ab-eoz9.c b/drivers/rtc/rtc-ab-eoz9.c index 7dc96fabc76f..a9b355510cd4 100644 --- a/drivers/rtc/rtc-ab-eoz9.c +++ b/drivers/rtc/rtc-ab-eoz9.c @@ -368,11 +368,6 @@ static int abeoz9_rtc_setup(struct device *dev, struct device_node *node) } static const struct rtc_class_ops rtc_ops = { - .read_time = abeoz9_rtc_get_time, - .set_time = abeoz9_rtc_set_time, -}; - -static const struct rtc_class_ops rtc_alarm_ops = { .read_time = abeoz9_rtc_get_time, .set_time = abeoz9_rtc_set_time, .read_alarm = abeoz9_rtc_read_alarm, @@ -540,6 +535,7 @@ static int abeoz9_probe(struct i2c_client *client, data->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000; data->rtc->range_max = RTC_TIMESTAMP_END_2099; data->rtc->uie_unsupported = 1; + clear_bit(RTC_FEATURE_ALARM, data->rtc->features); if (client->irq > 0) { ret = devm_request_threaded_irq(dev, client->irq, NULL, @@ -554,7 +550,7 @@ static int abeoz9_probe(struct i2c_client *client, if (client->irq > 0 || device_property_read_bool(dev, "wakeup-source")) { ret = device_init_wakeup(dev, true); - data->rtc->ops = &rtc_alarm_ops; + set_bit(RTC_FEATURE_ALARM, data->rtc->features); } ret = devm_rtc_register_device(data->rtc);