Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75b61022 authored by Magnus Damm's avatar Magnus Damm Committed by Linus Torvalds
Browse files

rtc: add support for Epson RTC-9701JE V4



Add support for the Epson RTC-9701JE SPI RTC device.

Signed-off-by: default avatarMagnus Damm <damm@igel.co.jp>
Acked-by: default avatarAlessandro Zummo <a.zummo@towertech.it>
Acked-by: default avatarDavid Brownell <david-b@pacbell.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2805b969
Loading
Loading
Loading
Loading
+10 −27
Original line number Diff line number Diff line
/* drivers/rtc/rtc-r9701.c
 *
/*
 * Driver for Epson RTC-9701JE
 *
 * Copyright (C) 2008 Magnus Damm
 *
 * Based on drivers/rtc/rtc-max6902.c
 * Based on rtc-max6902.c
 *
 * Copyright (C) 2006 8D Technologies inc.
 * Copyright (C) 2004 Compulab Ltd.
@@ -72,13 +71,12 @@ static int read_regs(struct device *dev, unsigned char *regs, int no_regs)

static int r9701_get_datetime(struct device *dev, struct rtc_time *dt)
{
	struct spi_device *spi = to_spi_device(dev);
	unsigned long time;
	int ret;
	unsigned char buf[] = { RSECCNT, RMINCNT, RHRCNT,
				RDAYCNT, RMONCNT, RYRCNT };

	ret = read_regs(&spi->dev, buf, ARRAY_SIZE(buf));
	ret = read_regs(dev, buf, ARRAY_SIZE(buf));
	if (ret)
		return ret;

@@ -96,17 +94,7 @@ static int r9701_get_datetime(struct device *dev, struct rtc_time *dt)
	 * according to the data sheet. make sure they are valid.
	 */

	ret = rtc_valid_tm(dt);
	if (ret)
		return ret;

	/* don't bother with yday, wday and isdst.
	 * let the rtc core calculate them for us.
	 */

	rtc_tm_to_time(dt, &time);
	rtc_time_to_tm(time, dt);
	return 0;
	return rtc_valid_tm(dt);
}

static int r9701_set_datetime(struct device *dev, struct rtc_time *dt)
@@ -118,12 +106,12 @@ static int r9701_set_datetime(struct device *dev, struct rtc_time *dt)
		return -EINVAL;

	ret = write_reg(dev, RHRCNT, BIN2BCD(dt->tm_hour));
	ret |= write_reg(dev, RMINCNT, BIN2BCD(dt->tm_min));
	ret |= write_reg(dev, RSECCNT, BIN2BCD(dt->tm_sec));
	ret |= write_reg(dev, RDAYCNT, BIN2BCD(dt->tm_mday));
	ret |= write_reg(dev, RMONCNT, BIN2BCD(dt->tm_mon + 1));
	ret |= write_reg(dev, RYRCNT, BIN2BCD(dt->tm_year - 100));
	ret |= write_reg(dev, RWKCNT, 1 << dt->tm_wday);
	ret = ret ? ret : write_reg(dev, RMINCNT, BIN2BCD(dt->tm_min));
	ret = ret ? ret : write_reg(dev, RSECCNT, BIN2BCD(dt->tm_sec));
	ret = ret ? ret : write_reg(dev, RDAYCNT, BIN2BCD(dt->tm_mday));
	ret = ret ? ret : write_reg(dev, RMONCNT, BIN2BCD(dt->tm_mon + 1));
	ret = ret ? ret : write_reg(dev, RYRCNT, BIN2BCD(dt->tm_year - 100));
	ret = ret ? ret : write_reg(dev, RWKCNT, 1 << dt->tm_wday);

	return ret;
}
@@ -146,10 +134,6 @@ static int __devinit r9701_probe(struct spi_device *spi)

	dev_set_drvdata(&spi->dev, rtc);

	spi->mode = SPI_MODE_3;
	spi->bits_per_word = 8;
	spi_setup(spi);

	tmp = R100CNT;
	res = read_regs(&spi->dev, &tmp, 1);
	if (res || tmp != 0x20) {
@@ -171,7 +155,6 @@ static int __devexit r9701_remove(struct spi_device *spi)
static struct spi_driver r9701_driver = {
	.driver = {
		.name	= "rtc-r9701",
		.bus	= &spi_bus_type,
		.owner	= THIS_MODULE,
	},
	.probe	= r9701_probe,