rtc: rv3028: fix clock output support
Alexandre Belloni
maintainerPATCH 1/4 rtc: rv3028: fix clock output support
rv3028_clkout_set_rate unconditionally sets RV3028_CLKOUT_CLKOE but clk_set_rate may be called with the clock disabled. Ensure the clock is kept disabled if it was not yet enabled.
Also, the actual rate was overwritten when enabling the clock, properly write to the register only once.
--- drivers/rtc/rtc-rv3028.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
drivers/rtc/rtc-rv3028.c +9 -10
@@ -619,24 +619,23 @@ static int rv3028_clkout_set_rate(struct clk_hw *hw, unsigned long rate, unsigned long parent_rate) {int i, ret; +u32 enabled;struct rv3028_data *rv3028 =clkout_hw_to_rv3028 (hw); + ret =regmap_read (rv3028->regmap,RV3028_CLKOUT , &enabled); +if (ret <0 ) +return ret; + ret =regmap_write (rv3028->regmap,RV3028_CLKOUT ,0x0 );if (ret <0 )return ret; -for (i =0 ; i <ARRAY_SIZE (clkout_rates); i++) { -if (clkout_rates[i] == rate) { - ret =regmap_update_bits (rv3028->regmap, -RV3028_CLKOUT , -RV3028_CLKOUT_FD_MASK , i); -if (ret <0 ) -return ret; + enabled &=RV3028_CLKOUT_CLKOE ; +for (i =0 ; i <ARRAY_SIZE (clkout_rates); i++) +if (clkout_rates[i] == rate)return regmap_write (rv3028->regmap,RV3028_CLKOUT , -RV3028_CLKOUT_CLKSY |RV3028_CLKOUT_CLKOE ); - } - } +RV3028_CLKOUT_CLKSY | enabled | i);return -EINVAL ; }
Signature · 1 line
2.26.2
Alexandre Belloni
maintainerPATCH 2/4 rtc: rv3028: fix trickle resistor values
Version 1.0 of the application manual had the wrong resistor values. Fix them according to version 1.1
--- drivers/rtc/rtc-rv3028.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rtc/rtc-rv3028.c +1 -1
@@ -95,7 +95,7 @@ struct rv3028_data {#endif }; -static u16 rv3028_trickle_resistors[] = {1000 ,3000 ,6000 ,11000 }; +static u16 rv3028_trickle_resistors[] = {3000 ,5000 ,9000 ,15000 }; static ssize_t timestamp0_store(struct device *dev, struct device_attribute *attr,
Signature · 1 line
2.26.2
Alexandre Belloni
maintainerPATCH 3/4 rtc: rv3028: factorize EERD bit handling
In reply to Alexandre BelloniBoth rv3028_eeprom_write and rv3028_eeprom_read enable EERD before sending commands to the EEPROM and restore it afterwards. Factorize this code.
--- drivers/rtc/rtc-rv3028.c | 118 +++++++++++++++++++-------------------- 1 file changed, 59 insertions(+), 59 deletions(-)
drivers/rtc/rtc-rv3028.c +59 -59
@@ -171,6 +171,44 @@ static const struct attribute_group rv3028_attr_group = { .attrs = rv3028_attrs, }; +static int rv3028_exit_eerd (struct rv3028_data *rv3028,u32 eerd) +{ +if (eerd) +return 0 ; + +return regmap_update_bits (rv3028->regmap,RV3028_CTRL1 ,RV3028_CTRL1_EERD ,0 ); +} + +static int rv3028_enter_eerd (struct rv3028_data *rv3028,u32 *eerd) +{ +u32 ctrl1, status; +int ret; + + ret =regmap_read (rv3028->regmap,RV3028_CTRL1 , &ctrl1); +if (ret) +return ret; + + *eerd = ctrl1 &RV3028_CTRL1_EERD ; +if (*eerd) +return 0 ; + + ret =regmap_update_bits (rv3028->regmap,RV3028_CTRL1 , +RV3028_CTRL1_EERD ,RV3028_CTRL1_EERD ); +if (ret) +return ret; + + ret =regmap_read_poll_timeout (rv3028->regmap,RV3028_STATUS , status, + !(status &RV3028_STATUS_EEBUSY ), +RV3028_EEBUSY_POLL ,RV3028_EEBUSY_TIMEOUT ); +if (ret) { +rv3028_exit_eerd (rv3028, *eerd); + +return ret; + } + +return 0 ; +} +static irqreturn_t rv3028_handle_irq (int irq,void *dev_id) {struct rv3028_data *rv3028 = dev_id;
@@ -451,49 +489,36 @@ static int rv3028_nvram_read(void *priv, unsigned int offset, void *val,static int rv3028_eeprom_write (void *priv,unsigned int offset,void *val,size_t bytes) { -u32 status, ctrl1; -int i, ret, err; +struct rv3028_data *rv3028 = priv; +u32 status, eerd; +int i, ret;u8 *buf = val; - ret =regmap_read (priv,RV3028_CTRL1 , &ctrl1); + ret =rv3028_enter_eerd (rv3028, &eerd);if (ret)return ret; -if (!(ctrl1 &RV3028_CTRL1_EERD )) { - ret =regmap_update_bits (priv,RV3028_CTRL1 , -RV3028_CTRL1_EERD ,RV3028_CTRL1_EERD ); -if (ret) -return ret; - - ret =regmap_read_poll_timeout (priv,RV3028_STATUS , status, - !(status &RV3028_STATUS_EEBUSY ), -RV3028_EEBUSY_POLL , -RV3028_EEBUSY_TIMEOUT ); -if (ret) - goto restore_eerd; - } -for (i =0 ; i < bytes; i++) { - ret =regmap_write (priv,RV3028_EEPROM_ADDR , offset + i); + ret =regmap_write (rv3028->regmap,RV3028_EEPROM_ADDR , offset + i);if (ret) goto restore_eerd; - ret =regmap_write (priv,RV3028_EEPROM_DATA , buf[i]); + ret =regmap_write (rv3028->regmap,RV3028_EEPROM_DATA , buf[i]);if (ret) goto restore_eerd; - ret =regmap_write (priv,RV3028_EEPROM_CMD ,0x0 ); + ret =regmap_write (rv3028->regmap,RV3028_EEPROM_CMD ,0x0 );if (ret) goto restore_eerd; - ret =regmap_write (priv,RV3028_EEPROM_CMD , + ret =regmap_write (rv3028->regmap,RV3028_EEPROM_CMD ,RV3028_EEPROM_CMD_WRITE );if (ret) goto restore_eerd;usleep_range (RV3028_EEBUSY_POLL ,RV3028_EEBUSY_TIMEOUT ); - ret =regmap_read_poll_timeout (priv,RV3028_STATUS , status, + ret =regmap_read_poll_timeout (rv3028->regmap,RV3028_STATUS , status, !(status &RV3028_STATUS_EEBUSY ),RV3028_EEBUSY_POLL ,RV3028_EEBUSY_TIMEOUT );
@@ -502,13 +527,7 @@ static int rv3028_eeprom_write(void *priv, unsigned int offset, void *val, } restore_eerd: -if (!(ctrl1 &RV3028_CTRL1_EERD )) - { - err =regmap_update_bits (priv,RV3028_CTRL1 ,RV3028_CTRL1_EERD , -0 ); -if (err && !ret) - ret = err; - } +rv3028_exit_eerd (rv3028, eerd);return ret; }
@@ -516,63 +535,44 @@ static int rv3028_eeprom_write(void *priv, unsigned int offset, void *val,static int rv3028_eeprom_read (void *priv,unsigned int offset,void *val,size_t bytes) { -u32 status, ctrl1, data; -int i, ret, err; +struct rv3028_data *rv3028 = priv; +u32 status, eerd, data; +int i, ret;u8 *buf = val; - ret =regmap_read (priv,RV3028_CTRL1 , &ctrl1); + ret =rv3028_enter_eerd (rv3028, &eerd);if (ret)return ret; -if (!(ctrl1 &RV3028_CTRL1_EERD )) { - ret =regmap_update_bits (priv,RV3028_CTRL1 , -RV3028_CTRL1_EERD ,RV3028_CTRL1_EERD ); -if (ret) -return ret; - - ret =regmap_read_poll_timeout (priv,RV3028_STATUS , status, - !(status &RV3028_STATUS_EEBUSY ), -RV3028_EEBUSY_POLL , -RV3028_EEBUSY_TIMEOUT ); -if (ret) - goto restore_eerd; - } -for (i =0 ; i < bytes; i++) { - ret =regmap_write (priv,RV3028_EEPROM_ADDR , offset + i); + ret =regmap_write (rv3028->regmap,RV3028_EEPROM_ADDR , offset + i);if (ret) goto restore_eerd; - ret =regmap_write (priv,RV3028_EEPROM_CMD ,0x0 ); + ret =regmap_write (rv3028->regmap,RV3028_EEPROM_CMD ,0x0 );if (ret) goto restore_eerd; - ret =regmap_write (priv,RV3028_EEPROM_CMD , + ret =regmap_write (rv3028->regmap,RV3028_EEPROM_CMD ,RV3028_EEPROM_CMD_READ );if (ret) goto restore_eerd; - ret =regmap_read_poll_timeout (priv,RV3028_STATUS , status, + ret =regmap_read_poll_timeout (rv3028->regmap,RV3028_STATUS , status, !(status &RV3028_STATUS_EEBUSY ),RV3028_EEBUSY_POLL ,RV3028_EEBUSY_TIMEOUT );if (ret) goto restore_eerd; - ret =regmap_read (priv,RV3028_EEPROM_DATA , &data); + ret =regmap_read (rv3028->regmap,RV3028_EEPROM_DATA , &data);if (ret) goto restore_eerd; buf[i] = data; } restore_eerd: -if (!(ctrl1 &RV3028_CTRL1_EERD )) - { - err =regmap_update_bits (priv,RV3028_CTRL1 ,RV3028_CTRL1_EERD , -0 ); -if (err && !ret) - ret = err; - } +rv3028_exit_eerd (rv3028, eerd);return ret; }
@@ -834,7 +834,7 @@ static int rv3028_probe(struct i2c_client *client) nvmem_cfg.priv = rv3028->regmap;rtc_nvmem_register (rv3028->rtc, &nvmem_cfg); - eeprom_cfg.priv = rv3028->regmap; + eeprom_cfg.priv = rv3028;rtc_nvmem_register (rv3028->rtc, &eeprom_cfg); rv3028->rtc->max_user_freq =1 ;
Signature · 1 line
2.26.2
Alexandre Belloni
maintainerPATCH 4/4 rtc: rv3028: ensure ram configuration registers are saved
In reply to Alexandre BelloniIf RV3028_CTRL1_EERD is not set (this is the default), the RTC will refresh the RAM configuration registers from the EEPROM at midnight. It is necessary to save the RAM registers back to EEPROM after modifying them.
--- drivers/rtc/rtc-rv3028.c | 76 +++++++++++++++++++++++++++++++++++----- 1 file changed, 67 insertions(+), 9 deletions(-)
drivers/rtc/rtc-rv3028.c +67 -9
@@ -71,6 +71,7 @@#define RV3028_EVT_CTRL_TSR BIT(2) +#define RV3028_EEPROM_CMD_UPDATE 0x11#define RV3028_EEPROM_CMD_WRITE 0x21#define RV3028_EEPROM_CMD_READ 0x22
@@ -209,6 +210,50 @@ static int rv3028_enter_eerd(struct rv3028_data *rv3028, u32 *eerd)return 0 ; } +static int rv3028_update_eeprom (struct rv3028_data *rv3028,u32 eerd) +{ +u32 status; +int ret; + + ret =regmap_write (rv3028->regmap,RV3028_EEPROM_CMD ,0x0 ); +if (ret) + goto exit_eerd; + + ret =regmap_write (rv3028->regmap,RV3028_EEPROM_CMD ,RV3028_EEPROM_CMD_UPDATE ); +if (ret) + goto exit_eerd; + +usleep_range (63000 ,RV3028_EEBUSY_TIMEOUT ); + + ret =regmap_read_poll_timeout (rv3028->regmap,RV3028_STATUS , status, + !(status &RV3028_STATUS_EEBUSY ), +RV3028_EEBUSY_POLL ,RV3028_EEBUSY_TIMEOUT ); + +exit_eerd: +rv3028_exit_eerd (rv3028, eerd); + +return ret; +} + +static int rv3028_update_cfg (struct rv3028_data *rv3028,unsigned int reg, +unsigned int mask,unsigned int val) +{ +u32 eerd; +int ret; + + ret =rv3028_enter_eerd (rv3028, &eerd); +if (ret) +return ret; + + ret =regmap_update_bits (rv3028->regmap, reg, mask, val); +if (ret) { +rv3028_exit_eerd (rv3028, eerd); +return ret; + } + +return rv3028_update_eeprom (rv3028, eerd); +} +static irqreturn_t rv3028_handle_irq (int irq,void *dev_id) {struct rv3028_data *rv3028 = dev_id;
@@ -442,17 +487,32 @@ static int rv3028_read_offset(struct device *dev, long *offset)static int rv3028_set_offset (struct device *dev,long offset) {struct rv3028_data *rv3028 =dev_get_drvdata (dev); +u32 eerd;int ret; offset =clamp (offset,-244141L ,243187L ) *1000 ; offset =DIV_ROUND_CLOSEST (offset,OFFSET_STEP_PPT ); + ret =rv3028_enter_eerd (rv3028, &eerd); +if (ret) +return ret; + ret =regmap_write (rv3028->regmap,RV3028_OFFSET , offset >>1 );if (ret <0 ) -return ret; + goto exit_eerd; + + ret =regmap_update_bits (rv3028->regmap,RV3028_BACKUP ,BIT (7 ), + offset <<7 ); +if (ret <0 ) + goto exit_eerd; + +return rv3028_update_eeprom (rv3028, eerd); + +exit_eerd: +rv3028_exit_eerd (rv3028, eerd); + +return ret; -return regmap_update_bits (rv3028->regmap,RV3028_BACKUP ,BIT (7 ), - offset <<7 ); }static int rv3028_ioctl (struct device *dev,unsigned int cmd,unsigned long arg)
@@ -634,8 +694,8 @@ static int rv3028_clkout_set_rate(struct clk_hw *hw, unsigned long rate,for (i =0 ; i <ARRAY_SIZE (clkout_rates); i++)if (clkout_rates[i] == rate) -return regmap_write (rv3028->regmap,RV3028_CLKOUT , -RV3028_CLKOUT_CLKSY | enabled | i); +return rv3028_update_cfg (rv3028,RV3028_CLKOUT ,0xff , +RV3028_CLKOUT_CLKSY | enabled | i);return -EINVAL ; }
@@ -810,10 +870,8 @@ static int rv3028_probe(struct i2c_client *client)break ;if (i <ARRAY_SIZE (rv3028_trickle_resistors)) { - ret =regmap_update_bits (rv3028->regmap,RV3028_BACKUP , -RV3028_BACKUP_TCE | -RV3028_BACKUP_TCR_MASK , -RV3028_BACKUP_TCE | i); + ret =rv3028_update_cfg (rv3028,RV3028_BACKUP ,RV3028_BACKUP_TCE | +RV3028_BACKUP_TCR_MASK ,RV3028_BACKUP_TCE | i);if (ret)return ret; }else {
Signature · 1 line
2.26.2