Received: by 10.192.165.148 with SMTP id m20csp280631imm; Wed, 9 May 2018 12:35:06 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpoOgMBvuWNffOTSuyqbAPjF9ZQ7BGy9ltf/r55RiFArDBB+SPnp0jp1Nxbv73vFGWYPYIB X-Received: by 2002:a63:6a08:: with SMTP id f8-v6mr35110519pgc.363.1525894506853; Wed, 09 May 2018 12:35:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525894506; cv=none; d=google.com; s=arc-20160816; b=hu5GBx8Wzm6Blw7Ahvq+xbM7QzNFSydJKuK4lMx5mcOkiD/QdloQg3KgRuwLYST/pa A5AbtbJ616ISlKJ3yOnCjSCOlEeTF7S+f9O/Qedh2L8pbfxOms+IR06PjEv6UXYd+Awj TdTt0qAmZD6jCf+MUR6FcQkhXlTqkT9vDTWHKuFjKGtYwYeTeRF3n5e0j3It8+PLdC4n KQGLylHCWQQtnS5bVYw01rmV6Hkb57qddDQQmwNKnv1BsnrEUO76cVWgZqUvNm9WjJIV Awot6vXlrPxmAh60k0lfQ1HzrEVCqUv/keWFk7FwmdZG5OaGX63XP93p5TXx7qVW/qx4 +ogg== 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=Y7k8nslAE5qKqlydXLr2sWmDHJYZkbyzapx6ubxCb+k=; b=pYJtoHCJLMS1izRtVvrUKYxWtHaUc/RfAvO0bLS7MOVH0ZLuud2VwhO6h7blQJ1Wb6 Bsidb/mpSbVgmW8a8rnLpH588kQvAhCQpl5mqX2rkhh/mFQo4nrUGR6oSd5qv9D2DLbB lh23F6k63cORXsVIAnDhG+dy7j2oguGvDtY6ufkXem+7xcg8+ie6LmabfotUvLtu3+Ju PZfj0OjnboBTKp7E+NXCVmSzjE5JvBZm9sspPi+0ua6RG5mCAs6UKHLOa4pnOA8f5Knw OMBqqVfcQG8DEF1gw5K51VsixoCVlF1LFzNIIbMlQWHL8wJz4ICJu80ryotCSNrYOL58 kbpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=temperror (no key for signature) header.i=@micronovasrl.com header.s=dkim header.b=T5yFq0Kd; 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 b5-v6si19363833ple.417.2018.05.09.12.34.52; Wed, 09 May 2018 12:35:06 -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=T5yFq0Kd; 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 S965528AbeEITeb (ORCPT + 99 others); Wed, 9 May 2018 15:34:31 -0400 Received: from mail.micronovasrl.com ([212.103.203.10]:33634 "EHLO mail.micronovasrl.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965441AbeEITeD (ORCPT ); Wed, 9 May 2018 15:34:03 -0400 Received: from mail.micronovasrl.com (mail.micronovasrl.com [127.0.0.1]) by mail.micronovasrl.com (Postfix) with ESMTP id 2D1F8B00A8E for ; Wed, 9 May 2018 21:34:02 +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=1525894441; x=1526758442; bh=Ef bBNlPXQGEnqzVhRQOE0fv4Usx+YoRtsHfPqud9hxM=; b=T5yFq0KdigQxl90uhc 43kxeQWzuhkBEetCf9R2o5k5dSpDhxZ7F+pHtNso1z1bJozXWzc+1XaLJfVnUe0c Fv55ScZImcji5fgEPkTCbh61WAPtctoEonaqwPZoPQi6IyFUbJZSscnjFK8FB6FF XLZ4z8yUUZERjzvKZmh70dI7c= 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 2ZjFmnYq-fLF for ; Wed, 9 May 2018 21:34:01 +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 68800B00AD4; Wed, 9 May 2018 21:33:59 +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, Giulio Benetti Subject: [PATCH v3 3/4] rtc: ds1307: add offset sysfs for mt41txx chips. Date: Wed, 9 May 2018 21:33:54 +0200 Message-Id: <20180509193355.49466-3-giulio.benetti@micronovasrl.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180509193355.49466-1-giulio.benetti@micronovasrl.com> References: <20180509193355.49466-1-giulio.benetti@micronovasrl.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org m41txx chips can hold a calibration value to get correct clock bias. If positive offset is passed, it means adding 512 cycles(@32.768Hz) every tick(1s). If negative offset is passed, it means subtracting 256 cycles(@32.768Hz) every tick(1s). Add offset handling (ranging between (-31) and 31) via sysfs. Signed-off-by: Giulio Benetti --- drivers/rtc/rtc-ds1307.c | 70 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c index 0ab0c166da83..33895668b363 100644 --- a/drivers/rtc/rtc-ds1307.c +++ b/drivers/rtc/rtc-ds1307.c @@ -114,6 +114,16 @@ enum ds_type { # define RX8025_BIT_VDET 0x40 # define RX8025_BIT_XST 0x20 +#define M41TXX_REG_CONTROL 0x07 +# define M41TXX_BIT_OUT 0x80 +# define M41TXX_BIT_FT 0x40 +# define M41TXX_BIT_CALIB_SIGN 0x20 +# define M41TXX_M_CALIBRATION 0x1f + +/* Min and max values supported with 'offset' interface by M41TXX */ +#define M41TXX_MIN_OFFSET (-31) +#define M41TXX_MAX_OFFSET (31) + struct ds1307 { enum ds_type type; unsigned long flags; @@ -146,6 +156,9 @@ struct chip_desc { static int ds1307_get_time(struct device *dev, struct rtc_time *t); static int ds1307_set_time(struct device *dev, struct rtc_time *t); +static int ds1337_read_alarm(struct device *dev, struct rtc_wkalrm *t); +static int ds1337_set_alarm(struct device *dev, struct rtc_wkalrm *t); +static int ds1307_alarm_irq_enable(struct device *dev, unsigned int enabled); static u8 do_trickle_setup_ds1339(struct ds1307 *, u32 ohms, bool diode); static irqreturn_t rx8130_irq(int irq, void *dev_id); static int rx8130_read_alarm(struct device *dev, struct rtc_wkalrm *t); @@ -155,6 +168,8 @@ static irqreturn_t mcp794xx_irq(int irq, void *dev_id); static int mcp794xx_read_alarm(struct device *dev, struct rtc_wkalrm *t); static int mcp794xx_set_alarm(struct device *dev, struct rtc_wkalrm *t); static int mcp794xx_alarm_irq_enable(struct device *dev, unsigned int enabled); +static int m41txx_rtc_read_offset(struct device *dev, long *offset); +static int m41txx_rtc_set_offset(struct device *dev, long offset); static const struct rtc_class_ops rx8130_rtc_ops = { .read_time = ds1307_get_time, @@ -172,6 +187,16 @@ static const struct rtc_class_ops mcp794xx_rtc_ops = { .alarm_irq_enable = mcp794xx_alarm_irq_enable, }; +static const struct rtc_class_ops m41txx_rtc_ops = { + .read_time = ds1307_get_time, + .set_time = ds1307_set_time, + .read_alarm = ds1337_read_alarm, + .set_alarm = ds1337_set_alarm, + .alarm_irq_enable = ds1307_alarm_irq_enable, + .read_offset = m41txx_rtc_read_offset, + .set_offset = m41txx_rtc_set_offset, +}; + static const struct chip_desc chips[last_ds_type] = { [ds_1307] = { .nvram_offset = 8, @@ -227,10 +252,17 @@ static const struct chip_desc chips[last_ds_type] = { .irq_handler = rx8130_irq, .rtc_ops = &rx8130_rtc_ops, }, + [m41t0] = { + .rtc_ops = &m41txx_rtc_ops, + }, + [m41t00] = { + .rtc_ops = &m41txx_rtc_ops, + }, [m41t11] = { /* this is battery backed SRAM */ .nvram_offset = 8, .nvram_size = 56, + .rtc_ops = &m41txx_rtc_ops, }, [mcp794xx] = { .alarm = 1, @@ -972,6 +1004,44 @@ static int mcp794xx_alarm_irq_enable(struct device *dev, unsigned int enabled) enabled ? MCP794XX_BIT_ALM0_EN : 0); } +static int m41txx_rtc_read_offset(struct device *dev, long *offset) +{ + struct ds1307 *ds1307 = dev_get_drvdata(dev); + unsigned int ctrl_reg; + u8 val; + + regmap_read(ds1307->regmap, M41TXX_REG_CONTROL, &ctrl_reg); + + val = ctrl_reg & M41TXX_M_CALIBRATION; + + /* check if positive */ + if (ctrl_reg & M41TXX_BIT_CALIB_SIGN) + *offset = val; + else + *offset = -val; + + return 0; +} + +static int m41txx_rtc_set_offset(struct device *dev, long offset) +{ + struct ds1307 *ds1307 = dev_get_drvdata(dev); + unsigned int ctrl_reg; + + if ((offset < M41TXX_MIN_OFFSET) || (offset > M41TXX_MAX_OFFSET)) + return -ERANGE; + + regmap_read(ds1307->regmap, M41TXX_REG_CONTROL, &ctrl_reg); + + ctrl_reg &= ~M41TXX_M_CALIBRATION; + ctrl_reg |= abs(offset) & M41TXX_M_CALIBRATION; + + if (offset >= 0) + ctrl_reg |= M41TXX_BIT_CALIB_SIGN; + + return regmap_write(ds1307->regmap, M41TXX_REG_CONTROL, ctrl_reg); +} + /*----------------------------------------------------------------------*/ static int ds1307_nvram_read(void *priv, unsigned int offset, void *val, -- 2.17.0