microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

rtc: pcf2123: port to regmap 

Also remove pcf2123_delay_trec. This claimed to add a 30ns delay to SPI
writes, but I could not see any reference to this requirement in the
datasheet. Closest thing I could find to a requirement are timings for the
SPI chip enable line, which cannot be controlled by this driver (the ndelay
came after the call to spi_write_then_read, which means it would sleep
after CE has already gone inactive). Things seem to work fine without it.

Signed-off-by: Dylan Howey <Dylan.Howey@tennantco.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
This commit is contained in:
Dylan Howey 2019-05-03 19:52:10 +00:00 коммит произвёл Alexandre Belloni
Родитель 2372a7d32b
Коммит 790d033933
1 изменённых файлов: 61 добавлений и 81 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

142
drivers/rtc/rtc-pcf2123.c
Просмотреть файл

@ -44,6 +44,7 @@
#include <linux/rtc.h> #include <linux/rtc.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/regmap.h>
/* REGISTERS */ /* REGISTERS */
#define PCF2123_REG_CTRL1 (0x00) /* Control Register 1 */ #define PCF2123_REG_CTRL1 (0x00) /* Control Register 1 */
@ -98,6 +99,7 @@
#define OFFSET_SIGN_BIT 6 /* 2's complement sign bit */ #define OFFSET_SIGN_BIT 6 /* 2's complement sign bit */
#define OFFSET_COARSE BIT(7) /* Coarse mode offset */ #define OFFSET_COARSE BIT(7) /* Coarse mode offset */
#define OFFSET_STEP (2170) /* Offset step in parts per billion */ #define OFFSET_STEP (2170) /* Offset step in parts per billion */
#define OFFSET_MASK GENMASK(6, 0) /* Offset value */
/* READ/WRITE ADDRESS BITS */ /* READ/WRITE ADDRESS BITS */
#define PCF2123_WRITE BIT(4) #define PCF2123_WRITE BIT(4)
@ -108,66 +110,33 @@ static struct spi_driver pcf2123_driver;
struct pcf2123_plat_data { struct pcf2123_plat_data {
struct rtc_device *rtc; struct rtc_device *rtc;
struct regmap *map;
}; };
/* static const struct regmap_config pcf2123_regmap_config = {
* Causes a 30 nanosecond delay to ensure that the PCF2123 chip select .reg_bits = 8,
* is released properly after an SPI write. This function should be .val_bits = 8,
* called after EVERY read/write call over SPI. .read_flag_mask = PCF2123_READ,
*/ .write_flag_mask = PCF2123_WRITE,
static inline void pcf2123_delay_trec(void) .max_register = PCF2123_REG_CTDWN_TMR,
{ };
ndelay(30);
}
static int pcf2123_read(struct device *dev, u8 reg, u8 *rxbuf, size_t size)
{
struct spi_device *spi = to_spi_device(dev);
int ret;
reg |= PCF2123_READ;
ret = spi_write_then_read(spi, &reg, 1, rxbuf, size);
pcf2123_delay_trec();
return ret;
}
static int pcf2123_write(struct device *dev, u8 *txbuf, size_t size)
{
struct spi_device *spi = to_spi_device(dev);
int ret;
txbuf[0] |= PCF2123_WRITE;
ret = spi_write(spi, txbuf, size);
pcf2123_delay_trec();
return ret;
}
static int pcf2123_write_reg(struct device *dev, u8 reg, u8 val)
{
u8 txbuf[2];
txbuf[0] = reg;
txbuf[1] = val;
return pcf2123_write(dev, txbuf, sizeof(txbuf));
}
static int pcf2123_read_offset(struct device *dev, long *offset) static int pcf2123_read_offset(struct device *dev, long *offset)
{ {
int ret; struct pcf2123_plat_data *pdata = dev_get_platdata(dev);
s8 reg; int ret, val;
unsigned int reg;
ret = pcf2123_read(dev, PCF2123_REG_OFFSET, &reg, 1); ret = regmap_read(pdata->map, PCF2123_REG_OFFSET, &reg);
if (ret < 0) if (ret)
return ret; return ret;
if (reg & OFFSET_COARSE) val = sign_extend32((reg & OFFSET_MASK), OFFSET_SIGN_BIT);
reg <<= 1; /* multiply by 2 and sign extend */
else
reg = sign_extend32(reg, OFFSET_SIGN_BIT);
*offset = ((long)reg) * OFFSET_STEP; if (reg & OFFSET_COARSE)
val *= 2;
*offset = ((long)val) * OFFSET_STEP;
return 0; return 0;
} }
@ -184,6 +153,7 @@ static int pcf2123_read_offset(struct device *dev, long *offset)
*/ */
static int pcf2123_set_offset(struct device *dev, long offset) static int pcf2123_set_offset(struct device *dev, long offset)
{ {
struct pcf2123_plat_data *pdata = dev_get_platdata(dev);
s8 reg; s8 reg;
if (offset > OFFSET_STEP * 127) if (offset > OFFSET_STEP * 127)
@ -203,16 +173,18 @@ static int pcf2123_set_offset(struct device *dev, long offset)
reg |= OFFSET_COARSE; reg |= OFFSET_COARSE;
} }
return pcf2123_write_reg(dev, PCF2123_REG_OFFSET, reg); return regmap_write(pdata->map, PCF2123_REG_OFFSET, (unsigned int)reg);
} }
static int pcf2123_rtc_read_time(struct device *dev, struct rtc_time *tm) static int pcf2123_rtc_read_time(struct device *dev, struct rtc_time *tm)
{ {
struct pcf2123_plat_data *pdata = dev_get_platdata(dev);
u8 rxbuf[7]; u8 rxbuf[7];
int ret; int ret;
ret = pcf2123_read(dev, PCF2123_REG_SC, rxbuf, sizeof(rxbuf)); ret = regmap_bulk_read(pdata->map, PCF2123_REG_SC, rxbuf,
if (ret < 0) sizeof(rxbuf));
if (ret)
return ret; return ret;
if (rxbuf[0] & OSC_HAS_STOPPED) { if (rxbuf[0] & OSC_HAS_STOPPED) {
@ -241,7 +213,8 @@ static int pcf2123_rtc_read_time(struct device *dev, struct rtc_time *tm)
static int pcf2123_rtc_set_time(struct device *dev, struct rtc_time *tm) static int pcf2123_rtc_set_time(struct device *dev, struct rtc_time *tm)
{ {
u8 txbuf[8]; struct pcf2123_plat_data *pdata = dev_get_platdata(dev);
u8 txbuf[7];
int ret; int ret;
dev_dbg(dev, "%s: tm is secs=%d, mins=%d, hours=%d, " dev_dbg(dev, "%s: tm is secs=%d, mins=%d, hours=%d, "
@ -251,27 +224,27 @@ static int pcf2123_rtc_set_time(struct device *dev, struct rtc_time *tm)
tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday); tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
/* Stop the counter first */ /* Stop the counter first */
ret = pcf2123_write_reg(dev, PCF2123_REG_CTRL1, CTRL1_STOP); ret = regmap_write(pdata->map, PCF2123_REG_CTRL1, CTRL1_STOP);
if (ret < 0) if (ret)
return ret; return ret;
/* Set the new time */ /* Set the new time */
txbuf[0] = PCF2123_REG_SC; txbuf[0] = bin2bcd(tm->tm_sec & 0x7F);
txbuf[1] = bin2bcd(tm->tm_sec & 0x7F); txbuf[1] = bin2bcd(tm->tm_min & 0x7F);
txbuf[2] = bin2bcd(tm->tm_min & 0x7F); txbuf[2] = bin2bcd(tm->tm_hour & 0x3F);
txbuf[3] = bin2bcd(tm->tm_hour & 0x3F); txbuf[3] = bin2bcd(tm->tm_mday & 0x3F);
txbuf[4] = bin2bcd(tm->tm_mday & 0x3F); txbuf[4] = tm->tm_wday & 0x07;
txbuf[5] = tm->tm_wday & 0x07; txbuf[5] = bin2bcd((tm->tm_mon + 1) & 0x1F); /* rtc mn 1-12 */
txbuf[6] = bin2bcd((tm->tm_mon + 1) & 0x1F); /* rtc mn 1-12 */ txbuf[6] = bin2bcd(tm->tm_year < 100 ? tm->tm_year : tm->tm_year - 100);
txbuf[7] = bin2bcd(tm->tm_year < 100 ? tm->tm_year : tm->tm_year - 100);
ret = pcf2123_write(dev, txbuf, sizeof(txbuf)); ret = regmap_bulk_write(pdata->map, PCF2123_REG_SC, txbuf,
if (ret < 0) sizeof(txbuf));
if (ret)
return ret; return ret;
/* Start the counter */ /* Start the counter */
ret = pcf2123_write_reg(dev, PCF2123_REG_CTRL1, CTRL1_CLEAR); ret = regmap_write(pdata->map, PCF2123_REG_CTRL1, CTRL1_CLEAR);
if (ret < 0) if (ret)
return ret; return ret;
return 0; return 0;
@ -279,33 +252,33 @@ static int pcf2123_rtc_set_time(struct device *dev, struct rtc_time *tm)
static int pcf2123_reset(struct device *dev) static int pcf2123_reset(struct device *dev)
{ {
struct pcf2123_plat_data *pdata = dev_get_platdata(dev);
int ret; int ret;
u8 rxbuf[2]; unsigned int val = 0;
ret = pcf2123_write_reg(dev, PCF2123_REG_CTRL1, CTRL1_SW_RESET); ret = regmap_write(pdata->map, PCF2123_REG_CTRL1, CTRL1_SW_RESET);
if (ret < 0) if (ret)
return ret; return ret;
/* Stop the counter */ /* Stop the counter */
dev_dbg(dev, "stopping RTC\n"); dev_dbg(dev, "stopping RTC\n");
ret = pcf2123_write_reg(dev, PCF2123_REG_CTRL1, CTRL1_STOP); ret = regmap_write(pdata->map, PCF2123_REG_CTRL1, CTRL1_STOP);
if (ret < 0) if (ret)
return ret; return ret;
/* See if the counter was actually stopped */ /* See if the counter was actually stopped */
dev_dbg(dev, "checking for presence of RTC\n"); dev_dbg(dev, "checking for presence of RTC\n");
ret = pcf2123_read(dev, PCF2123_REG_CTRL1, rxbuf, sizeof(rxbuf)); ret = regmap_read(pdata->map, PCF2123_REG_CTRL1, &val);
if (ret < 0) if (ret)
return ret; return ret;
dev_dbg(dev, "received data from RTC (0x%02X 0x%02X)\n", dev_dbg(dev, "received data from RTC (0x%08X)\n", val);
rxbuf[0], rxbuf[1]); if (!(val & CTRL1_STOP))
if (!(rxbuf[0] & CTRL1_STOP))
return -ENODEV; return -ENODEV;
/* Start the counter */ /* Start the counter */
ret = pcf2123_write_reg(dev, PCF2123_REG_CTRL1, CTRL1_CLEAR); ret = regmap_write(pdata->map, PCF2123_REG_CTRL1, CTRL1_CLEAR);
if (ret < 0) if (ret)
return ret; return ret;
return 0; return 0;
@ -332,6 +305,13 @@ static int pcf2123_probe(struct spi_device *spi)
return -ENOMEM; return -ENOMEM;
spi->dev.platform_data = pdata; spi->dev.platform_data = pdata;
pdata->map = devm_regmap_init_spi(spi, &pcf2123_regmap_config);
if (IS_ERR(pdata->map)) {
dev_err(&spi->dev, "regmap init failed.\n");
goto kfree_exit;
}
ret = pcf2123_rtc_read_time(&spi->dev, &tm); ret = pcf2123_rtc_read_time(&spi->dev, &tm);
if (ret < 0) { if (ret < 0) {
ret = pcf2123_reset(&spi->dev); ret = pcf2123_reset(&spi->dev);