Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp317982imm; Wed, 18 Jul 2018 02:41:16 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdFBKPivGJ03Ob5WG1emZf8qKNQ3j+qod6+yA9j1qHAoXge4qqcO1GNijakCqr48ZYlfx6i X-Received: by 2002:a63:743:: with SMTP id 64-v6mr5264391pgh.216.1531906876752; Wed, 18 Jul 2018 02:41:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531906876; cv=none; d=google.com; s=arc-20160816; b=US3LooYCG8ii1nCD3AFgjuOSQxQwETGEP+QtXBoLFE9rQUxeh3Wu9sSDpl4t+XEDWf UyOkm5PsvS1D8GgfXQmYfheJSPsq/fmpbv9CwKlLFc2qL9dSo+5mRvVA8miLe5SRPgmC nTWTMx2SzTQBSF/Rw6xo7WUCNjEqEMIVd5HuSymDCzmSMmynBktmq9rS5WgJB6aKfdnP a2zgNTNB0wqDs7+JdRs5Ou9g0cexdatwKE47F/Q642H+OBGsZlHkWHKhATUZJgJ0uhY5 xdYIunGSCdX13nvMg6fGLmEuE+XA/Lbin8IP8xd59gaamYGpvnGau3ppnXibdb6x4owC eJiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=6baT9oavR9LMugsugO0dwN/+w4oSe/rZ2spCdl5OXkc=; b=Zsm5vo3uOQYvFHeUU+k1dT7uD9y2nae8HiGnC/xrrWuwDjVxrkBFWdqxVcmc1uRfRx VfdXLlMzTHc3RAiYVm3T693y8Xdg99hJZdpu446v7LpL6xDcyUiuNBrigkEVQ0scGDKt +XEBT69nrQDXGimB2I0xpcwqXyUyQJfa9mhMnWpRrup+Pq/IoWSmBb2yhDi+aNMuiCwM g2jqYu+dCrFsPzqPcswlrL29b6fZlQ98inXoRh4//eOT/tuYf5a9N0F1aolJsQpetwS9 6PD0PtmR9O870kA1sZEDSyDHxpG1ujkulxLI4f1cHWSiZvmn7GxCUBuS5ptavKpW1cEm 92VQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=temperror (no key for signature) header.i=@micronovasrl.com header.s=dkim header.b=KujOtdXR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g18-v6si2921634pgd.137.2018.07.18.02.41.01; Wed, 18 Jul 2018 02:41:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=temperror (no key for signature) header.i=@micronovasrl.com header.s=dkim header.b=KujOtdXR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731015AbeGRKRV (ORCPT + 99 others); Wed, 18 Jul 2018 06:17:21 -0400 Received: from mail.micronovasrl.com ([212.103.203.10]:33962 "EHLO mail.micronovasrl.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730910AbeGRKRV (ORCPT ); Wed, 18 Jul 2018 06:17:21 -0400 Received: from mail.micronovasrl.com (mail.micronovasrl.com [127.0.0.1]) by mail.micronovasrl.com (Postfix) with ESMTP id A7116B007CB for ; Wed, 18 Jul 2018 11:40:18 +0200 (CEST) Authentication-Results: mail.micronovasrl.com (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=micronovasrl.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=micronovasrl.com; h=x-mailer:message-id:date:date:subject:subject:to:from:from; s=dkim; t=1531906818; x=1532770819; bh=WSd/9wvzx+t7T41QY3yKInol V8cyC+RL5+TKQjyvhRo=; b=KujOtdXRchk83w9XarzjwLBv5QbmO0nBErJUacdV gREP7wy9FrbVu/aT0MdBMrSqm/ooJjvKJHbfmwJu3asokpOEwsJWnB+sTN+y8SVo MQN8ycSLY08R+aAsuz3JlsQ6nrYrL1fLtsx4MF5gR6C5ghnPpy2NfevG1fvdRfQK T5I= X-Virus-Scanned: Debian amavisd-new at mail.micronovasrl.com X-Spam-Flag: NO X-Spam-Score: -2.9 X-Spam-Level: X-Spam-Status: No, score=-2.9 tagged_above=-10 required=4.5 tests=[ALL_TRUSTED=-1, BAYES_00=-1.9] autolearn=unavailable autolearn_force=no Received: from mail.micronovasrl.com ([127.0.0.1]) by mail.micronovasrl.com (mail.micronovasrl.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id J5i-uGd031XL for ; Wed, 18 Jul 2018 11:40:18 +0200 (CEST) Received: from localhost.localdomain (62-11-51-166.dialup.tiscali.it [62.11.51.166]) by mail.micronovasrl.com (Postfix) with ESMTPSA id D6A9EB0018C; Wed, 18 Jul 2018 11:40:16 +0200 (CEST) From: Giulio Benetti To: Alexandre Belloni Cc: Giulio Benetti , Alessandro Zummo , Rob Herring , Mark Rutland , linux-rtc@vger.kernel.org (open list:REAL TIME CLOCK (RTC) SUBSYSTEM), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v9 2/4] rtc: ds1307: support m41t11 variant Date: Wed, 18 Jul 2018 11:40:03 +0200 Message-Id: <20180718094006.105675-1-giulio.benetti@micronovasrl.com> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The m41t11 variant is very similar to the already supported m41t00 and m41t0, but it has also 56 bytes of NVRAM. Add it to driver taking into account NVRAM section. Signed-off-by: Giulio Benetti --- .../devicetree/bindings/rtc/rtc-ds1307.txt | 1 + drivers/rtc/rtc-ds1307.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/Documentation/devicetree/bindings/rtc/rtc-ds1307.txt b/Documentation/devicetree/bindings/rtc/rtc-ds1307.txt index d28d6e7f6ae8..ce6469c1a516 100644 --- a/Documentation/devicetree/bindings/rtc/rtc-ds1307.txt +++ b/Documentation/devicetree/bindings/rtc/rtc-ds1307.txt @@ -13,6 +13,7 @@ Required properties: "maxim,ds3231", "st,m41t0", "st,m41t00", + "st,m41t11", "microchip,mcp7940x", "microchip,mcp7941x", "pericom,pt7c4338", diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c index aa4a161bae98..0162a600ff1b 100644 --- a/drivers/rtc/rtc-ds1307.c +++ b/drivers/rtc/rtc-ds1307.c @@ -44,6 +44,7 @@ enum ds_type { ds_3231, m41t0, m41t00, + m41t11, mcp794xx, rx_8025, rx_8130, @@ -227,6 +228,11 @@ static const struct chip_desc chips[last_ds_type] = { .irq_handler = rx8130_irq, .rtc_ops = &rx8130_rtc_ops, }, + [m41t11] = { + /* this is battery backed SRAM */ + .nvram_offset = 8, + .nvram_size = 56, + }, [mcp794xx] = { .alarm = 1, /* this is battery backed SRAM */ @@ -249,6 +255,7 @@ static const struct i2c_device_id ds1307_id[] = { { "ds3231", ds_3231 }, { "m41t0", m41t0 }, { "m41t00", m41t00 }, + { "m41t11", m41t11 }, { "mcp7940x", mcp794xx }, { "mcp7941x", mcp794xx }, { "pt7c4338", ds_1307 }, @@ -305,6 +312,10 @@ static const struct of_device_id ds1307_of_match[] = { .compatible = "st,m41t00", .data = (void *)m41t00 }, + { + .compatible = "st,m41t11", + .data = (void *)m41t11 + }, { .compatible = "microchip,mcp7940x", .data = (void *)mcp794xx @@ -347,6 +358,7 @@ static const struct acpi_device_id ds1307_acpi_ids[] = { { .id = "DS3231", .driver_data = ds_3231 }, { .id = "M41T0", .driver_data = m41t0 }, { .id = "M41T00", .driver_data = m41t00 }, + { .id = "M41T11", .driver_data = m41t11 }, { .id = "MCP7940X", .driver_data = mcp794xx }, { .id = "MCP7941X", .driver_data = mcp794xx }, { .id = "PT7C4338", .driver_data = ds_1307 }, @@ -1576,6 +1588,7 @@ static int ds1307_probe(struct i2c_client *client, case ds_1307: case m41t0: case m41t00: + case m41t11: /* clock halted? turn it on, so clock can tick. */ if (tmp & DS1307_BIT_CH) { regmap_write(ds1307->regmap, DS1307_REG_SECS, 0); @@ -1641,6 +1654,7 @@ static int ds1307_probe(struct i2c_client *client, case ds_1340: case m41t0: case m41t00: + case m41t11: /* * NOTE: ignores century bits; fix before deploying * systems that will run through year 2100. -- 2.17.1