10 files changed, 56 insertions, 30 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index a136dfbb8eea..c0441ab2f8b0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5507,6 +5507,7 @@ M:	Alex Elder <elder@kernel.org>
 M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 S:      Maintained
 F:      drivers/staging/greybus/
+L:      greybus-dev@lists.linaro.org
 
 GREYBUS AUDIO PROTOCOLS DRIVERS
 M:      Vaibhav Agarwal <vaibhav.sr@gmail.com>
diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
index f6b6d42385e1..784670e2736b 100644
--- a/drivers/iio/accel/st_accel_core.c
+++ b/drivers/iio/accel/st_accel_core.c
@@ -353,12 +353,12 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = {
                                 [0] = {
                                         .num = ST_ACCEL_FS_AVL_2G,
                                         .value = 0x00,
-                                        .gain = IIO_G_TO_M_S_2(1024),
+                                        .gain = IIO_G_TO_M_S_2(1000),
                                 },
                                 [1] = {
                                         .num = ST_ACCEL_FS_AVL_6G,
                                         .value = 0x01,
-                                        .gain = IIO_G_TO_M_S_2(340),
+                                        .gain = IIO_G_TO_M_S_2(3000),
                                 },
                         },
                 },
@@ -366,6 +366,14 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = {
                         .addr = 0x21,
                         .mask = 0x40,
                 },
