3 files changed, 34 insertions, 15 deletions

diff --git a/include/linux/iio/common/st_sensors.h b/include/linux/iio/common/st_sensors.h
index 172c5b23cb84..72b26940730d 100644
--- a/include/linux/iio/common/st_sensors.h
+++ b/include/linux/iio/common/st_sensors.h
@@ -24,14 +24,10 @@
 #define ST_SENSORS_FULLSCALE_AVL_MAX            10
 
 #define ST_SENSORS_NUMBER_ALL_CHANNELS          4
-#define ST_SENSORS_NUMBER_DATA_CHANNELS         3
 #define ST_SENSORS_ENABLE_ALL_AXIS              0x07
-#define ST_SENSORS_BYTE_FOR_CHANNEL             2
 #define ST_SENSORS_SCAN_X                       0
 #define ST_SENSORS_SCAN_Y                       1
 #define ST_SENSORS_SCAN_Z                       2
-#define ST_SENSORS_DEFAULT_12_REALBITS          12
-#define ST_SENSORS_DEFAULT_16_REALBITS          16
 #define ST_SENSORS_DEFAULT_POWER_ON_VALUE       0x01
 #define ST_SENSORS_DEFAULT_POWER_OFF_VALUE      0x00
 #define ST_SENSORS_DEFAULT_WAI_ADDRESS          0x0f
@@ -42,20 +38,20 @@
 #define ST_SENSORS_MAX_NAME                     17
 #define ST_SENSORS_MAX_4WAI                     7
 
-#define ST_SENSORS_LSM_CHANNELS(device_type, index, mod, endian, bits, addr) \
+#define ST_SENSORS_LSM_CHANNELS(device_type, mask, index, mod, \
+                                        ch2, s, endian, rbits, sbits, addr) \
 { \
         .type = device_type, \
-        .modified = 1, \
-        .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
-                        BIT(IIO_CHAN_INFO_SCALE), \
+        .modified = mod, \
+        .info_mask_separate = mask, \
         .scan_index = index, \
-        .channel2 = mod, \
+        .channel2 = ch2, \
         .address = addr, \
         .scan_type = { \
-                .sign = 's', \
-                .realbits = bits, \
-                .shift = 16 - bits, \
-                .storagebits = 16, \
+                .sign = s, \
+                .realbits = rbits, \
+                .shift = sbits - rbits, \
+                .storagebits = sbits, \
                 .endianness = endian, \
         }, \
 }
@@ -204,6 +200,7 @@ struct st_sensors {
  * @multiread_bit: Use or not particular bit for [I2C/SPI] multiread.
  * @buffer_data: Data used by buffer part.
  * @odr: Output data rate of the sensor [Hz].
+ * num_data_channels: Number of data channels used in buffer.
  * @get_irq_data_ready: Function to get the IRQ used for data ready signal.
  * @tf: Transfer function structure used by I/O operations.
  * @tb: Transfer buffers and mutex used by I/O operations.
@@ -220,6 +217,7 @@ struct st_sensor_data {
         char *buffer_data;
 
         unsigned int odr;
+        unsigned int num_data_channels;
 
         unsigned int (*get_irq_data_ready) (struct iio_dev *indio_dev);
 
diff --git a/include/linux/iio/frequency/adf4350.h b/include/linux/iio/frequency/adf4350.h
index be91f344d5fc..ffd8c8f90928 100644
--- a/include/linux/iio/frequency/adf4350.h
+++ b/include/linux/iio/frequency/adf4350.h
@@ -1,7 +1,7 @@
 /*
  * ADF4350/ADF4351 SPI PLL driver
  *
- * Copyright 2012 Analog Devices Inc.
+ * Copyright 2012-2013 Analog Devices Inc.
  *
  * Licensed under the GPL-2.
  */
@@ -41,7 +41,7 @@
 #define ADF4350_REG2_RDIV2_EN                   (1 << 24)
 #define ADF4350_REG2_RMULT2_EN                  (1 << 25)
 #define ADF4350_REG2_MUXOUT(x)                  ((x) << 26)
-#define ADF4350_REG2_NOISE_MODE(x)              ((x) << 29)
+#define ADF4350_REG2_NOISE_MODE(x)              (((unsigned)(x)) << 29)
 #define ADF4350_MUXOUT_THREESTATE               0
 #define ADF4350_MUXOUT_DVDD                     1
 #define ADF4350_MUXOUT_GND                      2
diff --git a/include/linux/platform_data/ad7303.h b/include/linux/platform_data/ad7303.h
new file mode 100644
index 000000000000..de6a7a6b4bbf
--- /dev/null
+++ b/include/linux/platform_data/ad7303.h
@@ -0,0 +1,21 @@
+/*
+ * Analog Devices AD7303 DAC driver
+ *
+ * Copyright 2013 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2.
+ */
+
+#ifndef __IIO_ADC_AD7303_H__
+#define __IIO_ADC_AD7303_H__
+
+/**
+ * struct ad7303_platform_data - AD7303 platform data
+ * @use_external_ref: If set to true use an external voltage reference connected
+ * to the REF pin, otherwise use the internal reference derived from Vdd.
+ */
+struct ad7303_platform_data {
+        bool use_external_ref;
+};
+
+#endif