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

Commit 56ff6be6 authored by Srinivas Pandruvada's avatar Srinivas Pandruvada Committed by Jonathan Cameron
Browse files

iio: hid-sensors: Add API to power on/off 



Added an API to allow client drivers to turn ON and OFF sensors for
quick read. Added data_read as counting varaible instead of boolean,
so that sensor is powered off only when last user released it.

Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent a269b9a0

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

+3 −4
Original line number Diff line number Diff line
@@ -201,9 +201,8 @@ static int accel_3d_proc_event(struct hid_sensor_hub_device *hsdev, 
	struct iio_dev *indio_dev = platform_get_drvdata(priv);

	struct accel_3d_state *accel_state = iio_priv(indio_dev);



	dev_dbg(&indio_dev->dev, "accel_3d_proc_event [%d]\n",

				accel_state->common_attributes.data_ready);

	if (accel_state->common_attributes.data_ready)

	dev_dbg(&indio_dev->dev, "accel_3d_proc_event\n");

	if (atomic_read(&accel_state->common_attributes.data_ready))

		hid_sensor_push_data(indio_dev,

				accel_state->accel_val,

				sizeof(accel_state->accel_val));
@@ -342,7 +341,7 @@ static int hid_accel_3d_probe(struct platform_device *pdev) 
		dev_err(&pdev->dev, "failed to initialize trigger buffer\n");

		goto error_free_dev_mem;

	}

	accel_state->common_attributes.data_ready = false;

	atomic_set(&accel_state->common_attributes.data_ready, 0);

	ret = hid_sensor_setup_trigger(indio_dev, name,

					&accel_state->common_attributes);

	if (ret < 0) {

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

+13 −4
Original line number Diff line number Diff line
@@ -28,16 +28,17 @@ 
#include <linux/iio/sysfs.h>

#include "hid-sensor-trigger.h"



static int hid_sensor_data_rdy_trigger_set_state(struct iio_trigger *trig,

						bool state)

int hid_sensor_power_state(struct hid_sensor_common *st, bool state)

{

	struct hid_sensor_common *st = iio_trigger_get_drvdata(trig);

	int state_val;

	int report_val;



	if (state) {

		if (sensor_hub_device_open(st->hsdev))

			return -EIO;



		atomic_inc(&st->data_ready);



		state_val = hid_sensor_get_usage_index(st->hsdev,

			st->power_state.report_id,

			st->power_state.index,
@@ -47,6 +48,8 @@ static int hid_sensor_data_rdy_trigger_set_state(struct iio_trigger *trig, 
			st->report_state.index,

			HID_USAGE_SENSOR_PROP_REPORTING_STATE_ALL_EVENTS_ENUM);

	} else {

		if (!atomic_dec_and_test(&st->data_ready))

			return 0;

		sensor_hub_device_close(st->hsdev);

		state_val = hid_sensor_get_usage_index(st->hsdev,

			st->power_state.report_id,
@@ -57,7 +60,6 @@ static int hid_sensor_data_rdy_trigger_set_state(struct iio_trigger *trig, 
			st->report_state.index,

			HID_USAGE_SENSOR_PROP_REPORTING_STATE_NO_EVENTS_ENUM);

	}

	st->data_ready = state;



	if (state_val >= 0) {

		state_val += st->power_state.logical_minimum;
@@ -75,6 +77,13 @@ static int hid_sensor_data_rdy_trigger_set_state(struct iio_trigger *trig, 


	return 0;

}

EXPORT_SYMBOL(hid_sensor_power_state);



static int hid_sensor_data_rdy_trigger_set_state(struct iio_trigger *trig,

						bool state)

{

	return hid_sensor_power_state(iio_trigger_get_drvdata(trig), state);

}



void hid_sensor_remove_trigger(struct hid_sensor_common *attrb)

{

drivers/iio/common/hid-sensors/hid-sensor-trigger.h

+1 −0
Original line number Diff line number Diff line
@@ -22,5 +22,6 @@ 
int hid_sensor_setup_trigger(struct iio_dev *indio_dev, const char *name,

				struct hid_sensor_common *attrb);

void hid_sensor_remove_trigger(struct hid_sensor_common *attrb);

int hid_sensor_power_state(struct hid_sensor_common *st, bool state);



#endif

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

+3 −4
Original line number Diff line number Diff line
@@ -201,9 +201,8 @@ static int gyro_3d_proc_event(struct hid_sensor_hub_device *hsdev, 
	struct iio_dev *indio_dev = platform_get_drvdata(priv);

	struct gyro_3d_state *gyro_state = iio_priv(indio_dev);



	dev_dbg(&indio_dev->dev, "gyro_3d_proc_event [%d]\n",

				gyro_state->common_attributes.data_ready);

	if (gyro_state->common_attributes.data_ready)

	dev_dbg(&indio_dev->dev, "gyro_3d_proc_event\n");

	if (atomic_read(&gyro_state->common_attributes.data_ready))

		hid_sensor_push_data(indio_dev,

				gyro_state->gyro_val,

				sizeof(gyro_state->gyro_val));
@@ -339,7 +338,7 @@ static int hid_gyro_3d_probe(struct platform_device *pdev) 
		dev_err(&pdev->dev, "failed to initialize trigger buffer\n");

		goto error_free_dev_mem;

	}

	gyro_state->common_attributes.data_ready = false;

	atomic_set(&gyro_state->common_attributes.data_ready, 0);

	ret = hid_sensor_setup_trigger(indio_dev, name,

					&gyro_state->common_attributes);

	if (ret < 0) {

drivers/iio/light/hid-sensor-als.c

+3 −4
Original line number Diff line number Diff line
@@ -180,9 +180,8 @@ static int als_proc_event(struct hid_sensor_hub_device *hsdev, 
	struct iio_dev *indio_dev = platform_get_drvdata(priv);

	struct als_state *als_state = iio_priv(indio_dev);



	dev_dbg(&indio_dev->dev, "als_proc_event [%d]\n",

				als_state->common_attributes.data_ready);

	if (als_state->common_attributes.data_ready)

	dev_dbg(&indio_dev->dev, "als_proc_event\n");

	if (atomic_read(&als_state->common_attributes.data_ready))

		hid_sensor_push_data(indio_dev,

				&als_state->illum,

				sizeof(als_state->illum));
@@ -305,7 +304,7 @@ static int hid_als_probe(struct platform_device *pdev) 
		dev_err(&pdev->dev, "failed to initialize trigger buffer\n");

		goto error_free_dev_mem;

	}

	als_state->common_attributes.data_ready = false;

	atomic_set(&als_state->common_attributes.data_ready, 0);

	ret = hid_sensor_setup_trigger(indio_dev, name,

				&als_state->common_attributes);

	if (ret < 0) {