+                /*
+                 * Data Alignment Setting - needs to be set to get
+                 * left-justified data like all other sensors.
+                 */
+                .das = {
+                        .addr = 0x21,
+                        .mask = 0x01,
+                },
                 .drdy_irq = {
                         .addr = 0x21,
                         .mask_int1 = 0x04,
diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index 38bc319904c4..9c8b558ba19e 100644
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -561,7 +561,7 @@ config TI_ADS8688
 
 config TI_AM335X_ADC
         tristate "TI's AM335X ADC driver"
-        depends on MFD_TI_AM335X_TSCADC
+        depends on MFD_TI_AM335X_TSCADC && HAS_DMA
         select IIO_BUFFER
         select IIO_KFIFO_BUF
         help
diff --git a/drivers/iio/common/st_sensors/st_sensors_buffer.c b/drivers/iio/common/st_sensors/st_sensors_buffer.c
index fe7775bb3740..df4045203a07 100644
--- a/drivers/iio/common/st_sensors/st_sensors_buffer.c
+++ b/drivers/iio/common/st_sensors/st_sensors_buffer.c
@@ -30,7 +30,9 @@ static int st_sensors_get_buffer_element(struct iio_dev *indio_dev, u8 *buf)
 
         for_each_set_bit(i, indio_dev->active_scan_mask, num_data_channels) {
                 const struct iio_chan_spec *channel = &indio_dev->channels[i];
-                unsigned int bytes_to_read = channel->scan_type.realbits >> 3;
+                unsigned int bytes_to_read =
+                        DIV_ROUND_UP(channel->scan_type.realbits +
+                                     channel->scan_type.shift, 8);
                 unsigned int storage_bytes =
                         channel->scan_type.storagebits >> 3;
 
diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c
index 975a1f19f747..79c8c7cd70d5 100644
--- a/drivers/iio/common/st_sensors/st_sensors_core.c
+++ b/drivers/iio/common/st_sensors/st_sensors_core.c
@@ -401,6 +401,15 @@ int st_sensors_init_sensor(struct iio_dev *indio_dev,
                         return err;
         }
 
+        /* set DAS */
+        if (sdata->sensor_settings->das.addr) {
+                err = st_sensors_write_data_with_mask(indio_dev,
+                                        sdata->sensor_settings->das.addr,
+                                        sdata->sensor_settings->das.mask, 1);
+                if (err < 0)
+                        return err;
+        }
+
         if (sdata->int_pin_open_drain) {
                 dev_info(&indio_dev->dev,
                          "set interrupt line to open drain mode\n");
@@ -483,8 +492,10 @@ static int st_sensors_read_axis_data(struct iio_dev *indio_dev,
         int err;
         u8 *outdata;
         struct st_sensor_data *sdata = iio_priv(indio_dev);
-        unsigned int byte_for_channel = ch->scan_type.realbits >> 3;
+        unsigned int byte_for_channel;
 
+        byte_for_channel = DIV_ROUND_UP(ch->scan_type.realbits +
+                                        ch->scan_type.shift, 8);
         outdata = kmalloc(byte_for_channel, GFP_KERNEL);
         if (!outdata)
                 return -ENOMEM;
diff --git a/drivers/iio/counter/104-quad-8.c b/drivers/iio/counter/104-quad-8.c
index 2d2ee353dde7..a5913e97945e 100644
--- a/drivers/iio/counter/104-quad-8.c
+++ b/drivers/iio/counter/104-quad-8.c
@@ -153,7 +153,7 @@ static int quad8_write_raw(struct iio_dev *indio_dev,
                 ior_cfg = val | priv->preset_enable[chan->channel] << 1;
 
                 /* Load I/O control configuration */
-                outb(0x40 | ior_cfg, base_offset);
+                outb(0x40 | ior_cfg, base_offset + 1);
 
                 return 0;
         case IIO_CHAN_INFO_SCALE:
@@ -233,7 +233,7 @@ static ssize_t quad8_read_set_to_preset_on_index(struct iio_dev *indio_dev,
         const struct quad8_iio *const priv = iio_priv(indio_dev);
 
         return snprintf(buf, PAGE_SIZE, "%u\n",
-                priv->preset_enable[chan->channel]);
+                !priv->preset_enable[chan->channel]);
 }
 
 static ssize_t quad8_write_set_to_preset_on_index(struct iio_dev *indio_dev,
@@ -241,7 +241,7 @@ static ssize_t quad8_write_set_to_preset_on_index(struct iio_dev *indio_dev,
         size_t len)
 {
         struct quad8_iio *const priv = iio_priv(indio_dev);
-        const int base_offset = priv->base + 2 * chan->channel;
+        const int base_offset = priv->base + 2 * chan->channel + 1;
         bool preset_enable;
         int ret;
         unsigned int ior_cfg;
@@ -250,6 +250,9 @@ static ssize_t quad8_write_set_to_preset_on_index(struct iio_dev *indio_dev,
         if (ret)
                 return ret;
 
+        /* Preset enable is active low in Input/Output Control register */
+        preset_enable = !preset_enable;
+
         priv->preset_enable[chan->channel] = preset_enable;
 
         ior_cfg = priv->ab_enable[chan->channel] |
@@ -362,7 +365,7 @@ static int quad8_set_synchronous_mode(struct iio_dev *indio_dev,
         priv->synchronous_mode[chan->channel] = synchronous_mode;
 
         /* Load Index Control configuration to Index Control Register */
-        outb(0x40 | idr_cfg, base_offset);
+        outb(0x60 | idr_cfg, base_offset);
 
         return 0;
 }
@@ -444,7 +447,7 @@ static int quad8_set_index_polarity(struct iio_dev *indio_dev,
         priv->index_polarity[chan->channel] = index_polarity;
 
         /* Load Index Control configuration to Index Control Register */
-        outb(0x40 | idr_cfg, base_offset);
+        outb(0x60 | idr_cfg, base_offset);
 
         return 0;
 }
diff --git a/drivers/iio/imu/bmi160/bmi160_core.c b/drivers/iio/imu/bmi160/bmi160_core.c
index 5355507f8fa1..c9e319bff58b 100644
--- a/drivers/iio/imu/bmi160/bmi160_core.c
+++ b/drivers/iio/imu/bmi160/bmi160_core.c
@@ -66,10 +66,8 @@
 
 #define BMI160_REG_DUMMY                0x7F
 
-#define BMI160_ACCEL_PMU_MIN_USLEEP     3200
-#define BMI160_ACCEL_PMU_MAX_USLEEP     3800
-#define BMI160_GYRO_PMU_MIN_USLEEP      55000
-#define BMI160_GYRO_PMU_MAX_USLEEP      80000
+#define BMI160_ACCEL_PMU_MIN_USLEEP     3800
+#define BMI160_GYRO_PMU_MIN_USLEEP      80000
 #define BMI160_SOFTRESET_USLEEP         1000
 
 #define BMI160_CHANNEL(_type, _axis, _index) {                  \
@@ -151,20 +149,9 @@ static struct bmi160_regs bmi160_regs[] = {
         },
 };
 
-struct bmi160_pmu_time {
-        unsigned long min;
-        unsigned long max;
-};
-
-static struct bmi160_pmu_time bmi160_pmu_time[] = {
-        [BMI160_ACCEL] = {
-                .min = BMI160_ACCEL_PMU_MIN_USLEEP,
-                .max = BMI160_ACCEL_PMU_MAX_USLEEP
-        },
-        [BMI160_GYRO] = {
-                .min = BMI160_GYRO_PMU_MIN_USLEEP,
-                .max = BMI160_GYRO_PMU_MIN_USLEEP,
-        },
+static unsigned long bmi160_pmu_time[] = {
+        [BMI160_ACCEL] = BMI160_ACCEL_PMU_MIN_USLEEP,
+        [BMI160_GYRO] = BMI160_GYRO_PMU_MIN_USLEEP,
 };
 
 struct bmi160_scale {
@@ -289,7 +276,7 @@ int bmi160_set_mode(struct bmi160_data *data, enum bmi160_sensor_type t,
         if (ret < 0)
                 return ret;
 
-        usleep_range(bmi160_pmu_time[t].min, bmi160_pmu_time[t].max);
+        usleep_range(bmi160_pmu_time[t], bmi160_pmu_time[t] + 1000);
 
         return 0;
 }
diff --git a/drivers/iio/light/max44000.c b/drivers/iio/light/max44000.c
index a144ca3461fc..81bd8e8da4a6 100644
--- a/drivers/iio/light/max44000.c
+++ b/drivers/iio/light/max44000.c
@@ -113,7 +113,7 @@ static const char max44000_int_time_avail_str[] =
         "0.100 "
         "0.025 "
         "0.00625 "
-        "0.001625";
+        "0.0015625";
 
 /* Available scales (internal to ulux) with pretty manual alignment: */
 static const int max44000_scale_avail_ulux_array[] = {
diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
index 8130dfe89745..4971aa54756a 100644
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
@@ -770,6 +770,7 @@ static int cvm_oct_probe(struct platform_device *pdev)
                         /* Initialize the device private structure. */
                         struct octeon_ethernet *priv = netdev_priv(dev);
 
+                        SET_NETDEV_DEV(dev, &pdev->dev);
                         dev->netdev_ops = &cvm_oct_pow_netdev_ops;
                         priv->imode = CVMX_HELPER_INTERFACE_MODE_DISABLED;
                         priv->port = CVMX_PIP_NUM_INPUT_PORTS;
@@ -816,6 +817,7 @@ static int cvm_oct_probe(struct platform_device *pdev)
                         }
 
                         /* Initialize the device private structure. */
+                        SET_NETDEV_DEV(dev, &pdev->dev);
                         priv = netdev_priv(dev);
                         priv->netdev = dev;
                         priv->of_node = cvm_oct_node_for_port(pip, interface,
diff --git a/include/linux/iio/common/st_sensors.h b/include/linux/iio/common/st_sensors.h
index 228bd44efa4c..497f2b3a5a62 100644
--- a/include/linux/iio/common/st_sensors.h
+++ b/include/linux/iio/common/st_sensors.h
@@ -116,6 +116,16 @@ struct st_sensor_bdu {
 };
 
 /**
+ * struct st_sensor_das - ST sensor device data alignment selection
+ * @addr: address of the register.
+ * @mask: mask to write the das flag for left alignment.
+ */
+struct st_sensor_das {
+        u8 addr;
+        u8 mask;
+};
+
+/**
  * struct st_sensor_data_ready_irq - ST sensor device data-ready interrupt
  * @addr: address of the register.
  * @mask_int1: mask to enable/disable IRQ on INT1 pin.
@@ -185,6 +195,7 @@ struct st_sensor_transfer_function {
  * @enable_axis: Enable one or more axis of the sensor.
  * @fs: Full scale register and full scale list available.
  * @bdu: Block data update register.
+ * @das: Data Alignment Selection register.
  * @drdy_irq: Data ready register of the sensor.
  * @multi_read_bit: Use or not particular bit for [I2C/SPI] multi-read.
  * @bootime: samples to discard when sensor passing from power-down to power-up.
@@ -200,6 +211,7 @@ struct st_sensor_settings {
         struct st_sensor_axis enable_axis;
         struct st_sensor_fullscale fs;
         struct st_sensor_bdu bdu;
+        struct st_sensor_das das;
         struct st_sensor_data_ready_irq drdy_irq;
         bool multi_read_bit;
         unsigned int bootime;