Merge 4.1-rc4 into staging-next

We want the fixes in here for testing and merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

6 files changed, 53 insertions, 43 deletions

diff --git a/drivers/iio/adc/axp288_adc.c b/drivers/iio/adc/axp288_adc.c
index 08bcfb061ca5..56008a86b78f 100644
--- a/drivers/iio/adc/axp288_adc.c
+++ b/drivers/iio/adc/axp288_adc.c
@@ -53,39 +53,42 @@ static const struct iio_chan_spec const axp288_adc_channels[] = {
                 .channel = 0,
                 .address = AXP288_TS_ADC_H,
                 .datasheet_name = "TS_PIN",
+                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
         }, {
                 .indexed = 1,
                 .type = IIO_TEMP,
                 .channel = 1,
                 .address = AXP288_PMIC_ADC_H,
                 .datasheet_name = "PMIC_TEMP",
+                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
         }, {
                 .indexed = 1,
                 .type = IIO_TEMP,
                 .channel = 2,
                 .address = AXP288_GP_ADC_H,
                 .datasheet_name = "GPADC",
+                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
         }, {
                 .indexed = 1,
                 .type = IIO_CURRENT,
                 .channel = 3,
                 .address = AXP20X_BATT_CHRG_I_H,
                 .datasheet_name = "BATT_CHG_I",
-                .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED),
+                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
         }, {
                 .indexed = 1,
                 .type = IIO_CURRENT,
                 .channel = 4,
                 .address = AXP20X_BATT_DISCHRG_I_H,
                 .datasheet_name = "BATT_DISCHRG_I",
-                .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED),
+                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
         }, {
                 .indexed = 1,
                 .type = IIO_VOLTAGE,
                 .channel = 5,
                 .address = AXP20X_BATT_V_H,
                 .datasheet_name = "BATT_V",
-                .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED),
+                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
         },
 };
 
@@ -151,9 +154,6 @@ static int axp288_adc_read_raw(struct iio_dev *indio_dev,
                                                 chan->address))
                         dev_err(&indio_dev->dev, "TS pin restore\n");
                 break;
-        case IIO_CHAN_INFO_PROCESSED:
-                ret = axp288_adc_read_channel(val, chan->address, info->regmap);
-                break;
         default:
                 ret = -EINVAL;
         }
diff --git a/drivers/iio/adc/cc10001_adc.c b/drivers/iio/adc/cc10001_adc.c
index 51e2a83c9404..115f6e99a7fa 100644
--- a/drivers/iio/adc/cc10001_adc.c
+++ b/drivers/iio/adc/cc10001_adc.c
@@ -35,8 +35,9 @@
 #define CC10001_ADC_EOC_SET             BIT(0)
 
 #define CC10001_ADC_CHSEL_SAMPLED       0x0c
-#define CC10001_ADC_POWER_UP            0x10
-#define CC10001_ADC_POWER_UP_SET        BIT(0)
+#define CC10001_ADC_POWER_DOWN          0x10
+#define CC10001_ADC_POWER_DOWN_SET      BIT(0)
+
 #define CC10001_ADC_DEBUG               0x14
 #define CC10001_ADC_DATA_COUNT          0x20
 
@@ -62,7 +63,6 @@ struct cc10001_adc_device {
         u16 *buf;
 
         struct mutex lock;
-        unsigned long channel_map;
         unsigned int start_delay_ns;
         unsigned int eoc_delay_ns;
 };
@@ -79,6 +79,18 @@ static inline u32 cc10001_adc_read_reg(struct cc10001_adc_device *adc_dev,
         return readl(adc_dev->reg_base + reg);
 }
 
+static void cc10001_adc_power_up(struct cc10001_adc_device *adc_dev)
+{
+        cc10001_adc_write_reg(adc_dev, CC10001_ADC_POWER_DOWN, 0);
+        ndelay(adc_dev->start_delay_ns);
+}
+
+static void cc10001_adc_power_down(struct cc10001_adc_device *adc_dev)
+{
+        cc10001_adc_write_reg(adc_dev, CC10001_ADC_POWER_DOWN,
+                              CC10001_ADC_POWER_DOWN_SET);
+}
+
 static void cc10001_adc_start(struct cc10001_adc_device *adc_dev,
                               unsigned int channel)
 {
@@ -88,6 +100,7 @@ static void cc10001_adc_start(struct cc10001_adc_device *adc_dev,
         val = (channel & CC10001_ADC_CH_MASK) | CC10001_ADC_MODE_SINGLE_CONV;
         cc10001_adc_write_reg(adc_dev, CC10001_ADC_CONFIG, val);
 
+        udelay(1);
         val = cc10001_adc_read_reg(adc_dev, CC10001_ADC_CONFIG);
         val = val | CC10001_ADC_START_CONV;
         cc10001_adc_write_reg(adc_dev, CC10001_ADC_CONFIG, val);
@@ -129,6 +142,7 @@ static irqreturn_t cc10001_adc_trigger_h(int irq, void *p)
         struct iio_dev *indio_dev;
         unsigned int delay_ns;
         unsigned int channel;
+        unsigned int scan_idx;
         bool sample_invalid;
         u16 *data;
         int i;
@@ -139,20 +153,17 @@ static irqreturn_t cc10001_adc_trigger_h(int irq, void *p)
 
         mutex_lock(&adc_dev->lock);
 
-        cc10001_adc_write_reg(adc_dev, CC10001_ADC_POWER_UP,
-                              CC10001_ADC_POWER_UP_SET);
-
-        /* Wait for 8 (6+2) clock cycles before activating START */
-        ndelay(adc_dev->start_delay_ns);
+        cc10001_adc_power_up(adc_dev);
 
         /* Calculate delay step for eoc and sampled data */
         delay_ns = adc_dev->eoc_delay_ns / CC10001_MAX_POLL_COUNT;
 
         i = 0;
         sample_invalid = false;
-        for_each_set_bit(channel, indio_dev->active_scan_mask,
+        for_each_set_bit(scan_idx, indio_dev->active_scan_mask,
                                   indio_dev->masklength) {
 
+                channel = indio_dev->channels[scan_idx].channel;
                 cc10001_adc_start(adc_dev, channel);
 
                 data[i] = cc10001_adc_poll_done(indio_dev, channel, delay_ns);
@@ -166,7 +177,7 @@ static irqreturn_t cc10001_adc_trigger_h(int irq, void *p)
         }
 
 done:
-        cc10001_adc_write_reg(adc_dev, CC10001_ADC_POWER_UP, 0);
+        cc10001_adc_power_down(adc_dev);
 
         mutex_unlock(&adc_dev->lock);
 
@@ -185,11 +196,7 @@ static u16 cc10001_adc_read_raw_voltage(struct iio_dev *indio_dev,
         unsigned int delay_ns;
         u16 val;
 
-        cc10001_adc_write_reg(adc_dev, CC10001_ADC_POWER_UP,
-                              CC10001_ADC_POWER_UP_SET);
-
-        /* Wait for 8 (6+2) clock cycles before activating START */
-        ndelay(adc_dev->start_delay_ns);
+        cc10001_adc_power_up(adc_dev);
 
         /* Calculate delay step for eoc and sampled data */
         delay_ns = adc_dev->eoc_delay_ns / CC10001_MAX_POLL_COUNT;
@@ -198,7 +205,7 @@ static u16 cc10001_adc_read_raw_voltage(struct iio_dev *indio_dev,
 
         val = cc10001_adc_poll_done(indio_dev, chan->channel, delay_ns);
 
-        cc10001_adc_write_reg(adc_dev, CC10001_ADC_POWER_UP, 0);
+        cc10001_adc_power_down(adc_dev);
 
         return val;
 }
@@ -224,7 +231,7 @@ static int cc10001_adc_read_raw(struct iio_dev *indio_dev,
 
         case IIO_CHAN_INFO_SCALE:
                 ret = regulator_get_voltage(adc_dev->reg);
-                if (ret)
+                if (ret < 0)
                         return ret;
 
                 *val = ret / 1000;
@@ -255,22 +262,22 @@ static const struct iio_info cc10001_adc_info = {
         .update_scan_mode = &cc10001_update_scan_mode,
 };
 
-static int cc10001_adc_channel_init(struct iio_dev *indio_dev)
+static int cc10001_adc_channel_init(struct iio_dev *indio_dev,
+                                    unsigned long channel_map)
 {
-        struct cc10001_adc_device *adc_dev = iio_priv(indio_dev);
         struct iio_chan_spec *chan_array, *timestamp;
         unsigned int bit, idx = 0;
 
-        indio_dev->num_channels = bitmap_weight(&adc_dev->channel_map,
-                                                CC10001_ADC_NUM_CHANNELS);
+        indio_dev->num_channels = bitmap_weight(&channel_map,
+                                                CC10001_ADC_NUM_CHANNELS) + 1;
 
-        chan_array = devm_kcalloc(&indio_dev->dev, indio_dev->num_channels + 1,
+        chan_array = devm_kcalloc(&indio_dev->dev, indio_dev->num_channels,
                                   sizeof(struct iio_chan_spec),
                                   GFP_KERNEL);
         if (!chan_array)
                 return -ENOMEM;
 
-        for_each_set_bit(bit, &adc_dev->channel_map, CC10001_ADC_NUM_CHANNELS) {
+        for_each_set_bit(bit, &channel_map, CC10001_ADC_NUM_CHANNELS) {
                 struct iio_chan_spec *chan = &chan_array[idx];
 
                 chan->type = IIO_VOLTAGE;
@@ -305,6 +312,7 @@ static int cc10001_adc_probe(struct platform_device *pdev)
         unsigned long adc_clk_rate;
         struct resource *res;
         struct iio_dev *indio_dev;
+        unsigned long channel_map;
         int ret;
 
         indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*adc_dev));
@@ -313,9 +321,9 @@ static int cc10001_adc_probe(struct platform_device *pdev)
 
         adc_dev = iio_priv(indio_dev);
 
-        adc_dev->channel_map = GENMASK(CC10001_ADC_NUM_CHANNELS - 1, 0);
+        channel_map = GENMASK(CC10001_ADC_NUM_CHANNELS - 1, 0);
         if (!of_property_read_u32(node, "adc-reserved-channels", &ret))
-                adc_dev->channel_map &= ~ret;
+                channel_map &= ~ret;
 
         adc_dev->reg = devm_regulator_get(&pdev->dev, "vref");
         if (IS_ERR(adc_dev->reg))
@@ -361,7 +369,7 @@ static int cc10001_adc_probe(struct platform_device *pdev)
         adc_dev->start_delay_ns = adc_dev->eoc_delay_ns * CC10001_WAIT_CYCLES;
 
         /* Setup the ADC channels available on the device */
-        ret = cc10001_adc_channel_init(indio_dev);
+        ret = cc10001_adc_channel_init(indio_dev, channel_map);
         if (ret < 0)
                 goto err_disable_clk;
 
diff --git a/drivers/iio/adc/mcp320x.c b/drivers/iio/adc/mcp320x.c
index efbfd12a4bfd..8d9c9b9215dd 100644
--- a/drivers/iio/adc/mcp320x.c
+++ b/drivers/iio/adc/mcp320x.c
@@ -60,12 +60,12 @@ struct mcp320x {
         struct spi_message msg;
         struct spi_transfer transfer[2];
 
-        u8 tx_buf;
-        u8 rx_buf[2];
-
         struct regulator *reg;
         struct mutex lock;
         const struct mcp320x_chip_info *chip_info;
+
+        u8 tx_buf ____cacheline_aligned;
+        u8 rx_buf[2];
 };
 
 static int mcp320x_channel_to_tx_data(int device_index,
diff --git a/drivers/iio/adc/qcom-spmi-vadc.c b/drivers/iio/adc/qcom-spmi-vadc.c
index 3211729bcb0b..0c4618b4d515 100644
--- a/drivers/iio/adc/qcom-spmi-vadc.c
+++ b/drivers/iio/adc/qcom-spmi-vadc.c
@@ -18,6 +18,7 @@
 #include <linux/iio/iio.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
+#include <linux/math64.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
@@ -471,11 +472,11 @@ static s32 vadc_calibrate(struct vadc_priv *vadc,
                           const struct vadc_channel_prop *prop, u16 adc_code)
 {
         const struct vadc_prescale_ratio *prescale;
-        s32 voltage;
+        s64 voltage;
 
         voltage = adc_code - vadc->graph[prop->calibration].gnd;
         voltage *= vadc->graph[prop->calibration].dx;
-        voltage = voltage / vadc->graph[prop->calibration].dy;
+        voltage = div64_s64(voltage, vadc->graph[prop->calibration].dy);
 
         if (prop->calibration == VADC_CALIB_ABSOLUTE)
                 voltage += vadc->graph[prop->calibration].dx;
@@ -487,7 +488,7 @@ static s32 vadc_calibrate(struct vadc_priv *vadc,
 
         voltage = voltage * prescale->den;
 
-        return voltage / prescale->num;
+        return div64_s64(voltage, prescale->num);
 }
 
 static int vadc_decimation_from_dt(u32 value)
diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c
index a221f7329b79..ce93bd8e3f68 100644
--- a/drivers/iio/adc/xilinx-xadc-core.c
+++ b/drivers/iio/adc/xilinx-xadc-core.c
@@ -856,6 +856,7 @@ static int xadc_read_raw(struct iio_dev *indio_dev,
                         switch (chan->address) {
                         case XADC_REG_VCCINT:
                         case XADC_REG_VCCAUX:
+                        case XADC_REG_VREFP:
                         case XADC_REG_VCCBRAM:
                         case XADC_REG_VCCPINT:
                         case XADC_REG_VCCPAUX:
@@ -996,7 +997,7 @@ static const struct iio_event_spec xadc_voltage_events[] = {
         .num_event_specs = (_alarm) ? ARRAY_SIZE(xadc_voltage_events) : 0, \
         .scan_index = (_scan_index), \
         .scan_type = { \
-                .sign = 'u', \
+                .sign = ((_addr) == XADC_REG_VREFN) ? 's' : 'u', \
                 .realbits = 12, \
                 .storagebits = 16, \
                 .shift = 4, \
@@ -1008,7 +1009,7 @@ static const struct iio_event_spec xadc_voltage_events[] = {
 static const struct iio_chan_spec xadc_channels[] = {
         XADC_CHAN_TEMP(0, 8, XADC_REG_TEMP),
         XADC_CHAN_VOLTAGE(0, 9, XADC_REG_VCCINT, "vccint", true),
-        XADC_CHAN_VOLTAGE(1, 10, XADC_REG_VCCINT, "vccaux", true),
+        XADC_CHAN_VOLTAGE(1, 10, XADC_REG_VCCAUX, "vccaux", true),
         XADC_CHAN_VOLTAGE(2, 14, XADC_REG_VCCBRAM, "vccbram", true),
         XADC_CHAN_VOLTAGE(3, 5, XADC_REG_VCCPINT, "vccpint", true),
         XADC_CHAN_VOLTAGE(4, 6, XADC_REG_VCCPAUX, "vccpaux", true),
diff --git a/drivers/iio/adc/xilinx-xadc.h b/drivers/iio/adc/xilinx-xadc.h
index c7487e8d7f80..54adc5087210 100644
--- a/drivers/iio/adc/xilinx-xadc.h
+++ b/drivers/iio/adc/xilinx-xadc.h
@@ -145,9 +145,9 @@ static inline int xadc_write_adc_reg(struct xadc *xadc, unsigned int reg,
 #define XADC_REG_MAX_VCCPINT    0x28
 #define XADC_REG_MAX_VCCPAUX    0x29
 #define XADC_REG_MAX_VCCO_DDR   0x2a
-#define XADC_REG_MIN_VCCPINT    0x2b
-#define XADC_REG_MIN_VCCPAUX    0x2c
-#define XADC_REG_MIN_VCCO_DDR   0x2d
+#define XADC_REG_MIN_VCCPINT    0x2c
+#define XADC_REG_MIN_VCCPAUX    0x2d
+#define XADC_REG_MIN_VCCO_DDR   0x2e
 
 #define XADC_REG_CONF0          0x40
 #define XADC_REG_CONF1          0x41