Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 304471
b: refs/heads/master
c: cae329e
h: refs/heads/master
i:
  304469: 787e6b1
  304467: 37f3c48
  304463: dc181f0
v: v3
  • Loading branch information
Lars-Peter Clausen authored and Greg Kroah-Hartman committed Apr 25, 2012
1 parent 8c58c64 commit cfb3d9e
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 54 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 83f0f5723eb86ed0fcdeafde4a495303a1e19004
refs/heads/master: cae329e04ac1f187338d0febd4e1ddf81db582cf
75 changes: 26 additions & 49 deletions trunk/drivers/staging/iio/dac/ad5446.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,35 +24,16 @@

#include "ad5446.h"

static int ad5446_store_sample(struct ad5446_state *st, unsigned val)
static int ad5446_write(struct ad5446_state *st, unsigned val)
{
__be16 data = cpu_to_be16(val);
return spi_write(st->spi, &data, sizeof(data));
}

static int ad5660_store_sample(struct ad5446_state *st, unsigned val)
static int ad5660_write(struct ad5446_state *st, unsigned val)
{
uint8_t data[3];

val |= AD5660_LOAD;
data[0] = (val >> 16) & 0xFF;
data[1] = (val >> 8) & 0xFF;
data[2] = val & 0xFF;

return spi_write(st->spi, data, sizeof(data));
}

static int ad5620_store_pwr_down(struct ad5446_state *st, unsigned mode)
{
__be16 data = cpu_to_be16(mode << 14);
return spi_write(st->spi, &data, sizeof(data));
}

static int ad5660_store_pwr_down(struct ad5446_state *st, unsigned mode)
{
unsigned val = mode << 16;
uint8_t data[3];

data[0] = (val >> 16) & 0xFF;
data[1] = (val >> 8) & 0xFF;
data[2] = val & 0xFF;
Expand Down Expand Up @@ -114,6 +95,8 @@ static ssize_t ad5446_write_dac_powerdown(struct iio_dev *indio_dev,
const char *buf, size_t len)
{
struct ad5446_state *st = iio_priv(indio_dev);
unsigned int shift;
unsigned int val;
bool powerdown;
int ret;

Expand All @@ -124,11 +107,14 @@ static ssize_t ad5446_write_dac_powerdown(struct iio_dev *indio_dev,
mutex_lock(&indio_dev->mlock);
st->pwr_down = powerdown;

if (st->pwr_down)
ret = st->chip_info->store_pwr_down(st, st->pwr_down_mode);
else
ret = st->chip_info->store_sample(st, st->cached_val);
if (st->pwr_down) {
shift = chan->scan_type.realbits + chan->scan_type.shift;
val = st->pwr_down_mode << shift;
} else {
val = st->cached_val;
}

ret = st->chip_info->write(st, val);
mutex_unlock(&indio_dev->mlock);

return ret ? ret : len;
Expand Down Expand Up @@ -171,74 +157,65 @@ static const struct iio_chan_spec_ext_info ad5064_ext_info_powerdown[] = {
static const struct ad5446_chip_info ad5446_chip_info_tbl[] = {
[ID_AD5444] = {
.channel = AD5446_CHANNEL(12, 16, 2),
.store_sample = ad5446_store_sample,
.write = ad5446_write,
},
[ID_AD5446] = {
.channel = AD5446_CHANNEL(14, 16, 0),
.store_sample = ad5446_store_sample,
.write = ad5446_write,
},
[ID_AD5541A] = {
.channel = AD5446_CHANNEL(16, 16, 0),
.store_sample = ad5446_store_sample,
.write = ad5446_write,
},
[ID_AD5512A] = {
.channel = AD5446_CHANNEL(12, 16, 4),
.store_sample = ad5446_store_sample,
.write = ad5446_write,
},
[ID_AD5553] = {
.channel = AD5446_CHANNEL(14, 16, 0),
.store_sample = ad5446_store_sample,
.write = ad5446_write,
},
[ID_AD5601] = {
.channel = AD5446_CHANNEL_POWERDOWN(8, 16, 6),
.store_sample = ad5446_store_sample,
.store_pwr_down = ad5620_store_pwr_down,
.write = ad5446_write,
},
[ID_AD5611] = {
.channel = AD5446_CHANNEL_POWERDOWN(10, 16, 4),
.store_sample = ad5446_store_sample,
.store_pwr_down = ad5620_store_pwr_down,
.write = ad5446_write,
},
[ID_AD5621] = {
.channel = AD5446_CHANNEL_POWERDOWN(12, 16, 2),
.store_sample = ad5446_store_sample,
.store_pwr_down = ad5620_store_pwr_down,
.write = ad5446_write,
},
[ID_AD5620_2500] = {
.channel = AD5446_CHANNEL_POWERDOWN(12, 16, 2),
.int_vref_mv = 2500,
.store_sample = ad5446_store_sample,
.store_pwr_down = ad5620_store_pwr_down,
.write = ad5446_write,
},
[ID_AD5620_1250] = {
.channel = AD5446_CHANNEL_POWERDOWN(12, 16, 2),
.int_vref_mv = 1250,
.store_sample = ad5446_store_sample,
.store_pwr_down = ad5620_store_pwr_down,
.write = ad5446_write,
},
[ID_AD5640_2500] = {
.channel = AD5446_CHANNEL_POWERDOWN(14, 16, 0),
.int_vref_mv = 2500,
.store_sample = ad5446_store_sample,
.store_pwr_down = ad5620_store_pwr_down,
.write = ad5446_write,
},
[ID_AD5640_1250] = {
.channel = AD5446_CHANNEL_POWERDOWN(14, 16, 0),
.int_vref_mv = 1250,
.store_sample = ad5446_store_sample,
.store_pwr_down = ad5620_store_pwr_down,
.write = ad5446_write,
},
[ID_AD5660_2500] = {
.channel = AD5446_CHANNEL_POWERDOWN(16, 16, 0),
.int_vref_mv = 2500,
.store_sample = ad5660_store_sample,
.store_pwr_down = ad5660_store_pwr_down,
.write = ad5660_write,
},
[ID_AD5660_1250] = {
.channel = AD5446_CHANNEL_POWERDOWN(16, 16, 0),
.int_vref_mv = 1250,
.store_sample = ad5660_store_sample,
.store_pwr_down = ad5660_store_pwr_down,
.write = ad5660_write,
},
};

Expand Down Expand Up @@ -280,7 +257,7 @@ static int ad5446_write_raw(struct iio_dev *indio_dev,
mutex_lock(&indio_dev->mlock);
st->cached_val = val;
if (!st->pwr_down)
ret = st->chip_info->store_sample(st, val);
ret = st->chip_info->write(st, val);
mutex_unlock(&indio_dev->mlock);
break;
default:
Expand Down
6 changes: 2 additions & 4 deletions trunk/drivers/staging/iio/dac/ad5446.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,13 @@ struct ad5446_state {
* struct ad5446_chip_info - chip specific information
* @channel: channel spec for the DAC
* @int_vref_mv: AD5620/40/60: the internal reference voltage
* @store_sample: chip specific helper function to store the datum
* @store_sample: chip specific helper function to store the powerpown cmd
* @write: chip specific helper function to write to the register
*/

struct ad5446_chip_info {
struct iio_chan_spec channel;
u16 int_vref_mv;
int (*store_sample) (struct ad5446_state *st, unsigned val);
int (*store_pwr_down) (struct ad5446_state *st, unsigned mode);
int (*write)(struct ad5446_state *st, unsigned val);
};

/**
Expand Down

0 comments on commit cfb3d9e

Please sign in to comment.