Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp270115imm; Wed, 18 Jul 2018 01:42:24 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe9AsnVS/wx8KwzIKz09WQyeZJ+wHttfUBOgdJh+3i7Sur0HwhJO3cpUTV2XmpRuHlNvH4c X-Received: by 2002:a63:314f:: with SMTP id x76-v6mr4808257pgx.373.1531903344246; Wed, 18 Jul 2018 01:42:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531903344; cv=none; d=google.com; s=arc-20160816; b=OuiY/scGo0UbBd7cE33y/F7LTS5CY0XQs8QOtwt1J431qdhkA1r5up32K2mL96OsbF 1U52iyDp/I10PMC/8Q35y9fprgfP9QgFO7CaujMyOZmhTSCTBGN2Pl/xqlkxvAUqtyE+ XaMxkA3UcLsaWqMYrX/8Fw/xMoxbLgYDo33bHg69flkeCUl5ZXGKWGhZ4hyskT9IzjQA de12ZT5GNBi5KbBaHsivncGOWtggRaEjJ1X4pFwCJkPA1UGChx+iaBv5j4BHVp4ptXO9 e64HfyTVczKss0z/jJBh/5evukwoJFyOK0jO/Z0HFnEWUF83g7TycAhoMrurw5EsLhHT S2Ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=6baT9oavR9LMugsugO0dwN/+w4oSe/rZ2spCdl5OXkc=; b=dWicJiG8bxvD7dGUwMYkcusZ8sE/19iGPf4XrUjrRR97qYKqx5mMwo+UQfHaBmBC17 f48w+k/nv1UapDMSwByR966oViAo9Zi7RnkmsAQ/pSu51xf4/s8ctlAVIFGA2S+foBSa Jh3zrA4zbrWl9nbn/iqFD8N6Tf4k7vB+mk3vmbqH3RbyyxMiFWYMEmKRicaQPknzIkLs KlHjjO8oiTNlhQEB+aXcLt5DWDuaBW3VDzHfd8CJFaM2UU2UENpkWgOUJToe2/RFA/ah p1Lstv31euVeZS0AvL3LVEAOAoEdFURDocTYT3uVezFVyTvH2OyW22bNzoQpWup/l4do FmWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=temperror (no key for signature) header.i=@micronovasrl.com header.s=dkim header.b=HTLUJqc1; 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 s6-v6si2631308pgg.41.2018.07.18.01.42.09; Wed, 18 Jul 2018 01:42:24 -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=HTLUJqc1; 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 S1730470AbeGRJSP (ORCPT + 99 others); Wed, 18 Jul 2018 05:18:15 -0400 Received: from mail.micronovasrl.com ([212.103.203.10]:58042 "EHLO mail.micronovasrl.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729677AbeGRJSP (ORCPT ); Wed, 18 Jul 2018 05:18:15 -0400 Received: from mail.micronovasrl.com (mail.micronovasrl.com [127.0.0.1]) by mail.micronovasrl.com (Postfix) with ESMTP id 1F68FB00787 for ; Wed, 18 Jul 2018 10:41:26 +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=references:in-reply-to:x-mailer:message-id:date:date:subject :subject:to:from:from; s=dkim; t=1531903285; x=1532767286; bh=WS d/9wvzx+t7T41QY3yKInolV8cyC+RL5+TKQjyvhRo=; b=HTLUJqc176cPY7XTZe F5zL707q+7s9LZXpRILH9Y2qSjPNldPfVjNpWKFwlAMNFkAUeuMi2ZRMOpfWex6A hiGwkCHGIu6z874w5qaq+Wm6KyjSgX6MASArL9Xw+L09mRiosd7YVTu44eYGlywU tfHMgeP9W0Teeb4vSKlqdgC7k= 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 R7ny6cnLF9_0 for ; Wed, 18 Jul 2018 10:41:25 +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 F3E84B006E8; Wed, 18 Jul 2018 10:41:23 +0200 (CEST) From: Giulio Benetti To: Andy Shevchenko Cc: Giulio Benetti , Alessandro Zummo , Alexandre Belloni , 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 2/4] rtc: ds1307: support m41t11 variant Date: Wed, 18 Jul 2018 10:41:15 +0200 Message-Id: <20180718084118.79540-1-giulio.benetti@micronovasrl.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180716213302.GA2751@piout.net> References: <20180716213302.GA2751@piout.net> 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