[Linux-kernel-commits] [8446] trunk/drivers/staging/iio/meter/ade7759.c: [#5905], New IIO driver for ade77xx

[bhsong]

Title: [8446] trunk/drivers/staging/iio/meter/ade7759.c: [#5905], New IIO driver for ade77xx

Revision

8446

Author

bhsong

Date

2010-03-11 05:10:37 -0500 (Thu, 11 Mar 2010)

Log Message

[#5905], New IIO driver for ade77xx
ade7759 clean-up

Modified Paths

trunk/drivers/staging/iio/meter/ade7759.c

Diff

Modified: trunk/drivers/staging/iio/meter/ade7759.c (8445 => 8446)

--- trunk/drivers/staging/iio/meter/ade7759.c	2010-03-11 10:03:32 UTC (rev 8445)
+++ trunk/drivers/staging/iio/meter/ade7759.c	2010-03-11 10:10:37 UTC (rev 8446)
@@ -261,12 +261,12 @@
 static int ade7759_reset(struct device *dev)
 {
 	int ret;
-	u8 val;
-	ade7759_spi_read_reg_8(dev,
+	u16 val;
+	ade7759_spi_read_reg_16(dev,
 			ADE7759_MODE,
 			&val);
 	val |= 1 << 6; /* Software Chip Reset */
-	ret = ade7759_spi_write_reg_8(dev,
+	ret = ade7759_spi_write_reg_16(dev,
 			ADE7759_MODE,
 			val);
 
@@ -362,12 +362,12 @@
 int ade7759_stop_device(struct device *dev)
 {
 	int ret;
-	u8 val;
-	ade7759_spi_read_reg_8(dev,
+	u16 val;
+	ade7759_spi_read_reg_16(dev,
 			ADE7759_MODE,
 			&val);
 	val |= 1 << 4;  /* AD converters can be turned off */
-	ret = ade7759_spi_write_reg_8(dev,
+	ret = ade7759_spi_write_reg_16(dev,
 			ADE7759_MODE,
 			val);
 
@@ -403,16 +403,16 @@
 		char *buf)
 {
 	int ret, len = 0;
-	u8 t;
+	u16 t;
 	int sps;
-	ret = ade7759_spi_read_reg_8(dev,
+	ret = ade7759_spi_read_reg_16(dev,
 			ADE7759_MODE,
 			&t);
 	if (ret)
 		return ret;
 
 	t = (t >> 3) & 0x3;
-	sps = 26000 / (1 + t);
+	sps = 27900 / (1 + t);
 
 	len = sprintf(buf, "%d SPS\n", sps);
 	return len;
@@ -427,7 +427,7 @@
 	struct ade7759_state *st = iio_dev_get_devdata(indio_dev);
 	unsigned long val;
 	int ret;
-	u8 reg, t;
+	u16 reg, t;
 
 	ret = strict_strtol(buf, 10, &val);
 	if (ret)
@@ -444,7 +444,7 @@
 	else
 		st->us->max_speed_hz = ADE7759_SPI_FAST;
 
-	ret = ade7759_spi_read_reg_8(dev,
+	ret = ade7759_spi_read_reg_16(dev,
 			ADE7759_MODE,
 			&reg);
 	if (ret)
@@ -453,7 +453,7 @@
 	reg &= ~(3 << 13);
 	reg |= t << 13;
 
-	ret = ade7759_spi_write_reg_8(dev,
+	ret = ade7759_spi_write_reg_16(dev,
 			ADE7759_MODE,
 			reg);
 
@@ -463,8 +463,8 @@
 	return ret ? ret : len;
 }
 static IIO_DEV_ATTR_TEMP(ade7759_read_8bit);
-static IIO_CONST_ATTR(temp_offset, "129 C");
-static IIO_CONST_ATTR(temp_scale, "4 C");
+static IIO_CONST_ATTR(temp_offset, "70 C");
+static IIO_CONST_ATTR(temp_scale, "1 C");
 
 static IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO,
 		ade7759_read_frequency,

_______________________________________________
Linux-kernel-commits mailing list
Linux-kernel-commits@blackfin.uclinux.org
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits