Commit 7ca363f6 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'staging-linus' into staging-work 



This is to pull in the lustre fixes so that others can continue to work
on updating the lustre codebase, as well as resolve some merge issues
with the ion and ocproto drivers to keep linux-next happy.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents e4b41af1 a0f45252

drivers/iio/accel/bma180.c

+8 −8
Original line number Diff line number Diff line
@@ -447,14 +447,14 @@ static const struct iio_chan_spec_ext_info bma180_ext_info[] = { 
	{ },

};



#define BMA180_CHANNEL(_index) {					\

#define BMA180_CHANNEL(_axis) {					\

	.type = IIO_ACCEL,						\

	.indexed = 1,							\

	.channel = (_index),						\

	.modified = 1,							\

	.channel2 = IIO_MOD_##_axis,					\

	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |			\

		BIT(IIO_CHAN_INFO_LOW_PASS_FILTER_3DB_FREQUENCY),	\

	.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),		\

	.scan_index = (_index),						\

	.scan_index = AXIS_##_axis,					\

	.scan_type = {							\

		.sign = 's',						\

		.realbits = 14,						\
@@ -465,10 +465,10 @@ static const struct iio_chan_spec_ext_info bma180_ext_info[] = { 
}



static const struct iio_chan_spec bma180_channels[] = {

	BMA180_CHANNEL(AXIS_X),

	BMA180_CHANNEL(AXIS_Y),

	BMA180_CHANNEL(AXIS_Z),

	IIO_CHAN_SOFT_TIMESTAMP(4),

	BMA180_CHANNEL(X),

	BMA180_CHANNEL(Y),

	BMA180_CHANNEL(Z),

	IIO_CHAN_SOFT_TIMESTAMP(3),

};



static irqreturn_t bma180_trigger_handler(int irq, void *p)

drivers/iio/adc/max1363.c

+1 −1
Original line number Diff line number Diff line
@@ -1560,7 +1560,7 @@ static int max1363_probe(struct i2c_client *client, 
	st->client = client;



	st->vref_uv = st->chip_info->int_vref_mv * 1000;

	vref = devm_regulator_get(&client->dev, "vref");

	vref = devm_regulator_get_optional(&client->dev, "vref");

	if (!IS_ERR(vref)) {

		int vref_uv;

drivers/iio/imu/adis16400.h

+1 −0
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ enum { 
	ADIS16300_SCAN_INCLI_X,

	ADIS16300_SCAN_INCLI_Y,

	ADIS16400_SCAN_ADC,

	ADIS16400_SCAN_TIMESTAMP,

};



#ifdef CONFIG_IIO_BUFFER

drivers/iio/imu/adis16400_core.c

+5 −5
Original line number Diff line number Diff line
@@ -632,7 +632,7 @@ static const struct iio_chan_spec adis16400_channels[] = { 
	ADIS16400_MAGN_CHAN(Z, ADIS16400_ZMAGN_OUT, 14),

	ADIS16400_TEMP_CHAN(ADIS16400_TEMP_OUT, 12),

	ADIS16400_AUX_ADC_CHAN(ADIS16400_AUX_ADC, 12),

	IIO_CHAN_SOFT_TIMESTAMP(12)

	IIO_CHAN_SOFT_TIMESTAMP(ADIS16400_SCAN_TIMESTAMP),

};



static const struct iio_chan_spec adis16448_channels[] = {
@@ -659,7 +659,7 @@ static const struct iio_chan_spec adis16448_channels[] = { 
		},

	},

	ADIS16400_TEMP_CHAN(ADIS16448_TEMP_OUT, 12),

	IIO_CHAN_SOFT_TIMESTAMP(11)

	IIO_CHAN_SOFT_TIMESTAMP(ADIS16400_SCAN_TIMESTAMP),

};



static const struct iio_chan_spec adis16350_channels[] = {
@@ -677,7 +677,7 @@ static const struct iio_chan_spec adis16350_channels[] = { 
	ADIS16400_MOD_TEMP_CHAN(X, ADIS16350_XTEMP_OUT, 12),

	ADIS16400_MOD_TEMP_CHAN(Y, ADIS16350_YTEMP_OUT, 12),

	ADIS16400_MOD_TEMP_CHAN(Z, ADIS16350_ZTEMP_OUT, 12),

	IIO_CHAN_SOFT_TIMESTAMP(11)

	IIO_CHAN_SOFT_TIMESTAMP(ADIS16400_SCAN_TIMESTAMP),

};



static const struct iio_chan_spec adis16300_channels[] = {
@@ -690,7 +690,7 @@ static const struct iio_chan_spec adis16300_channels[] = { 
	ADIS16400_AUX_ADC_CHAN(ADIS16300_AUX_ADC, 12),

	ADIS16400_INCLI_CHAN(X, ADIS16300_PITCH_OUT, 13),

	ADIS16400_INCLI_CHAN(Y, ADIS16300_ROLL_OUT, 13),

	IIO_CHAN_SOFT_TIMESTAMP(14)

	IIO_CHAN_SOFT_TIMESTAMP(ADIS16400_SCAN_TIMESTAMP),

};



static const struct iio_chan_spec adis16334_channels[] = {
@@ -701,7 +701,7 @@ static const struct iio_chan_spec adis16334_channels[] = { 
	ADIS16400_ACCEL_CHAN(Y, ADIS16400_YACCL_OUT, 14),

	ADIS16400_ACCEL_CHAN(Z, ADIS16400_ZACCL_OUT, 14),

	ADIS16400_TEMP_CHAN(ADIS16350_XTEMP_OUT, 12),

	IIO_CHAN_SOFT_TIMESTAMP(8)

	IIO_CHAN_SOFT_TIMESTAMP(ADIS16400_SCAN_TIMESTAMP),

};



static struct attribute *adis16400_attributes[] = {

drivers/iio/light/tsl2563.c

+10 −6
Original line number Diff line number Diff line
@@ -460,10 +460,14 @@ static int tsl2563_write_raw(struct iio_dev *indio_dev, 
{

	struct tsl2563_chip *chip = iio_priv(indio_dev);



	if (chan->channel == IIO_MOD_LIGHT_BOTH)

	if (mask != IIO_CHAN_INFO_CALIBSCALE)

		return -EINVAL;

	if (chan->channel2 == IIO_MOD_LIGHT_BOTH)

		chip->calib0 = calib_from_sysfs(val);

	else

	else if (chan->channel2 == IIO_MOD_LIGHT_IR)

		chip->calib1 = calib_from_sysfs(val);

	else

		return -EINVAL;



	return 0;

}
@@ -472,14 +476,14 @@ static int tsl2563_read_raw(struct iio_dev *indio_dev, 
			    struct iio_chan_spec const *chan,

			    int *val,

			    int *val2,

			    long m)

			    long mask)

{

	int ret = -EINVAL;

	u32 calib0, calib1;

	struct tsl2563_chip *chip = iio_priv(indio_dev);



	mutex_lock(&chip->lock);

	switch (m) {

	switch (mask) {

	case IIO_CHAN_INFO_RAW:

	case IIO_CHAN_INFO_PROCESSED:

		switch (chan->type) {
@@ -498,7 +502,7 @@ static int tsl2563_read_raw(struct iio_dev *indio_dev, 
			ret = tsl2563_get_adc(chip);

			if (ret)

				goto error_ret;

			if (chan->channel == 0)

			if (chan->channel2 == IIO_MOD_LIGHT_BOTH)

				*val = chip->data0;

			else

				*val = chip->data1;
@@ -510,7 +514,7 @@ static int tsl2563_read_raw(struct iio_dev *indio_dev, 
		break;



	case IIO_CHAN_INFO_CALIBSCALE:

		if (chan->channel == 0)

		if (chan->channel2 == IIO_MOD_LIGHT_BOTH)

			*val = calib_to_sysfs(chip->calib0);

		else

			*val = calib_to_sysfs(chip->calib1);

CRA Git | Maintained and supported by SUSTech CRA and CCSE