From 23a749795a6997967b94a7ea8557469958120c1c Mon Sep 17 00:00:00 2001 From: Michael Hennerich Date: Thu, 10 Mar 2011 13:26:48 +0100 Subject: [PATCH] --- yaml --- r: 236404 b: refs/heads/master c: 2b61535a6e210358255c872b3187e48869e16e27 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/dac/Kconfig | 3 ++- trunk/drivers/staging/iio/dac/ad5446.c | 24 ++++++++++++++++++++++++ trunk/drivers/staging/iio/dac/ad5446.h | 3 +++ 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0115795f34a2..6ffdc95cd538 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bbed4dc791036e97cbe844935dece153fdace0dc +refs/heads/master: 2b61535a6e210358255c872b3187e48869e16e27 diff --git a/trunk/drivers/staging/iio/dac/Kconfig b/trunk/drivers/staging/iio/dac/Kconfig index 3c72871389a2..67defcb359b1 100644 --- a/trunk/drivers/staging/iio/dac/Kconfig +++ b/trunk/drivers/staging/iio/dac/Kconfig @@ -15,7 +15,8 @@ config AD5446 depends on SPI help Say yes here to build support for Analog Devices AD5444, AD5446, - AD5512A, AD5542A, AD5543, AD5553, AD5620, AD5640, AD5660 DACs. + AD5512A, AD5542A, AD5543, AD5553, AD5601, AD5611, AD5620, AD5621, + AD5640, AD5660 DACs. To compile this driver as a module, choose M here: the module will be called ad5446. diff --git a/trunk/drivers/staging/iio/dac/ad5446.c b/trunk/drivers/staging/iio/dac/ad5446.c index 861a7eacdaf7..8623a72e046c 100644 --- a/trunk/drivers/staging/iio/dac/ad5446.c +++ b/trunk/drivers/staging/iio/dac/ad5446.c @@ -269,6 +269,27 @@ static const struct ad5446_chip_info ad5446_chip_info_tbl[] = { .left_shift = 0, .store_sample = ad5542_store_sample, }, + [ID_AD5601] = { + .bits = 8, + .storagebits = 16, + .left_shift = 6, + .store_sample = ad5542_store_sample, + .store_pwr_down = ad5620_store_pwr_down, + }, + [ID_AD5611] = { + .bits = 10, + .storagebits = 16, + .left_shift = 4, + .store_sample = ad5542_store_sample, + .store_pwr_down = ad5620_store_pwr_down, + }, + [ID_AD5621] = { + .bits = 12, + .storagebits = 16, + .left_shift = 2, + .store_sample = ad5542_store_sample, + .store_pwr_down = ad5620_store_pwr_down, + }, [ID_AD5620_2500] = { .bits = 12, .storagebits = 16, @@ -424,6 +445,9 @@ static const struct spi_device_id ad5446_id[] = { {"ad5542a", ID_AD5542A}, {"ad5543", ID_AD5543}, {"ad5553", ID_AD5553}, + {"ad5601", ID_AD5601}, + {"ad5611", ID_AD5611}, + {"ad5621", ID_AD5621}, {"ad5620-2500", ID_AD5620_2500}, /* AD5620/40/60: */ {"ad5620-1250", ID_AD5620_1250}, /* part numbers may look differently */ {"ad5640-2500", ID_AD5640_2500}, diff --git a/trunk/drivers/staging/iio/dac/ad5446.h b/trunk/drivers/staging/iio/dac/ad5446.h index e9397a6783c5..7ac63ab8a11d 100644 --- a/trunk/drivers/staging/iio/dac/ad5446.h +++ b/trunk/drivers/staging/iio/dac/ad5446.h @@ -96,6 +96,9 @@ enum ad5446_supported_device_ids { ID_AD5543, ID_AD5512A, ID_AD5553, + ID_AD5601, + ID_AD5611, + ID_AD5621, ID_AD5620_2500, ID_AD5620_1250, ID_AD5640_2500,