From patchwork Wed Jul 12 05:49:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 787009 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3x6p2545Jbz9sRV for ; Wed, 12 Jul 2017 15:50:05 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NmTI/g7c"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750943AbdGLFuF (ORCPT ); Wed, 12 Jul 2017 01:50:05 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:36245 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756688AbdGLFuE (ORCPT ); Wed, 12 Jul 2017 01:50:04 -0400 Received: by mail-wr0-f194.google.com with SMTP id 77so3188554wrb.3 for ; Tue, 11 Jul 2017 22:50:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:subject:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=TryLOHGX15vBlC1LEFvOxLdZ9qZlNZAZxUdG8c13v28=; b=NmTI/g7cRDekc88gi9Ue3A0vYR2V4TMwfUUQxwKXBqua44y4reLMY5gpd47ZcQgd3t I2qaP/s521bXo0zQ/JCJnIn9uZxPXtz5cRfOJVFN3VFN33m0U88eBXI7Vaeppjh4tE23 3OVxrMu3rVHYJLB8NYhcjSuVL1ktsjv1cauw9UAgV9AYYbnkYBHz65Oj9jECsZ8W6MSX B78OoG7smNsFIzd4vS/74DSkn/4jlHgoS3wCs6PSPWqmUIK5fUnqsMpNpBs5yH6D/jdP iGQ5Hh8X14/Z2iAGV+l6ZU9rWpUKQyq//zN6zxFLvF19z5pPG90FqG8j56/bbk9F9283 RCGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=TryLOHGX15vBlC1LEFvOxLdZ9qZlNZAZxUdG8c13v28=; b=MhhELu3VXr29JUSUvlaG08cJ8sZpZMOmgB/15GOiQ1Xg9ioXtu5hg+DBmzA+kXY+0d d3ICsnPnUpr/M0846rU98F/M7yIZGBERoXzuribqNdY27TojrDkFEb72Od7Xo7Ai6Vtv ME2sIXcrRPjvZWVAE3mW5p72QnuZ+tOfy0mVIAEakTwmPWpqlx13Q1s2/Mh/20l2+/ok dUss5IaNSXTPB8cIJVwe8mJXatGtzRPzAHS58y69PNZoAeKjyqgNm42Ss8BvTw+Rbg3u T9HZs5f2NIUFkXeetEQl7Eba70mn820glK8b8bli4+zGVA4+mhyrNJDccNK3nU6UIyFv ZNOg== X-Gm-Message-State: AIVw113RJtrpyH7JJQjZiXQsz8xkJGGFy+POX7MeVO4QQWML5pjIqeFS No9H1MHEIqOepDYn X-Received: by 10.28.138.8 with SMTP id m8mr1190152wmd.40.1499838603009; Tue, 11 Jul 2017 22:50:03 -0700 (PDT) Received: from ?IPv6:2003:c6:ebc1:e200:4:ce91:c82d:34f2? (p200300C6EBC1E2000004CE91C82D34F2.dip0.t-ipconnect.de. [2003:c6:ebc1:e200:4:ce91:c82d:34f2]) by smtp.googlemail.com with ESMTPSA id x94sm1146821wrb.47.2017.07.11.22.50.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Jul 2017 22:50:02 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH 2/9] rtc: ds1307: factor out bbsqi bit to struct chip_desc To: Alexandre Belloni Cc: linux-rtc@vger.kernel.org References: Message-ID: <6db8da4c-8611-02c1-1d79-1f4015528250@gmail.com> Date: Wed, 12 Jul 2017 07:49:22 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: Sender: linux-rtc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rtc@vger.kernel.org Factor out the bbsqi bit to struct chip_desc. Signed-off-by: Heiner Kallweit --- drivers/rtc/rtc-ds1307.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c index adc90f18..eecf6b27 100644 --- a/drivers/rtc/rtc-ds1307.c +++ b/drivers/rtc/rtc-ds1307.c @@ -139,6 +139,7 @@ struct chip_desc { u8 century_reg; u8 century_enable_bit; u8 century_bit; + u8 bbsqi_bit; u16 trickle_charger_reg; u8 trickle_charger_setup; u8 (*do_trickle_setup)(struct ds1307 *, uint32_t, @@ -169,6 +170,7 @@ static struct chip_desc chips[last_ds_type] = { .alarm = 1, .century_reg = DS1307_REG_MONTH, .century_bit = DS1337_BIT_CENTURY, + .bbsqi_bit = DS1339_BIT_BBSQI, .trickle_charger_reg = 0x10, .do_trickle_setup = &do_trickle_setup_ds1339, }, @@ -185,6 +187,7 @@ static struct chip_desc chips[last_ds_type] = { .alarm = 1, .century_reg = DS1307_REG_MONTH, .century_bit = DS1337_BIT_CENTURY, + .bbsqi_bit = DS3231_BIT_BBSQW, }, [rx_8130] = { .alarm = 1, @@ -1319,11 +1322,6 @@ static int ds1307_probe(struct i2c_client *client, irq_handler_t irq_handler = ds1307_irq; - static const int bbsqi_bitpos[] = { - [ds_1337] = 0, - [ds_1339] = DS1339_BIT_BBSQI, - [ds_3231] = DS3231_BIT_BBSQW, - }; const struct rtc_class_ops *rtc_ops = &ds13xx_rtc_ops; ds1307 = devm_kzalloc(&client->dev, sizeof(struct ds1307), GFP_KERNEL); @@ -1414,8 +1412,7 @@ static int ds1307_probe(struct i2c_client *client, */ if (chip->alarm && (client->irq > 0 || ds1307_can_wakeup_device)) { - ds1307->regs[0] |= DS1337_BIT_INTCN - | bbsqi_bitpos[ds1307->type]; + ds1307->regs[0] |= DS1337_BIT_INTCN | chip->bbsqi_bit; ds1307->regs[0] &= ~(DS1337_BIT_A2IE | DS1337_BIT_A1IE); want_irq = true;