LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH 1/4] rtc: ds1307: fix data pointer to m41t0
@ 2018-05-08 14:56 Giulio Benetti
  2018-05-08 14:56 ` [PATCH 2/4] rtc: ds1307: support m41t11 variant Giulio Benetti
                   ` (2 more replies)
  0 siblings, 3 replies; 11+ messages in thread
From: Giulio Benetti @ 2018-05-08 14:56 UTC (permalink / raw)
  To: a.zummo
  Cc: alexandre.belloni, robh+dt, mark.rutland, linux-rtc, devicetree,
	linux-kernel, Giulio Benetti

data field points to m41t00, instead it should point to m41t0.
Driver works correctly because on both cases(m41t0 and m41t00) chip_desc
are equal.

Point to right enum m41t0 instead of m41t00.

Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
---
 drivers/rtc/rtc-ds1307.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
index a13e59edff53..32aadcbc377f 100644
--- a/drivers/rtc/rtc-ds1307.c
+++ b/drivers/rtc/rtc-ds1307.c
@@ -298,7 +298,7 @@ static const struct of_device_id ds1307_of_match[] = {
 	},
 	{
 		.compatible = "st,m41t0",
-		.data = (void *)m41t00
+		.data = (void *)m41t0
 	},
 	{
 		.compatible = "st,m41t00",
-- 
2.17.0

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* Re: [PATCH v6 3/4] rtc: ds1307: add offset sysfs for mt41txx chips.
@ 2018-07-16 21:33 Alexandre Belloni
  2018-07-18  8:41 ` [PATCH 2/4] rtc: ds1307: support m41t11 variant Giulio Benetti
  0 siblings, 1 reply; 11+ messages in thread
From: Alexandre Belloni @ 2018-07-16 21:33 UTC (permalink / raw)
  To: Giulio Benetti
  Cc: a.zummo, robh+dt, mark.rutland, linux-rtc, devicetree,
	linux-kernel, andy.shevchenko

Hi,

On 16/05/2018 23:08:41+0200, Giulio Benetti wrote:
> m41txx chips can hold a calibration value to get correct clock bias.
> 
> Add offset handling (ranging between -63ppm and 126ppm) via sysfs.
> 
> Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
> ---
>  drivers/rtc/rtc-ds1307.c | 81 ++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 81 insertions(+)
> 
> diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
> index 0ab0c166da83..2797d01bfa1d 100644
> --- a/drivers/rtc/rtc-ds1307.c
> +++ b/drivers/rtc/rtc-ds1307.c
> @@ -114,6 +114,20 @@ 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

Please use BIT()

> +#	define M41TXX_M_CALIBRATION	0x1f
> +
> +/* negative offset step is -2.034ppm */
> +#define M41TXX_NEG_OFFSET_STEP_PPM	2034

This should be named M41TXX_NEG_OFFSET_STEP_PPB

> +/* positive offset step is +4.068ppm */
> +#define M41TXX_POS_OFFSET_STEP_PPM	4068

and M41TXX_POS_OFFSET_STEP_PPB

> +/* Min and max values supported with 'offset' interface by M41TXX */
> +#define M41TXX_MIN_OFFSET	(((-31) * M41TXX_NEG_OFFSET_STEP_PPM) / 1000)
> +#define M41TXX_MAX_OFFSET	(((31) * M41TXX_POS_OFFSET_STEP_PPM) / 1000)
> +

I don't see the point of dividing by 1000 here, it is definitively
better to keep everything in PPB.

>  struct ds1307 {
>  	enum ds_type		type;
>  	unsigned long		flags;
> @@ -146,6 +160,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 +172,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 +191,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 +256,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 +1008,51 @@ 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 * M41TXX_POS_OFFSET_STEP_PPM);
> +	else
> +		*offset = -(val * M41TXX_NEG_OFFSET_STEP_PPM);
> +
> +	*offset = DIV_ROUND_CLOSEST(*offset, 1000);
> +

This is definitively not necessary, the whole subsystem handles PPB, not
PPM.

> +	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;
> +
> +	offset *= 1000;
> +

ditto

> +	if (offset >= 0) {
> +		ctrl_reg = DIV_ROUND_CLOSEST(offset,
> +					     M41TXX_POS_OFFSET_STEP_PPM);
> +		ctrl_reg |= M41TXX_BIT_CALIB_SIGN;
> +	} else {
> +		ctrl_reg = DIV_ROUND_CLOSEST(abs(offset),
> +					     M41TXX_NEG_OFFSET_STEP_PPM);
> +	}
> +
> +	return regmap_update_bits(ds1307->regmap, M41TXX_REG_CONTROL,
> +				  M41TXX_M_CALIBRATION | M41TXX_BIT_CALIB_SIGN,
> +				  ctrl_reg);
> +}
> +
>  /*----------------------------------------------------------------------*/
>  
>  static int ds1307_nvram_read(void *priv, unsigned int offset, void *val,
> -- 
> 2.17.0
> 

-- 
Alexandre Belloni, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2018-07-18  8:41 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-08 14:56 [PATCH 1/4] rtc: ds1307: fix data pointer to m41t0 Giulio Benetti
2018-05-08 14:56 ` [PATCH 2/4] rtc: ds1307: support m41t11 variant Giulio Benetti
2018-05-08 14:56 ` [PATCH 3/4] rtc: ds1307: add calibration of_ for mt41txx chips Giulio Benetti
2018-05-08 17:40   ` Rob Herring
2018-05-09 18:33     ` Giulio Benetti
2018-05-08 19:19   ` Alexandre Belloni
2018-05-09 18:31     ` Giulio Benetti
2018-05-08 14:56 ` [PATCH 4/4] rtc: ds1307: add frequency-test property to check calibration on m41txx Giulio Benetti
2018-05-08 17:44   ` Rob Herring
2018-05-09 18:32     ` Giulio Benetti
2018-07-16 21:33 [PATCH v6 3/4] rtc: ds1307: add offset sysfs for mt41txx chips Alexandre Belloni
2018-07-18  8:41 ` [PATCH 2/4] rtc: ds1307: support m41t11 variant Giulio Benetti
2018-07-18  8:41   ` [PATCH 1/4] rtc: ds1307: fix data pointer to m41t0 Giulio Benetti

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).