Received: by 2002:ac0:a594:0:0:0:0:0 with SMTP id m20-v6csp2511214imm; Wed, 16 May 2018 14:11:48 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrdYcZqh5xv44ZmWZDrI+Ox1LVjMZ2iwuap7Dv+3F4YxMwhjUWSUpHcnAqDHGe8N1/iyYvI X-Received: by 2002:a63:7f4b:: with SMTP id p11-v6mr1040038pgn.80.1526505108572; Wed, 16 May 2018 14:11:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526505108; cv=none; d=google.com; s=arc-20160816; b=IXYmkEq4mT6mb1pwYZ93S7+ll7k72kRdVZdkwl9r+fmAWWhdj7ccHBcU32sgVgljxP LDSTPOl7rGbOKjeOyCGmFNJYIWjrIcH3D2Pyef2ubjjfZhOVLCGGrbQPYtJcX0n1Uosn ZmmkQERgI54EB/xcay83siT0RbYRRUfTssY57hqU9ZMIEMcHOM2F6ItLjEzEjtjg0AoP Y6F3ZWBZB87E+c4HXyaoCk7hWr8FFOHXNcLItQ8wzuvslP42kJ/Uae03UZNqyyYsPJ4K 92SAB+oDKHJ//y9KTt7j4uxhgAa4fMJIzHmEZIxbu25tpQY7CpWVW38/P+eYjCVL7R8i yCZQ== 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=r/OatEmNHwQUKuDOiwrnaRxlpkKDis+mvzqvsu4G3sw=; b=CZiVxbFN5VRK4Tv3SZoVnAtsGhW3AHEwBQm5U1rlmNiFQbuBR78L3lPPYZSjYQ8R2l 4NzD94/OtSdHAQ7c/AFQzJpHnBZkBUECsH7yHoRC8QjZ4lVk1Lod8KF2ULvvBSIdRpTU TZX1LDHZVXU5e9B3m6G9dP2j2Fau60Mqt6D0Cg+bOqrC07CV6AxFQely7/LaWiWUNf8V kovbDZljSPefEaSU8WqPxEb1+7dlL3V5AjifFTO/y5uS9GX+BvNnj+QY/gskJiUN+Zw+ 7JrZdXqmVFkLX6iu+S0W84wnPPNt9PVL1McUbdV7+MC3yYSWSuyHWTjr1/B4D3wgbgYX VOSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=temperror (no key for signature) header.i=@micronovasrl.com header.s=dkim header.b=uHTx2bp+; 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 h10-v6si2753196pgp.496.2018.05.16.14.11.34; Wed, 16 May 2018 14:11:48 -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=uHTx2bp+; 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 S1752381AbeEPVK3 (ORCPT + 99 others); Wed, 16 May 2018 17:10:29 -0400 Received: from mail.micronovasrl.com ([212.103.203.10]:55366 "EHLO mail.micronovasrl.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751880AbeEPVIx (ORCPT ); Wed, 16 May 2018 17:08:53 -0400 Received: from mail.micronovasrl.com (mail.micronovasrl.com [127.0.0.1]) by mail.micronovasrl.com (Postfix) with ESMTP id 2B6DCB008FC for ; Wed, 16 May 2018 23:08:52 +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=1526504931; x=1527368932; bh=EI pJ9GdokAbg3XsS8XKE4NtMy7/BOt0Ww6UG442qvsE=; b=uHTx2bp+QVJHURw4ls 6+pRkPNlULULByHx1kDtLv7ykZUgf59yE7QZE4ZLLP8yLECT73LEnfZEgGUmYoLO Tn66vYihFo3d4gJgp1IawheN2P4y2Yb+abDiRXRjaYxVCwsR+rVZx+J2PUU28Fbo Y751U/S7iS8pOOhRhBWT1ZV80= 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 AawreejFtoc8 for ; Wed, 16 May 2018 23:08:51 +0200 (CEST) Received: from localhost.localdomain (unknown [192.168.123.79]) by mail.micronovasrl.com (Postfix) with ESMTPSA id 1AB20B00126; Wed, 16 May 2018 23:08:50 +0200 (CEST) From: Giulio Benetti To: a.zummo@towertech.it, alexandre.belloni@bootlin.com Cc: robh+dt@kernel.org, mark.rutland@arm.com, linux-rtc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, andy.shevchenko@gmail.com, Giulio Benetti Subject: [PATCH v6 2/4] rtc: ds1307: support m41t11 variant Date: Wed, 16 May 2018 23:08:40 +0200 Message-Id: <20180516210842.5874-2-giulio.benetti@micronovasrl.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180516210842.5874-1-giulio.benetti@micronovasrl.com> References: <20180516210842.5874-1-giulio.benetti@micronovasrl.com> 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 32aadcbc377f..0ab0c166da83 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, @@ -226,6 +227,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 */ @@ -248,6 +254,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 }, @@ -304,6 +311,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 @@ -346,6 +357,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 }, @@ -1574,6 +1586,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); @@ -1639,6 +1652,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.0