Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62e1fd08 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'staging-4.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 

Pull staging/IIO driver rfixes from Greg KH:
 "Here are a number of small IIO and staging driver fixes for 4.11-rc6.
  Nothing big here, just iio fixes for reported issues, and an ashmem
  fix for a very old bug that has been reported by a number of Android
  vendors"

* tag 'staging-4.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: android: ashmem: lseek failed due to no FMODE_LSEEK.
  iio: hid-sensor-attributes: Fix sensor property setting failure.
  iio: accel: hid-sensor-accel-3d: Fix duplicate scan index error
  iio: core: Fix IIO_VAL_FRACTIONAL_LOG2 for negative values
  iio: st_pressure: initialize lps22hb bootime
  iio: bmg160: reset chip when probing
  iio: cros_ec_sensors: Fix return value to get raw and calibbias data.
parents 2a610b8a 97fbfef6

drivers/iio/accel/hid-sensor-accel-3d.c

+2 −1
Original line number Diff line number Diff line
@@ -370,10 +370,12 @@ static int hid_accel_3d_probe(struct platform_device *pdev) 
		name = "accel_3d";

		channel_spec = accel_3d_channels;

		channel_size = sizeof(accel_3d_channels);

		indio_dev->num_channels = ARRAY_SIZE(accel_3d_channels);

	} else {

		name = "gravity";

		channel_spec = gravity_channels;

		channel_size = sizeof(gravity_channels);

		indio_dev->num_channels = ARRAY_SIZE(gravity_channels);

	}

	ret = hid_sensor_parse_common_attributes(hsdev, hsdev->usage,

					&accel_state->common_attributes);
@@ -395,7 +397,6 @@ static int hid_accel_3d_probe(struct platform_device *pdev) 
		goto error_free_dev_mem;

	}



	indio_dev->num_channels = ARRAY_SIZE(accel_3d_channels);

	indio_dev->dev.parent = &pdev->dev;

	indio_dev->info = &accel_3d_info;

	indio_dev->name = name;

drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static int cros_ec_sensors_read(struct iio_dev *indio_dev, 
		ret = st->core.read_ec_sensors_data(indio_dev, 1 << idx, &data);

		if (ret < 0)

			break;



		ret = IIO_VAL_INT;

		*val = data;

		break;

	case IIO_CHAN_INFO_CALIBBIAS:
@@ -76,7 +76,7 @@ static int cros_ec_sensors_read(struct iio_dev *indio_dev, 
		for (i = CROS_EC_SENSOR_X; i < CROS_EC_SENSOR_MAX_AXIS; i++)

			st->core.calib[i] =

				st->core.resp->sensor_offset.offset[i];



		ret = IIO_VAL_INT;

		*val = st->core.calib[idx];

		break;

	case IIO_CHAN_INFO_SCALE:

drivers/iio/common/hid-sensors/hid-sensor-attributes.c

+10 −0
Original line number Diff line number Diff line
@@ -379,6 +379,8 @@ int hid_sensor_parse_common_attributes(struct hid_sensor_hub_device *hsdev, 
{



	struct hid_sensor_hub_attribute_info timestamp;

	s32 value;

	int ret;



	hid_sensor_get_reporting_interval(hsdev, usage_id, st);
@@ -417,6 +419,14 @@ int hid_sensor_parse_common_attributes(struct hid_sensor_hub_device *hsdev, 
		st->sensitivity.index, st->sensitivity.report_id,

		timestamp.index, timestamp.report_id);



	ret = sensor_hub_get_feature(hsdev,

				st->power_state.report_id,

				st->power_state.index, sizeof(value), &value);

	if (ret < 0)

		return ret;

	if (value < 0)

		return -EINVAL;



	return 0;

}

EXPORT_SYMBOL(hid_sensor_parse_common_attributes);

drivers/iio/gyro/bmg160_core.c

+12 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/iio/trigger_consumer.h>

#include <linux/iio/triggered_buffer.h>

#include <linux/regmap.h>

#include <linux/delay.h>

#include "bmg160.h"



#define BMG160_IRQ_NAME		"bmg160_event"
@@ -52,6 +53,9 @@ 
#define BMG160_DEF_BW			100

#define BMG160_REG_PMU_BW_RES		BIT(7)



#define BMG160_GYRO_REG_RESET		0x14

#define BMG160_GYRO_RESET_VAL		0xb6



#define BMG160_REG_INT_MAP_0		0x17

#define BMG160_INT_MAP_0_BIT_ANY	BIT(1)
@@ -236,6 +240,14 @@ static int bmg160_chip_init(struct bmg160_data *data) 
	int ret;

	unsigned int val;



	/*

	 * Reset chip to get it in a known good state. A delay of 30ms after

	 * reset is required according to the datasheet.

	 */

	regmap_write(data->regmap, BMG160_GYRO_REG_RESET,

		     BMG160_GYRO_RESET_VAL);

	usleep_range(30000, 30700);



	ret = regmap_read(data->regmap, BMG160_REG_CHIP_ID, &val);

	if (ret < 0) {

		dev_err(dev, "Error reading reg_chip_id\n");

drivers/iio/industrialio-core.c

+3 −4
Original line number Diff line number Diff line
@@ -610,10 +610,9 @@ static ssize_t __iio_format_value(char *buf, size_t len, unsigned int type, 
		tmp0 = (int)div_s64_rem(tmp, 1000000000, &tmp1);

		return snprintf(buf, len, "%d.%09u", tmp0, abs(tmp1));

	case IIO_VAL_FRACTIONAL_LOG2:

		tmp = (s64)vals[0] * 1000000000LL >> vals[1];

		tmp1 = do_div(tmp, 1000000000LL);

		tmp0 = tmp;

		return snprintf(buf, len, "%d.%09u", tmp0, tmp1);

		tmp = shift_right((s64)vals[0] * 1000000000LL, vals[1]);

		tmp0 = (int)div_s64_rem(tmp, 1000000000LL, &tmp1);

		return snprintf(buf, len, "%d.%09u", tmp0, abs(tmp1));

	case IIO_VAL_INT_MULTIPLE:

	{

		int i;