iio: HID sensor time (as RTC)

This driver makes the time from HID sensors (hubs) which are offering such available like any other RTC does.

Currently the time can only be read. Setting the time must be done through sending a report, which currently isn't supported by hid-sensor-hub.

It is necessary that all values like year, month etc, are send as 8bit values (1 byte each) and all of them in 1 report. Also the spec HUTRR39b doesn't define the range of the year field, we tread it as 0 - 99 because that's what most RTCs I know about are offering.

Signed-off-by Alexander Holler <[email protected]>

---
 drivers/iio/Kconfig                |    1 +
 drivers/iio/Makefile               |    1 +
 drivers/iio/time/Kconfig           |   14 ++
 drivers/iio/time/Makefile          |    5 +
 drivers/iio/time/hid-sensor-time.c |  397 ++++++++++++++++++++++++++++++++++++
 5 files changed, 418 insertions(+), 0 deletions(-)
 create mode 100644 drivers/iio/time/Kconfig
 create mode 100644 drivers/iio/time/Makefile
 create mode 100644 drivers/iio/time/hid-sensor-time.c

drivers/iio/Kconfig +1 -0

index fc937ac..78fa3ff 100644
@@ -63,5 +63,6 @@ source "drivers/iio/dac/Kconfig"
 source "drivers/iio/common/Kconfig"
 source "drivers/iio/gyro/Kconfig"
 source "drivers/iio/magnetometer/Kconfig"
+source "drivers/iio/time/Kconfig"
 
 endif # IIO

drivers/iio/Makefile +1 -0

index 761f2b6..6a6da31 100644
@@ -19,3 +19,4 @@ obj-y += dac/
 obj-y += common/
 obj-y += gyro/
 obj-y += magnetometer/
+obj-y += time/

drivers/iio/time/Kconfig new file +14 -0

new file mode 100644
index 0000000..0ca4682
@@ -0,0 +1,14 @@
+#
+# Time sensors
+#
+menu "Time sensors"
+
+config HID_SENSOR_TIME
+	depends on HID_SENSOR_HUB
+	select HID_SENSOR_IIO_COMMON
+	tristate "HID Time"
+	help
+	  Say yes here to build support for the HID SENSOR Time.
+	  This drivers makes such sensors available as RTCs.
+
+endmenu

drivers/iio/time/Makefile new file +5 -0

new file mode 100644
index 0000000..705fe0d
@@ -0,0 +1,5 @@
+#
+# Makefile for industrial I/O Time sensor driver
+#
+
+obj-$(CONFIG_HID_SENSOR_TIME) += hid-sensor-time.o

drivers/iio/time/hid-sensor-time.c new file +397 -0

new file mode 100644
index 0000000..a5993d6
@@ -0,0 +1,397 @@
+/*
+ * HID Sensor Time Driver
+ * Copyright (c) 2012, Alexander Holler.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/module.h>
+#include <linux/hid-sensor-hub.h>
+#include <linux/iio/iio.h>
+#include <linux/rtc.h>
+#include "../common/hid-sensors/hid-sensor-attributes.h"
+
+/* Format: HID-SENSOR-usage_id_in_hex */
+/* Usage ID from spec for Time: 0x2000A0 */
+#define DRIVER_NAME "HID-SENSOR-2000a0" /* must be lowercase */
+
+enum hid_time_channel {
+	CHANNEL_SCAN_INDEX_YEAR,
+	CHANNEL_SCAN_INDEX_MONTH,
+	CHANNEL_SCAN_INDEX_DAY,
+	CHANNEL_SCAN_INDEX_HOUR,
+	CHANNEL_SCAN_INDEX_MINUTE,
+	CHANNEL_SCAN_INDEX_SECOND,
+	TIME_RTC_CHANNEL_MAX,
+};
+
+struct hid_time_state {
+	struct hid_sensor_hub_callbacks callbacks;
+	struct hid_sensor_iio_common common_attributes;
+	struct hid_sensor_hub_attribute_info info[TIME_RTC_CHANNEL_MAX];
+	struct rtc_time last_time;
+	spinlock_t lock_last_time;
+	struct completion comp_last_time;
+	struct rtc_time time_buf;
+	struct rtc_device *rtc;
+};
+
+static const u32 hid_time_addresses[TIME_RTC_CHANNEL_MAX] = {
+	HID_USAGE_SENSOR_TIME_YEAR,
+	HID_USAGE_SENSOR_TIME_MONTH,
+	HID_USAGE_SENSOR_TIME_DAY,
+	HID_USAGE_SENSOR_TIME_HOUR,
+	HID_USAGE_SENSOR_TIME_MINUTE,
+	HID_USAGE_SENSOR_TIME_SECOND,
+};
+
+/* Channel definitions */
+static const struct iio_chan_spec hid_time_channels[TIME_RTC_CHANNEL_MAX] = {
+	{
+		.info_mask = IIO_CHAN_INFO_RAW,
+		.scan_index = CHANNEL_SCAN_INDEX_YEAR,
+		.extend_name = "year",
+	}, {
+		.info_mask = IIO_CHAN_INFO_RAW,
+		.scan_index = CHANNEL_SCAN_INDEX_MONTH,
+		.extend_name = "month",
+	}, {
+		.info_mask = IIO_CHAN_INFO_RAW,
+		.scan_index = CHANNEL_SCAN_INDEX_DAY,
+		.extend_name = "day",
+	}, {
+		.info_mask = IIO_CHAN_INFO_RAW,
+		.scan_index = CHANNEL_SCAN_INDEX_HOUR,
+		.extend_name = "hour",
+	}, {
+		.info_mask = IIO_CHAN_INFO_RAW,
+		.scan_index = CHANNEL_SCAN_INDEX_MINUTE,
+		.extend_name = "minute",
+	}, {
+		.info_mask = IIO_CHAN_INFO_RAW,
+		.scan_index = CHANNEL_SCAN_INDEX_SECOND,
+		.extend_name = "second",
+	}
+};
+
+/* Adjust channel real bits based on report descriptor */
+static void hid_time_adjust_channel_bit_mask(struct iio_chan_spec *channels,
+						int channel, int size)
+{
+	channels[channel].scan_type.sign = 'u';
+	/* Real storage bits will change based on the report desc. */
+	channels[channel].scan_type.realbits = size * 8;
+	/* Maximum size of a sample to capture is u8 */
+	channels[channel].scan_type.storagebits = sizeof(u8) * 8;
+}
+
+static int hid_time_read_raw(struct iio_dev *indio_dev,
+			      struct iio_chan_spec const *chan,
+			      int *val, int *val2,
+			      long mask)
+{
+	struct hid_time_state *time_state = iio_priv(indio_dev);
+	int report_id;
+	u32 address;
+
+	*val = 0;
+	*val2 = 0;
+	if(mask)
+		return -EINVAL;
+	report_id = time_state->info[chan->scan_index].report_id;
+	address = hid_time_addresses[chan->scan_index];
+	if (report_id >= 0) {
+		*val = sensor_hub_input_attr_get_raw_value(
+			time_state->common_attributes.hsdev,
+			HID_USAGE_SENSOR_TIME, address, report_id);
+		return IIO_VAL_INT;
+	}
+	*val = 0;
+	return -EINVAL;
+}
+
+/* Callback handler to send event after all samples are received and captured */
+static int hid_time_proc_event(struct hid_sensor_hub_device *hsdev,
+				unsigned usage_id, void *priv)
+{
+	unsigned long flags;
+	struct iio_dev *indio_dev = platform_get_drvdata(priv);
+	struct hid_time_state *time_state = iio_priv(indio_dev);
+
+	spin_lock_irqsave(&time_state->lock_last_time, flags);
+	time_state->last_time = time_state->time_buf;
+	spin_unlock_irqrestore(&time_state->lock_last_time, flags);
+	complete(&time_state->comp_last_time);
+	return 0;
+}
+
+static int hid_time_capture_sample(struct hid_sensor_hub_device *hsdev,
+				unsigned usage_id, size_t raw_len,
+				char *raw_data, void *priv)
+{
+	struct iio_dev *indio_dev = platform_get_drvdata(priv);
+	struct hid_time_state *time_state = iio_priv(indio_dev);
+	struct rtc_time *time_buf = &time_state->time_buf;
+
+	switch (usage_id) {
+	case HID_USAGE_SENSOR_TIME_YEAR:
+		time_buf->tm_year = *(u8 *)raw_data;
+		if (time_buf->tm_year < 70)
+			/* assume we are in 1970...2069 */
+			time_buf->tm_year += 100;
+		break;
+	case HID_USAGE_SENSOR_TIME_MONTH:
+		time_buf->tm_mon = --*(u8 *)raw_data;
+		break;
+	case HID_USAGE_SENSOR_TIME_DAY:
+		time_buf->tm_mday = *(u8 *)raw_data;
+		break;
+	case HID_USAGE_SENSOR_TIME_HOUR:
+		time_buf->tm_hour = *(u8 *)raw_data;
+		break;
+	case HID_USAGE_SENSOR_TIME_MINUTE:
+		time_buf->tm_min = *(u8 *)raw_data;
+		break;
+	case HID_USAGE_SENSOR_TIME_SECOND:
+		time_buf->tm_sec = *(u8 *)raw_data;
+		break;
+	default:
+		return -EINVAL;
+	}
+	return 0;
+}
+
+static int hid_time_parse_report(struct platform_device *pdev,
+				struct hid_sensor_hub_device *hsdev,
+				struct iio_chan_spec *channels,
+				unsigned usage_id, struct hid_time_state *st)
+{
+	int ret, i=0;
+
+	for (; i < TIME_RTC_CHANNEL_MAX; ++i) {
+		ret = sensor_hub_input_get_attribute_info(hsdev,
+				HID_INPUT_REPORT, usage_id,
+				hid_time_addresses[i], &st->info[i]);
+		if (ret < 0)
+			return ret;
+		hid_time_adjust_channel_bit_mask(channels, i,
+				st->info[i].size);
+	}
+
+	return ret;
+}
+
+static int hid_rtc_read_time(struct device *dev,
+	struct rtc_time *tm)
+{
+	int val;
+	unsigned long flags;
+	struct iio_dev *indio_dev =
+		platform_get_drvdata(to_platform_device(dev));
+	struct hid_time_state *time_state = iio_priv(indio_dev);
+
+	init_completion(&time_state->comp_last_time);
+	/* start a read */
+	if (hid_time_read_raw(indio_dev,
+			&hid_time_channels[0], &val, &val, 0) == -EINVAL) {
+		dev_err(dev, "unable to read time!\n");
+		return -EIO;
+	}
+	/* wait for all values (event) */
+	wait_for_completion_interruptible_timeout(&time_state->comp_last_time,
+							HZ*6);
+	spin_lock_irqsave(&time_state->lock_last_time, flags);
+	*tm = time_state->last_time;
+	spin_unlock_irqrestore(&time_state->lock_last_time, flags);
+
+	return 0;
+}
+
+/* small helper, haven't found any other way */
+static const char *attrib_name(u32 attrib_id)
+{
+	unsigned i=0;
+	static const char unknown[] = "unknown";
+
+	for(; i< TIME_RTC_CHANNEL_MAX; ++i) {
+		if(hid_time_addresses[i] == attrib_id)
+			return hid_time_channels[i].extend_name;
+	}
+	return unknown; /* should never happen */
+}
+
+static const struct iio_info hid_time_info = {
+	.driver_module = THIS_MODULE,
+	.read_raw = &hid_time_read_raw,
+};
+
+static const struct rtc_class_ops rtc_ops = {
+	.read_time = hid_rtc_read_time,
+};
+
+static int __devinit hid_time_probe(struct platform_device *pdev)
+{
+	int temp, ret = 0;
+	static char *name = "hid_time";
+	struct hid_time_state *time_state;
+	struct iio_chan_spec *channels;
+	struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data;
+	struct iio_dev *indio_dev = iio_device_alloc(sizeof(struct hid_time_state));
+
+	if (indio_dev == NULL) {
+		ret = -ENOMEM;
+		goto error_ret;
+	}
+	platform_set_drvdata(pdev, indio_dev);
+
+	time_state = iio_priv(indio_dev);
+	time_state->common_attributes.hsdev = hsdev;
+	time_state->common_attributes.pdev = pdev;
+
+	ret = hid_sensor_parse_common_attributes(hsdev,
+				HID_USAGE_SENSOR_TIME,
+				&time_state->common_attributes);
+	if (ret) {
+		dev_err(&pdev->dev, "failed to setup common attributes!\n");
+		goto error_free_dev;
+	}
+
+	channels = kmemdup(hid_time_channels,
+					sizeof(hid_time_channels),
+					GFP_KERNEL);
+	if (!channels) {
+		dev_err(&pdev->dev, "failed to duplicate channels!\n");
+		goto error_free_dev;
+	}
+
+	ret = hid_time_parse_report(pdev, hsdev, channels,
+				HID_USAGE_SENSOR_TIME, time_state);
+	if (ret) {
+		dev_err(&pdev->dev, "failed to setup attributes!\n");
+		goto error_free_dev_mem;
+	}
+
+	/* Check the attributes we need for sanity */
+	temp = time_state->info[ret].report_id;
+	if (temp<0) {
+		dev_err(&pdev->dev, "bad report ID!\n");
+		goto error_free_dev_mem;
+	}
+	for (ret = 0; ret< TIME_RTC_CHANNEL_MAX; ++ret) {
+		if (time_state->info[ret].report_id != temp) {
+			dev_err(&pdev->dev,
+				"not all needed attributes inside the same report!\n");
+			goto error_free_dev_mem;
+		}
+		if (time_state->info[ret].size != 1) {
+			dev_err(&pdev->dev,
+				"attribute '%s' not 8 bits wide!\n",
+				attrib_name(time_state->info[ret].attrib_id));
+			goto error_free_dev_mem;
+		}
+		if (time_state->info[ret].units !=
+				HID_USAGE_SENSOR_UNITS_NOT_SPECIFIED &&
+				/* allow attribute seconds with unit seconds */
+				!(time_state->info[ret].attrib_id ==
+				HID_USAGE_SENSOR_TIME_SECOND &&
+				time_state->info[ret].units ==
+				HID_USAGE_SENSOR_UNITS_SECOND)) {
+			dev_err(&pdev->dev,
+				"attribute '%s' hasn't a unit of type 'none'!\n",
+				attrib_name(time_state->info[ret].attrib_id));
+			goto error_free_dev_mem;
+		}
+		if (time_state->info[ret].unit_expo) {
+			dev_err(&pdev->dev,
+				"attribute '%s' hasn't a unit exponent of 1!\n",
+				attrib_name(time_state->info[ret].attrib_id));
+			goto error_free_dev_mem;
+		}
+	}
+
+	indio_dev->channels = channels;
+	indio_dev->num_channels = ARRAY_SIZE(hid_time_channels);
+	indio_dev->dev.parent = &pdev->dev;
+	indio_dev->info = &hid_time_info;
+	indio_dev->name = name;
+	indio_dev->modes = INDIO_DIRECT_MODE;
+
+	ret = iio_device_register(indio_dev);
+	if (ret) {
+		dev_err(&pdev->dev, "device register failed!\n");
+		goto error_free_dev_mem;
+	}
+
+	time_state->callbacks.send_event = hid_time_proc_event;
+	time_state->callbacks.capture_sample = hid_time_capture_sample;
+	time_state->callbacks.pdev = pdev;
+	ret = sensor_hub_register_callback(hsdev, HID_USAGE_SENSOR_TIME,
+					&time_state->callbacks);
+	if (ret < 0) {
+		dev_err(&pdev->dev, "register callback failed!\n");
+		goto error_iio_unreg;
+	}
+
+	time_state->rtc = rtc_device_register("hid-sensor-time",
+				&pdev->dev, &rtc_ops, THIS_MODULE);
+
+	if (IS_ERR(time_state->rtc)) {
+		ret = PTR_ERR(time_state->rtc);
+		dev_err(&pdev->dev, "rtc device register failed!\n");
+		goto error_iio_unreg;
+	}
+
+	return ret;
+
+error_iio_unreg:
+	iio_device_unregister(indio_dev);
+error_free_dev_mem:
+	kfree(indio_dev->channels);
+error_free_dev:
+	iio_device_free(indio_dev);
+error_ret:
+	return ret;
+}
+
+static int __devinit hid_time_remove(struct platform_device *pdev)
+{
+	struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data;
+	struct iio_dev *indio_dev = platform_get_drvdata(pdev);
+	struct hid_time_state *time_state = iio_priv(indio_dev);
+
+	if (!IS_ERR(time_state->rtc))
+		rtc_device_unregister(time_state->rtc);
+	sensor_hub_remove_callback(hsdev, HID_USAGE_SENSOR_TIME);
+	iio_device_unregister(indio_dev);
+	kfree(indio_dev->channels);
+	iio_device_free(indio_dev);
+
+	return 0;
+}
+
+static struct platform_driver hid_time_platform_driver = {
+	.driver = {
+		.name	= DRIVER_NAME,
+		.owner	= THIS_MODULE,
+	},
+	.probe		= hid_time_probe,
+	.remove		= hid_time_remove,
+};
+module_platform_driver(hid_time_platform_driver);
+
+MODULE_DESCRIPTION("HID Sensor Time");
+MODULE_AUTHOR("Alexander Holler <[email protected]>");
+MODULE_LICENSE("GPL");

Quoted 7 lines

This driver makes the time from HID sensors (hubs) which are offering such available like any other RTC does.

Currently the time can only be read. Setting the time must be done through sending a report, which currently isn't supported by hid-sensor-hub.

Quoted 5 lines

It is necessary that all values like year, month etc, are send as 8bit values (1 byte each) and all of them in 1 report. Also the spec HUTRR39b doesn't define the range of the year field, we tread it as 0 - 99 because that's what most RTCs I know about are offering.

I don't think we should register a IIO device for this. Just an RTC device should be fully sufficient.

Am 09.12.2012 13:55, schrieb Lars-Peter Clausen:

Quoted 14 lines · Alexander Holler

Quoted 12 lines

This driver makes the time from HID sensors (hubs) which are offering such available like any other RTC does.

Currently the time can only be read. Setting the time must be done through sending a report, which currently isn't supported by hid-sensor-hub.

It is necessary that all values like year, month etc, are send as 8bit values (1 byte each) and all of them in 1 report. Also the spec HUTRR39b doesn't define the range of the year field, we tread it as 0 - 99 because that's what most RTCs I know about are offering.

Quoted 4 lines

I don't think we should register a IIO device for this. Just an RTC device
should be fully sufficient.

You would have to implement all the used services hid-sensor-hub offers in the rtc-driver again.

Am 09.12.2012 17:40, schrieb Alexander Holler:

Quoted 15 lines

Am 09.12.2012 13:55, schrieb Lars-Peter Clausen:

Quoted 14 lines · Alexander Holler

Quoted 12 lines

This driver makes the time from HID sensors (hubs) which are offering such available like any other RTC does.

Currently the time can only be read. Setting the time must be done through sending a report, which currently isn't supported by hid-sensor-hub.

It is necessary that all values like year, month etc, are send as 8bit values (1 byte each) and all of them in 1 report. Also the spec HUTRR39b doesn't define the range of the year field, we tread it as 0 - 99 because that's what most RTCs I know about are offering.

Quoted 7 lines

Quoted 4 lines

I don't think we should register a IIO device for this. Just an RTC device
should be fully sufficient.

You would have to implement all the used services hid-sensor-hub offers in the rtc-driver again.

Besides that, time is part of the spec for HID sensors, which makes sense. Making that available as a RTC to read/set the time is imho the best to way support that. If you want a driver which doesn't use the HID sensor hub framework (or iio), you would either have to define your own standard or make sure it is interoperable with the HID sensor hub framework, which might not be trivial.

I agree with what you wrote above. It just doesn't make sense to register a IIO device for a RTC type device. Just rip out all the IIO related bits from the driver and it will be fine.

This driver makes the time from HID sensors (hubs) which are offering such available like any other RTC does.

Currently the time can only be read. Setting the time must be done through sending a report, which currently isn't supported by hid-sensor-hub.

It is necessary that all values like year, month etc, are send as 8bit values (1 byte each) and all of them in 1 report. Also the spec HUTRR39b doesn't define the range of the year field, we tread it as 0 - 99 because that's what most RTCs I know about are offering.

Signed-off-by Alexander Holler <[email protected]>

drivers/iio/time/hid-sensor-time.c new file +0 -0

new file mode 100644
index 0000000..556bac9
@@ -0,0 +1,346 @@

drivers/iio/time/hid-sensor-time.c new file +19 -0

+
+/* Channel definitions */
+static const struct iio_chan_spec hid_time_channels[TIME_RTC_CHANNEL_MAX] = {
+	{
+		.info_mask = IIO_CHAN_INFO_RAW,
+		.scan_index = CHANNEL_SCAN_INDEX_YEAR,
+		.extend_name = "year",
+	}, {
+		.info_mask = IIO_CHAN_INFO_RAW,
+		.scan_index = CHANNEL_SCAN_INDEX_MONTH,
+		.extend_name = "month",
+	}, {
+		.info_mask = IIO_CHAN_INFO_RAW,
+		.scan_index = CHANNEL_SCAN_INDEX_DAY,
+		.extend_name = "day",
+	}, {
+		.info_mask = IIO_CHAN_INFO_RAW,
+		.scan_index = CHANNEL_SCAN_INDEX_HOUR,
+		.extend_name = "hour",

drivers/iio/time/hid-sensor-time.c new file +9 -0

+
+static int hid_time_read_raw(struct hid_time_state *time_state,
+			      struct iio_chan_spec const *chan,
+			      int *val, int *val2,
+			      long mask)
+{
+	int report_id;
+	u32 address;
+

drivers/iio/time/hid-sensor-time.c new file +10 -0

+static const char *attrib_name(u32 attrib_id)
+{
+	unsigned i = 0;
+	static const char unknown[] = "unknown";
+
+	for (; i < TIME_RTC_CHANNEL_MAX; ++i) {
+		if (hid_time_addresses[i] == attrib_id)
+			return hid_time_channels[i].extend_name;
+	}
+	return unknown; /* should never happen */

drivers/iio/time/hid-sensor-time.c new file +10 -0

+	if (ret < 0) {
+		dev_err(&pdev->dev, "bad report ID!\n");
+		return -EINVAL;
+	}
+	for (i = 0; i < TIME_RTC_CHANNEL_MAX; ++i) {
+		if (time_state->info[i].report_id != ret) {
+			dev_err(&pdev->dev,
+				"not all needed attributes inside the same report!\n");
+			return -EINVAL;
+		}

drivers/iio/time/hid-sensor-time.c new file +4 -0

+	}
+
+	return 0;
+}

drivers/iio/time/hid-sensor-time.c new file +10 -0

+
+	if (time_state == NULL) {
+		ret = -ENOMEM;
+		goto error_ret;
+	}
+
+	platform_set_drvdata(pdev, time_state);
+
+	time_state->common_attributes.hsdev = hsdev;
+	time_state->common_attributes.pdev = pdev;

drivers/iio/time/hid-sensor-time.c new file +8 -0

+				HID_USAGE_SENSOR_TIME, time_state);
+	if (ret) {
+		dev_err(&pdev->dev, "failed to setup attributes!\n");
+		goto error_free_drvdata;
+	}
+
+	time_state->callbacks.send_event = hid_time_proc_event;
+	time_state->callbacks.capture_sample = hid_time_capture_sample;

drivers/iio/time/hid-sensor-time.c new file +4 -0

+	kfree(time_state);
+error_ret:
+	return ret;
+}

drivers/iio/time/hid-sensor-time.c new file +5 -0

+	kfree(time_state);
+
+	return 0;
+}
+

Looks pretty good now. But there are still some IIO remnants which should be removed as well. Also the driver should move to drivers/rtc/ since, well, it's a rtc driver not a IIO driver.

drivers/iio/time/hid-sensor-time.c line 62

Quoted 2 lines

drivers/iio/time/hid-sensor-time.c new file +2 -0

+/* Channel definitions */
+static const struct iio_chan_spec hid_time_channels[TIME_RTC_CHANNEL_MAX] = {

Am 10.12.2012 18:05, schrieb Lars-Peter Clausen:

Quoted 3 lines

Looks pretty good now. But there are still some IIO remnants which should be removed as well. Also the driver should move to drivers/rtc/ since, well, it's a rtc driver not a IIO driver.

I think it still should be stick to iio, because that is where all HID sensors currently are found and where the user would expect to find such a driver.

Quoted 3 lines

drivers/iio/time/hid-sensor-time.c line 62

Quoted 3 lines

drivers/iio/time/hid-sensor-time.c new file +2 -0

+/* Channel definitions */
+static const struct iio_chan_spec hid_time_channels[TIME_RTC_CHANNEL_MAX] = {

And that is imho the last remaining iio-stuff. If necessary I can remove it too.

Quoted 6 lines

Am 10.12.2012 18:05, schrieb Lars-Peter Clausen:

Quoted 3 lines

Looks pretty good now. But there are still some IIO remnants which should be removed as well. Also the driver should move to drivers/rtc/ since, well, it's a rtc driver not a IIO driver.

Quoted 3 lines

I think it still should be stick to iio, because that is where all HID sensors currently are found and where the user would expect to find such a driver.

That's because all the current IIO sensor drivers fall in the IIO domain. This one clearly is a RTC driver, so it belongs in drivers/rtc/

Quoted 7 lines

Quoted 4 lines

drivers/iio/time/hid-sensor-time.c line 62

Quoted 4 lines

drivers/iio/time/hid-sensor-time.c new file +2 -0

+/* Channel definitions */
+static const struct iio_chan_spec hid_time_channels[TIME_RTC_CHANNEL_MAX] = {

And that is imho the last remaining iio-stuff. If necessary I can remove it too.

That and the remaining bits of the read_raw callback.

Am 10.12.2012 21:22, schrieb Lars-Peter Clausen:

Quoted 11 lines · Alexander Holler

Quoted 9 lines

Am 10.12.2012 18:05, schrieb Lars-Peter Clausen:

Quoted 3 lines

Looks pretty good now. But there are still some IIO remnants which should be removed as well. Also the driver should move to drivers/rtc/ since, well, it's a rtc driver not a IIO driver.

I think it still should be stick to iio, because that is where all HID sensors currently are found and where the user would expect to find such a driver.

Quoted 2 lines

That's because all the current IIO sensor drivers fall in the IIO domain. This one clearly is a RTC driver, so it belongs in drivers/rtc/

Where nobody will find it if he searches for drivers for his HID sensor. I still see it as HID sensor driver and not a rtc-driver. But ...

Quoted 9 lines

Quoted 8 lines

Quoted 5 lines

drivers/iio/time/hid-sensor-time.c line 62

Quoted 5 lines

drivers/iio/time/hid-sensor-time.c new file +2 -0

+/* Channel definitions */
+static const struct iio_chan_spec hid_time_channels[TIME_RTC_CHANNEL_MAX] = {

And that is imho the last remaining iio-stuff. If necessary I can remove it too.

Quoted 1 line

That and the remaining bits of the read_raw callback.

Ok. I will make a v3.

Quoted 15 lines · Alexander Holler

Am 10.12.2012 21:22, schrieb Lars-Peter Clausen:

Quoted 13 lines · Alexander Holler

Quoted 9 lines

Am 10.12.2012 18:05, schrieb Lars-Peter Clausen:

Quoted 3 lines

Looks pretty good now. But there are still some IIO remnants which should be removed as well. Also the driver should move to drivers/rtc/ since, well, it's a rtc driver not a IIO driver.

I think it still should be stick to iio, because that is where all HID sensors currently are found and where the user would expect to find such a driver.

That's because all the current IIO sensor drivers fall in the IIO domain. This one clearly is a RTC driver, so it belongs in drivers/rtc/

Quoted 3 lines

Where nobody will find it if he searches for drivers for his HID sensor. I still see it as HID sensor driver and not a rtc-driver. But ...

I can understand your position, but drivers are usually grouped by function not by topology. If there is a proper Kconfig help text people should hopefully be find it.

Quoted 10 lines

Quoted 10 lines

Quoted 9 lines

Quoted 6 lines

drivers/iio/time/hid-sensor-time.c line 62

Quoted 6 lines

drivers/iio/time/hid-sensor-time.c new file +2 -0

+/* Channel definitions */
+static const struct iio_chan_spec hid_time_channels[TIME_RTC_CHANNEL_MAX] = {

And that is imho the last remaining iio-stuff. If necessary I can remove it too.

Quoted 4 lines

Quoted 1 line

That and the remaining bits of the read_raw callback.

Ok. I will make a v3.

Btw. have you seen the other comments I had inline in my response to your v2? --
To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Quoted 20 lines · Alexander Holler

Quoted 18 lines

Am 10.12.2012 21:22, schrieb Lars-Peter Clausen:

Quoted 7 lines · Alexander Holler

Quoted 6 lines

Am 10.12.2012 18:05, schrieb Lars-Peter Clausen:

Quoted 3 lines

Looks pretty good now. But there are still some IIO remnants which should be removed as well. Also the driver should move to drivers/rtc/ since, well, it's a rtc driver not a IIO driver.

Quoted 6 lines

Quoted 3 lines

I think it still should be stick to iio, because that is where all HID sensors currently are found and where the user would expect to find such a driver.

That's because all the current IIO sensor drivers fall in the IIO domain. This one clearly is a RTC driver, so it belongs in drivers/rtc/

Where nobody will find it if he searches for drivers for his HID sensor. I still see it as HID sensor driver and not a rtc-driver. But ...

Quoted 3 lines

I can understand your position, but drivers are usually grouped by function not by topology. If there is a proper Kconfig help text people should hopefully be find it.

Seconded on this. If it is a pure rtc driver then it definitely belongs in drivers/rtc. Now there might have been ways of doing this as a consumer / provider with the provider being in IIO and the consumer in rtc, but that sounds like it is over compicating things, at least for now.

Am 10.12.2012 22:42, schrieb Jonathan Cameron:

Quoted 32 lines · Lars-Peter Clausen

Quoted 26 lines · Alexander Holler

Quoted 16 lines

Am 10.12.2012 21:22, schrieb Lars-Peter Clausen:

Quoted 15 lines · Alexander Holler

Quoted 13 lines

Am 10.12.2012 18:05, schrieb Lars-Peter Clausen:

Quoted 5 lines

Looks pretty good now. But there are still some IIO remnants which should be
removed as well. Also the driver should move to drivers/rtc/ since, well,
it's a rtc driver not a IIO driver.

I think it still should be stick to iio, because that is where all HID
sensors currently are found and where the user would expect to find such
a driver.

Quoted 8 lines

Quoted 3 lines

That's because all the current IIO sensor drivers fall in the IIO domain. This
one clearly is a RTC driver, so it belongs in drivers/rtc/

Where nobody will find it if he searches for drivers for his HID sensor.
I still see it as HID sensor driver and not a rtc-driver. But ...

Quoted 5 lines

I can understand your position, but drivers are usually grouped by function not
by topology. If there is a proper Kconfig help text people should hopefully be
find it.

Quoted 7 lines

Seconded on this. If it is a pure rtc driver then it definitely belongs in
drivers/rtc. Now there might have been ways of doing this as a consumer / provider
with the provider being in IIO and the consumer in rtc, but that sounds like
it is over compicating things, at least for now.

Personally I just want to use it to have HID-USB_RTCs. ;)

But in case of HID sensor hubs, the main usage of that driver will be to set the time of such hubs (something I still have to make patches for), and not to read it. So if you think as an HID sensor user, it should belong to iio or wherever those sensor will finally end up (I think they should end up in HID and should be usable by bluetooth devices too), but if you creatively misuse the standard to get a driver for USB-RTCs, as I want, then rtc is the correct place. ;)

Because I don't want to do a v4:

the driver has an

#include "../common/hid-sensors/hid-sensor-attributes.h"

so moving it to drivers/rtc/ will make that even more ugly.

Suggestions? I don't really care and as I'm currently at the order receiving end ;) I would change it to whatever the maintainers are wanting. Maybe moving that header to include/linux or even integrating it into include/linux/hid-sensor-hubs.h makes sense.

Regards,

Alexander

Quoted 43 lines · Alexander Holler

Am 10.12.2012 22:42, schrieb Jonathan Cameron:

Quoted 32 lines · Lars-Peter Clausen

Quoted 26 lines · Alexander Holler

Quoted 16 lines

Am 10.12.2012 21:22, schrieb Lars-Peter Clausen:

Quoted 15 lines · Alexander Holler

Quoted 13 lines

Am 10.12.2012 18:05, schrieb Lars-Peter Clausen:

Quoted 5 lines

Looks pretty good now. But there are still some IIO remnants which should be
removed as well. Also the driver should move to drivers/rtc/ since, well,
it's a rtc driver not a IIO driver.

I think it still should be stick to iio, because that is where all HID
sensors currently are found and where the user would expect to find such
a driver.

Quoted 8 lines

Quoted 3 lines

That's because all the current IIO sensor drivers fall in the IIO domain. This
one clearly is a RTC driver, so it belongs in drivers/rtc/

Where nobody will find it if he searches for drivers for his HID sensor.
I still see it as HID sensor driver and not a rtc-driver. But ...

Quoted 5 lines

I can understand your position, but drivers are usually grouped by function not
by topology. If there is a proper Kconfig help text people should hopefully be
find it.

Quoted 7 lines

Seconded on this. If it is a pure rtc driver then it definitely belongs in
drivers/rtc. Now there might have been ways of doing this as a consumer / provider
with the provider being in IIO and the consumer in rtc, but that sounds like
it is over compicating things, at least for now.

Personally I just want to use it to have HID-USB_RTCs. ;)

Quoted 7 lines

But in case of HID sensor hubs, the main usage of that driver will be to set the time of such hubs (something I still have to make patches for), and not to read it. So if you think as an HID sensor user, it should belong to iio or wherever those sensor will finally end up (I think they should end up in HID and should be usable by bluetooth devices too), but if you creatively misuse the standard to get a driver for USB-RTCs, as I want, then rtc is the correct place. ;)

I did wonder what you were up to ;)

Quoted 9 lines

Because I don't want to do a v4:

the driver has an

#include "../common/hid-sensors/hid-sensor-attributes.h"

so moving it to drivers/rtc/ will make that even more ugly.

Quoted 4 lines

Suggestions? I don't really care and as I'm currently at the order receiving end ;) I would change it to whatever the maintainers are wanting. Maybe moving that header to include/linux or even integrating it into include/linux/hid-sensor-hubs.h makes sense.

Yes, move the header or merge into existing one as makes sense. I'm not pulling this driver into the IIO tree (unless for some reason Alessandro wants me to and I can't think why he would...).

Quoted 4 lines

Yes, move the header or merge into existing one as makes sense. I'm not pulling this driver into the IIO tree (unless for some reason Alessandro wants me to and I can't think why he would...).

Alessandro has been pretty quiet for quite some time now. Luckily Andrew Morton usually picks up the stuff for orphaned subsystems. So put him on Cc for v4.

Am 11.12.2012 10:40, schrieb Lars-Peter Clausen:

Quoted 9 lines

Quoted 4 lines

Yes, move the header or merge into existing one as makes sense. I'm not pulling this driver into the IIO tree (unless for some reason Alessandro wants me to and I can't think why he would...).

Alessandro has been pretty quiet for quite some time now. Luckily Andrew Morton usually picks up the stuff for orphaned subsystems. So put him on Cc
for v4.

Will do it. Thanks a lot for your review.

I willl post the whole series (4 patches including the merge of hid-sensor-attributes.h) again, when I've finished v3 of the driver (hopefully this evening), marking some patches as RESEND. So 3 out of those 4 patches will be for iio (as hid-sensor-hub is part of it), and the last one, the rtc driver itself, will be for the rtc subsystem. I don't know if they have to be pulled by different maintainers. ;)

Regards,

Alexander

These are Usage IDs for the attributes year, month, day, hour, minute and second, needed to read HID time sensors.

Signed-off-by Alexander Holler <[email protected]>

---
 include/linux/hid-sensor-ids.h |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

include/linux/hid-sensor-ids.h +9 -0

index ca8d7e9..3754ea9 100644
@@ -67,6 +67,15 @@
 #define HID_USAGE_SENSOR_ORIENT_MAGN_FLUX_Y_AXIS		0x200486
 #define HID_USAGE_SENSOR_ORIENT_MAGN_FLUX_Z_AXIS		0x200487
 
+/* Time (2000a0) */
+#define HID_USAGE_SENSOR_TIME					0x2000a0
+#define HID_USAGE_SENSOR_TIME_YEAR				0x200521
+#define HID_USAGE_SENSOR_TIME_MONTH				0x200522
+#define HID_USAGE_SENSOR_TIME_DAY				0x200523
+#define HID_USAGE_SENSOR_TIME_HOUR				0x200525
+#define HID_USAGE_SENSOR_TIME_MINUTE				0x200526
+#define HID_USAGE_SENSOR_TIME_SECOND				0x200527
+
 /* Units */
 #define HID_USAGE_SENSOR_UNITS_NOT_SPECIFIED			0x00
 #define HID_USAGE_SENSOR_UNITS_LUX				0x01

Quoted 4 lines

These are Usage IDs for the attributes year, month, day, hour, minute and second, needed to read HID time sensors.

Signed-off-by Alexander Holler <[email protected]>

This has gotten very messy to follow. Could you resend the

patches (without the first) with Jiri cc'd as well (as some of this is in his domain as HID maintainer).

Given this makes quite a few changes in IIO drivers I'm happy to take the lot through the IIO tree but to do that I would like a go ahead from Jiri + either Andrew or Alessandro (for rtc side of things).

The stuff in hid-sensor-attributes.h is needed by every piece which uses hid-sensor-hub and merging it into hid-sensor-hub.h makes it accessible from outside the iio subdirectory.

Signed-off-by Alexander Holler <[email protected]>

---
 drivers/iio/accel/hid-sensor-accel-3d.c            |    1 -
 .../iio/common/hid-sensors/hid-sensor-attributes.c |    1 -
 .../iio/common/hid-sensors/hid-sensor-attributes.h |   57 --------------------
 .../iio/common/hid-sensors/hid-sensor-trigger.c    |    1 -
 drivers/iio/gyro/hid-sensor-gyro-3d.c              |    1 -
 drivers/iio/light/hid-sensor-als.c                 |    1 -
 drivers/iio/magnetometer/hid-sensor-magn-3d.c      |    1 -
 include/linux/hid-sensor-hub.h                     |   38 +++++++++++++
 8 files changed, 38 insertions(+), 63 deletions(-)
 delete mode 100644 drivers/iio/common/hid-sensors/hid-sensor-attributes.h

drivers/iio/accel/hid-sensor-accel-3d.c +0 -1

index 314a405..72371aa 100644
@@ -28,7 +28,6 @@
 #include <linux/iio/buffer.h>
 #include <linux/iio/trigger_consumer.h>
 #include <linux/iio/triggered_buffer.h>
-#include "../common/hid-sensors/hid-sensor-attributes.h"
 #include "../common/hid-sensors/hid-sensor-trigger.h"
 
 /*Format: HID-SENSOR-usage_id_in_hex*/

drivers/iio/common/hid-sensors/hid-sensor-attributes.c +0 -1

index 7537495..5873f16 100644
@@ -25,7 +25,6 @@
 #include <linux/hid-sensor-hub.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
-#include "hid-sensor-attributes.h"
 
 static int pow_10(unsigned power)
 {

drivers/iio/common/hid-sensors/hid-sensor-attributes.h deleted +0 -57

deleted file mode 100644
index a4676a0..0000000
@@ -1,57 +0,0 @@
-/*
- * HID Sensors Driver
- * Copyright (c) 2012, Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
-#ifndef _HID_SENSORS_ATTRIBUTES_H
-#define _HID_SENSORS_ATTRIBUTES_H
-
-/* Common hid sensor iio structure */
-struct hid_sensor_iio_common {
-	struct hid_sensor_hub_device *hsdev;
-	struct platform_device *pdev;
-	unsigned usage_id;
-	bool data_ready;
-	struct hid_sensor_hub_attribute_info poll;
-	struct hid_sensor_hub_attribute_info report_state;
-	struct hid_sensor_hub_attribute_info power_state;
-	struct hid_sensor_hub_attribute_info sensitivity;
-};
-
-/*Convert from hid unit expo to regular exponent*/
-static inline int hid_sensor_convert_exponent(int unit_expo)
-{
-	if (unit_expo < 0x08)
-		return unit_expo;
-	else if (unit_expo <= 0x0f)
-		return -(0x0f-unit_expo+1);
-	else
-		return 0;
-}
-
-int hid_sensor_parse_common_attributes(struct hid_sensor_hub_device *hsdev,
-					u32 usage_id,
-					struct hid_sensor_iio_common *st);
-int hid_sensor_write_raw_hyst_value(struct hid_sensor_iio_common *st,
-					int val1, int val2);
-int hid_sensor_read_raw_hyst_value(struct hid_sensor_iio_common *st,
-					int *val1, int *val2);
-int hid_sensor_write_samp_freq_value(struct hid_sensor_iio_common *st,
-					int val1, int val2);
-int hid_sensor_read_samp_freq_value(struct hid_sensor_iio_common *st,
-					int *val1, int *val2);
-
-#endif

drivers/iio/common/hid-sensors/hid-sensor-trigger.c +0 -1

index d4b790d..b097b68 100644
@@ -26,7 +26,6 @@
 #include <linux/iio/iio.h>
 #include <linux/iio/trigger.h>
 #include <linux/iio/sysfs.h>
-#include "hid-sensor-attributes.h"
 #include "hid-sensor-trigger.h"
 
 static int hid_sensor_data_rdy_trigger_set_state(struct iio_trigger *trig,

drivers/iio/gyro/hid-sensor-gyro-3d.c +0 -1

index 4c56ada..b98cd70 100644
@@ -28,7 +28,6 @@
 #include <linux/iio/buffer.h>
 #include <linux/iio/trigger_consumer.h>
 #include <linux/iio/triggered_buffer.h>
-#include "../common/hid-sensors/hid-sensor-attributes.h"
 #include "../common/hid-sensors/hid-sensor-trigger.h"
 
 /*Format: HID-SENSOR-usage_id_in_hex*/

drivers/iio/light/hid-sensor-als.c +0 -1

index 96e3691..9610989 100644
@@ -28,7 +28,6 @@
 #include <linux/iio/buffer.h>
 #include <linux/iio/trigger_consumer.h>
 #include <linux/iio/triggered_buffer.h>
-#include "../common/hid-sensors/hid-sensor-attributes.h"
 #include "../common/hid-sensors/hid-sensor-trigger.h"
 
 /*Format: HID-SENSOR-usage_id_in_hex*/

drivers/iio/magnetometer/hid-sensor-magn-3d.c +0 -1

index c4f0d27..4957430 100644
@@ -28,7 +28,6 @@
 #include <linux/iio/buffer.h>
 #include <linux/iio/trigger_consumer.h>
 #include <linux/iio/triggered_buffer.h>
-#include "../common/hid-sensors/hid-sensor-attributes.h"
 #include "../common/hid-sensors/hid-sensor-trigger.h"
 
 /*Format: HID-SENSOR-usage_id_in_hex*/

include/linux/hid-sensor-hub.h +38 -0

index 0aa5f4c..e6265f9 100644
@@ -157,4 +157,42 @@ int sensor_hub_set_feature(struct hid_sensor_hub_device *hsdev, u32 report_id,
 */
 int sensor_hub_get_feature(struct hid_sensor_hub_device *hsdev, u32 report_id,
 			u32 field_index, s32 *value);
+
+/* hid-sensor-attributes */
+
+/* Common hid sensor iio structure */
+struct hid_sensor_iio_common {
+	struct hid_sensor_hub_device *hsdev;
+	struct platform_device *pdev;
+	unsigned usage_id;
+	bool data_ready;
+	struct hid_sensor_hub_attribute_info poll;
+	struct hid_sensor_hub_attribute_info report_state;
+	struct hid_sensor_hub_attribute_info power_state;
+	struct hid_sensor_hub_attribute_info sensitivity;
+};
+
+/*Convert from hid unit expo to regular exponent*/
+static inline int hid_sensor_convert_exponent(int unit_expo)
+{
+	if (unit_expo < 0x08)
+		return unit_expo;
+	else if (unit_expo <= 0x0f)
+		return -(0x0f-unit_expo+1);
+	else
+		return 0;
+}
+
+int hid_sensor_parse_common_attributes(struct hid_sensor_hub_device *hsdev,
+					u32 usage_id,
+					struct hid_sensor_iio_common *st);
+int hid_sensor_write_raw_hyst_value(struct hid_sensor_iio_common *st,
+					int val1, int val2);
+int hid_sensor_read_raw_hyst_value(struct hid_sensor_iio_common *st,
+					int *val1, int *val2);
+int hid_sensor_write_samp_freq_value(struct hid_sensor_iio_common *st,
+					int val1, int val2);
+int hid_sensor_read_samp_freq_value(struct hid_sensor_iio_common *st,
+					int *val1, int *val2);
+
 #endif

Signature · 1 line

1.7.8.6

Quoted 5 lines · Alexander Holler

The stuff in hid-sensor-attributes.h is needed by every piece which uses hid-sensor-hub and merging it into hid-sensor-hub.h makes it accessible from outside the iio subdirectory.

Signed-off-by Alexander Holler <[email protected]>

Acked-by Jiri Kosina <[email protected]>

Quoted 198 lines

---
 drivers/iio/accel/hid-sensor-accel-3d.c            |    1 -
 .../iio/common/hid-sensors/hid-sensor-attributes.c |    1 -
 .../iio/common/hid-sensors/hid-sensor-attributes.h |   57 --------------------
 .../iio/common/hid-sensors/hid-sensor-trigger.c    |    1 -
 drivers/iio/gyro/hid-sensor-gyro-3d.c              |    1 -
 drivers/iio/light/hid-sensor-als.c                 |    1 -
 drivers/iio/magnetometer/hid-sensor-magn-3d.c      |    1 -
 include/linux/hid-sensor-hub.h                     |   38 +++++++++++++
 8 files changed, 38 insertions(+), 63 deletions(-)
 delete mode 100644 drivers/iio/common/hid-sensors/hid-sensor-attributes.h

drivers/iio/accel/hid-sensor-accel-3d.c +0 -1

index 314a405..72371aa 100644
@@ -28,7 +28,6 @@
 #include <linux/iio/buffer.h>
 #include <linux/iio/trigger_consumer.h>
 #include <linux/iio/triggered_buffer.h>
-#include "../common/hid-sensors/hid-sensor-attributes.h"
 #include "../common/hid-sensors/hid-sensor-trigger.h"
 
 /*Format: HID-SENSOR-usage_id_in_hex*/

drivers/iio/common/hid-sensors/hid-sensor-attributes.c +0 -1

index 7537495..5873f16 100644
@@ -25,7 +25,6 @@
 #include <linux/hid-sensor-hub.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
-#include "hid-sensor-attributes.h"
 
 static int pow_10(unsigned power)
 {

drivers/iio/common/hid-sensors/hid-sensor-attributes.h deleted +0 -57

deleted file mode 100644
index a4676a0..0000000
@@ -1,57 +0,0 @@
-/*
- * HID Sensors Driver
- * Copyright (c) 2012, Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
-#ifndef _HID_SENSORS_ATTRIBUTES_H
-#define _HID_SENSORS_ATTRIBUTES_H
-
-/* Common hid sensor iio structure */
-struct hid_sensor_iio_common {
-	struct hid_sensor_hub_device *hsdev;
-	struct platform_device *pdev;
-	unsigned usage_id;
-	bool data_ready;
-	struct hid_sensor_hub_attribute_info poll;
-	struct hid_sensor_hub_attribute_info report_state;
-	struct hid_sensor_hub_attribute_info power_state;
-	struct hid_sensor_hub_attribute_info sensitivity;
-};
-
-/*Convert from hid unit expo to regular exponent*/
-static inline int hid_sensor_convert_exponent(int unit_expo)
-{
-	if (unit_expo < 0x08)
-		return unit_expo;
-	else if (unit_expo <= 0x0f)
-		return -(0x0f-unit_expo+1);
-	else
-		return 0;
-}
-
-int hid_sensor_parse_common_attributes(struct hid_sensor_hub_device *hsdev,
-					u32 usage_id,
-					struct hid_sensor_iio_common *st);
-int hid_sensor_write_raw_hyst_value(struct hid_sensor_iio_common *st,
-					int val1, int val2);
-int hid_sensor_read_raw_hyst_value(struct hid_sensor_iio_common *st,
-					int *val1, int *val2);
-int hid_sensor_write_samp_freq_value(struct hid_sensor_iio_common *st,
-					int val1, int val2);
-int hid_sensor_read_samp_freq_value(struct hid_sensor_iio_common *st,
-					int *val1, int *val2);
-
-#endif

drivers/iio/common/hid-sensors/hid-sensor-trigger.c +0 -1

index d4b790d..b097b68 100644
@@ -26,7 +26,6 @@
 #include <linux/iio/iio.h>
 #include <linux/iio/trigger.h>
 #include <linux/iio/sysfs.h>
-#include "hid-sensor-attributes.h"
 #include "hid-sensor-trigger.h"
 
 static int hid_sensor_data_rdy_trigger_set_state(struct iio_trigger *trig,

drivers/iio/gyro/hid-sensor-gyro-3d.c +0 -1

index 4c56ada..b98cd70 100644
@@ -28,7 +28,6 @@
 #include <linux/iio/buffer.h>
 #include <linux/iio/trigger_consumer.h>
 #include <linux/iio/triggered_buffer.h>
-#include "../common/hid-sensors/hid-sensor-attributes.h"
 #include "../common/hid-sensors/hid-sensor-trigger.h"
 
 /*Format: HID-SENSOR-usage_id_in_hex*/

drivers/iio/light/hid-sensor-als.c +0 -1

index 96e3691..9610989 100644
@@ -28,7 +28,6 @@
 #include <linux/iio/buffer.h>
 #include <linux/iio/trigger_consumer.h>
 #include <linux/iio/triggered_buffer.h>
-#include "../common/hid-sensors/hid-sensor-attributes.h"
 #include "../common/hid-sensors/hid-sensor-trigger.h"
 
 /*Format: HID-SENSOR-usage_id_in_hex*/

drivers/iio/magnetometer/hid-sensor-magn-3d.c +0 -1

index c4f0d27..4957430 100644
@@ -28,7 +28,6 @@
 #include <linux/iio/buffer.h>
 #include <linux/iio/trigger_consumer.h>
 #include <linux/iio/triggered_buffer.h>
-#include "../common/hid-sensors/hid-sensor-attributes.h"
 #include "../common/hid-sensors/hid-sensor-trigger.h"
 
 /*Format: HID-SENSOR-usage_id_in_hex*/

include/linux/hid-sensor-hub.h +38 -0

index 0aa5f4c..e6265f9 100644
@@ -157,4 +157,42 @@ int sensor_hub_set_feature(struct hid_sensor_hub_device *hsdev, u32 report_id,
 */
 int sensor_hub_get_feature(struct hid_sensor_hub_device *hsdev, u32 report_id,
 			u32 field_index, s32 *value);
+
+/* hid-sensor-attributes */
+
+/* Common hid sensor iio structure */
+struct hid_sensor_iio_common {
+	struct hid_sensor_hub_device *hsdev;
+	struct platform_device *pdev;
+	unsigned usage_id;
+	bool data_ready;
+	struct hid_sensor_hub_attribute_info poll;
+	struct hid_sensor_hub_attribute_info report_state;
+	struct hid_sensor_hub_attribute_info power_state;
+	struct hid_sensor_hub_attribute_info sensitivity;
+};
+
+/*Convert from hid unit expo to regular exponent*/
+static inline int hid_sensor_convert_exponent(int unit_expo)
+{
+	if (unit_expo < 0x08)
+		return unit_expo;
+	else if (unit_expo <= 0x0f)
+		return -(0x0f-unit_expo+1);
+	else
+		return 0;
+}
+
+int hid_sensor_parse_common_attributes(struct hid_sensor_hub_device *hsdev,
+					u32 usage_id,
+					struct hid_sensor_iio_common *st);
+int hid_sensor_write_raw_hyst_value(struct hid_sensor_iio_common *st,
+					int val1, int val2);
+int hid_sensor_read_raw_hyst_value(struct hid_sensor_iio_common *st,
+					int *val1, int *val2);
+int hid_sensor_write_samp_freq_value(struct hid_sensor_iio_common *st,
+					int val1, int val2);
+int hid_sensor_read_samp_freq_value(struct hid_sensor_iio_common *st,
+					int *val1, int *val2);
+
 #endif

Signature · 1 line

1.7.8.6

This driver makes the time from HID sensors (hubs) which are offering such available like any other RTC does.

It is necessary that all values like year, month etc, are send as 8bit values (1 byte each) and all of them in 1 report. Also the spec HUTRR39b doesn't define the range of the year field, we tread it as 0 - 99 because that's what most RTCs I know about are offering.

Currently the time can only be read. Setting the time must be done through sending a report (or a feature). The spec currently doesn't define how and I'm not sure if I just should define something by myself.

Quoted 9 lines

This driver makes the time from HID sensors (hubs) which are offering such available like any other RTC does.

It is necessary that all values like year, month etc, are send as 8bit values (1 byte each) and all of them in 1 report. Also the spec HUTRR39b doesn't define the range of the year field, we tread it as 0 - 99 because that's what most RTCs I know about are offering.

Quoted 4 lines

Currently the time can only be read. Setting the time must be done through sending a report (or a feature). The spec currently doesn't define how and I'm not sure if I just should define something by myself.

Looks OK to me. It sounds like Jonathan will be merging these patches when he's happy with them - please do proceed that way.

Quoted 3 lines

Quoted 3 lines

This driver makes the time from HID sensors (hubs) which are offering such available like any other RTC does.

Quoted 2 lines

Looks OK to me. It sounds like Jonathan will be merging these patches when he's happy with them - please do proceed that way.

Yes, fine by me as well -- that's why I have provided by explicit Acks to those.

Jonathan, are you taking those, please?

Am 04.01.2013 10:18, schrieb Jiri Kosina:

Quoted 12 lines · Andrew Morton

Quoted 6 lines

Quoted 3 lines

This driver makes the time from HID sensors (hubs) which are offering such available like any other RTC does.

Looks OK to me. It sounds like Jonathan will be merging these patches when he's happy with them - please do proceed that way.

Yes, fine by me as well -- that's why I have provided by explicit Acks to those.

Jonathan, are you taking those, please?

Thanks to all.

Btw. if someone wants to build such a pluggable HID-USB-RTC using an AVR (Arduino Leonardo, or an ATtiny with v-usb), feel free to contact me. I have some working sources around and will write a website with "exact steps" ;) if I find the time. Currently the stuff is still in ugly state, but if someone needs a starting point (e.g. for the HID descriptors), it is already usable.

Regards,

Alexander

Signature · 3 lines

To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

The structure with common attributes for hid-sensors isn't specific to the iio-subsystem, so rename it to hid_sensor_common.

Signed-off-by Alexander Holler <[email protected]>

---
 drivers/iio/accel/hid-sensor-accel-3d.c            |    2 +-
 .../iio/common/hid-sensors/hid-sensor-attributes.c |   10 +++++-----
 .../iio/common/hid-sensors/hid-sensor-trigger.c    |    4 ++--
 .../iio/common/hid-sensors/hid-sensor-trigger.h    |    2 +-
 drivers/iio/gyro/hid-sensor-gyro-3d.c              |    2 +-
 drivers/iio/light/hid-sensor-als.c                 |    2 +-
 drivers/iio/magnetometer/hid-sensor-magn-3d.c      |    2 +-
 drivers/rtc/rtc-hid-sensor-time.c                  |    2 +-
 include/linux/hid-sensor-hub.h                     |   12 ++++++------
 9 files changed, 19 insertions(+), 19 deletions(-)

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

index 72371aa..2133da8 100644
@@ -43,7 +43,7 @@ enum accel_3d_channel {
 
 struct accel_3d_state {
 	struct hid_sensor_hub_callbacks callbacks;
-	struct hid_sensor_iio_common common_attributes;
+	struct hid_sensor_common common_attributes;
 	struct hid_sensor_hub_attribute_info accel[ACCEL_3D_CHANNEL_MAX];
 	u32 accel_val[ACCEL_3D_CHANNEL_MAX];
 };

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

index 5873f16..75b5473 100644
@@ -113,7 +113,7 @@ static u32 convert_to_vtf_format(int size, int exp, int val1, int val2)
 	return value;
 }
 
-int hid_sensor_read_samp_freq_value(struct hid_sensor_iio_common *st,
+int hid_sensor_read_samp_freq_value(struct hid_sensor_common *st,
 				int *val1, int *val2)
 {
 	s32 value;

@@ -140,7 +140,7 @@ int hid_sensor_read_samp_freq_value(struct hid_sensor_iio_common *st,
 }
 EXPORT_SYMBOL(hid_sensor_read_samp_freq_value);
 
-int hid_sensor_write_samp_freq_value(struct hid_sensor_iio_common *st,
+int hid_sensor_write_samp_freq_value(struct hid_sensor_common *st,
 				int val1, int val2)
 {
 	s32 value;

@@ -168,7 +168,7 @@ int hid_sensor_write_samp_freq_value(struct hid_sensor_iio_common *st,
 }
 EXPORT_SYMBOL(hid_sensor_write_samp_freq_value);
 
-int hid_sensor_read_raw_hyst_value(struct hid_sensor_iio_common *st,
+int hid_sensor_read_raw_hyst_value(struct hid_sensor_common *st,
 				int *val1, int *val2)
 {
 	s32 value;

@@ -190,7 +190,7 @@ int hid_sensor_read_raw_hyst_value(struct hid_sensor_iio_common *st,
 }
 EXPORT_SYMBOL(hid_sensor_read_raw_hyst_value);
 
-int hid_sensor_write_raw_hyst_value(struct hid_sensor_iio_common *st,
+int hid_sensor_write_raw_hyst_value(struct hid_sensor_common *st,
 					int val1, int val2)
 {
 	s32 value;

@@ -211,7 +211,7 @@ EXPORT_SYMBOL(hid_sensor_write_raw_hyst_value);
 
 int hid_sensor_parse_common_attributes(struct hid_sensor_hub_device *hsdev,
 					u32 usage_id,
-					struct hid_sensor_iio_common *st)
+					struct hid_sensor_common *st)
 {
 
 	sensor_hub_input_get_attribute_info(hsdev,

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

index b097b68..58fc108 100644
@@ -31,7 +31,7 @@
 static int hid_sensor_data_rdy_trigger_set_state(struct iio_trigger *trig,
 						bool state)
 {
-	struct hid_sensor_iio_common *st = trig->private_data;
+	struct hid_sensor_common *st = trig->private_data;
 	int state_val;
 
 	state_val = state ? 1 : 0;

@@ -65,7 +65,7 @@ static const struct iio_trigger_ops hid_sensor_trigger_ops = {
 };
 
 int hid_sensor_setup_trigger(struct iio_dev *indio_dev, const char *name,
-				struct hid_sensor_iio_common *attrb)
+				struct hid_sensor_common *attrb)
 {
 	int ret;
 	struct iio_trigger *trig;

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

index fd98297..9a87314 100644
@@ -20,7 +20,7 @@
 #define _HID_SENSOR_TRIGGER_H
 
 int hid_sensor_setup_trigger(struct iio_dev *indio_dev, const char *name,
-				struct hid_sensor_iio_common *attrb);
+				struct hid_sensor_common *attrb);
 void hid_sensor_remove_trigger(struct iio_dev *indio_dev);
 
 #endif

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

index b98cd70..85330ad 100644
@@ -43,7 +43,7 @@ enum gyro_3d_channel {
 
 struct gyro_3d_state {
 	struct hid_sensor_hub_callbacks callbacks;
-	struct hid_sensor_iio_common common_attributes;
+	struct hid_sensor_common common_attributes;
 	struct hid_sensor_hub_attribute_info gyro[GYRO_3D_CHANNEL_MAX];
 	u32 gyro_val[GYRO_3D_CHANNEL_MAX];
 };

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

index 9610989..051b88c 100644
@@ -38,7 +38,7 @@
 
 struct als_state {
 	struct hid_sensor_hub_callbacks callbacks;
-	struct hid_sensor_iio_common common_attributes;
+	struct hid_sensor_common common_attributes;
 	struct hid_sensor_hub_attribute_info als_illum;
 	u32 illum;
 };

drivers/iio/magnetometer/hid-sensor-magn-3d.c +1 -1

index 4957430..5c59044 100644
@@ -43,7 +43,7 @@ enum magn_3d_channel {
 
 struct magn_3d_state {
 	struct hid_sensor_hub_callbacks callbacks;
-	struct hid_sensor_iio_common common_attributes;
+	struct hid_sensor_common common_attributes;
 	struct hid_sensor_hub_attribute_info magn[MAGN_3D_CHANNEL_MAX];
 	u32 magn_val[MAGN_3D_CHANNEL_MAX];
 };

drivers/rtc/rtc-hid-sensor-time.c +1 -1

index 25cac6e..0438c9e 100644
@@ -39,7 +39,7 @@ enum hid_time_channel {
 
 struct hid_time_state {
 	struct hid_sensor_hub_callbacks callbacks;
-	struct hid_sensor_iio_common common_attributes;
+	struct hid_sensor_common common_attributes;
 	struct hid_sensor_hub_attribute_info info[TIME_RTC_CHANNEL_MAX];
 	struct rtc_time last_time;
 	spinlock_t lock_last_time;

include/linux/hid-sensor-hub.h +6 -6

index e6265f9..ecefb73 100644
@@ -161,7 +161,7 @@ int sensor_hub_get_feature(struct hid_sensor_hub_device *hsdev, u32 report_id,
 /* hid-sensor-attributes */
 
 /* Common hid sensor iio structure */
-struct hid_sensor_iio_common {
+struct hid_sensor_common {
 	struct hid_sensor_hub_device *hsdev;
 	struct platform_device *pdev;
 	unsigned usage_id;

@@ -185,14 +185,14 @@ static inline int hid_sensor_convert_exponent(int unit_expo)
 
 int hid_sensor_parse_common_attributes(struct hid_sensor_hub_device *hsdev,
 					u32 usage_id,
-					struct hid_sensor_iio_common *st);
-int hid_sensor_write_raw_hyst_value(struct hid_sensor_iio_common *st,
+					struct hid_sensor_common *st);
+int hid_sensor_write_raw_hyst_value(struct hid_sensor_common *st,
 					int val1, int val2);
-int hid_sensor_read_raw_hyst_value(struct hid_sensor_iio_common *st,
+int hid_sensor_read_raw_hyst_value(struct hid_sensor_common *st,
 					int *val1, int *val2);
-int hid_sensor_write_samp_freq_value(struct hid_sensor_iio_common *st,
+int hid_sensor_write_samp_freq_value(struct hid_sensor_common *st,
 					int val1, int val2);
-int hid_sensor_read_samp_freq_value(struct hid_sensor_iio_common *st,
+int hid_sensor_read_samp_freq_value(struct hid_sensor_common *st,
 					int *val1, int *val2);
 
 #endif

Signature · 1 line

1.7.8.6

Quoted 4 lines · Alexander Holler

The structure with common attributes for hid-sensors isn't specific to the iio-subsystem, so rename it to hid_sensor_common.

Signed-off-by Alexander Holler <[email protected]>

Acked-by Jiri Kosina <[email protected]>

Quoted 198 lines

---
 drivers/iio/accel/hid-sensor-accel-3d.c            |    2 +-
 .../iio/common/hid-sensors/hid-sensor-attributes.c |   10 +++++-----
 .../iio/common/hid-sensors/hid-sensor-trigger.c    |    4 ++--
 .../iio/common/hid-sensors/hid-sensor-trigger.h    |    2 +-
 drivers/iio/gyro/hid-sensor-gyro-3d.c              |    2 +-
 drivers/iio/light/hid-sensor-als.c                 |    2 +-
 drivers/iio/magnetometer/hid-sensor-magn-3d.c      |    2 +-
 drivers/rtc/rtc-hid-sensor-time.c                  |    2 +-
 include/linux/hid-sensor-hub.h                     |   12 ++++++------
 9 files changed, 19 insertions(+), 19 deletions(-)

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

index 72371aa..2133da8 100644
@@ -43,7 +43,7 @@ enum accel_3d_channel {
 
 struct accel_3d_state {
 	struct hid_sensor_hub_callbacks callbacks;
-	struct hid_sensor_iio_common common_attributes;
+	struct hid_sensor_common common_attributes;
 	struct hid_sensor_hub_attribute_info accel[ACCEL_3D_CHANNEL_MAX];
 	u32 accel_val[ACCEL_3D_CHANNEL_MAX];
 };

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

index 5873f16..75b5473 100644
@@ -113,7 +113,7 @@ static u32 convert_to_vtf_format(int size, int exp, int val1, int val2)
 	return value;
 }
 
-int hid_sensor_read_samp_freq_value(struct hid_sensor_iio_common *st,
+int hid_sensor_read_samp_freq_value(struct hid_sensor_common *st,
 				int *val1, int *val2)
 {
 	s32 value;

@@ -140,7 +140,7 @@ int hid_sensor_read_samp_freq_value(struct hid_sensor_iio_common *st,
 }
 EXPORT_SYMBOL(hid_sensor_read_samp_freq_value);
 
-int hid_sensor_write_samp_freq_value(struct hid_sensor_iio_common *st,
+int hid_sensor_write_samp_freq_value(struct hid_sensor_common *st,
 				int val1, int val2)
 {
 	s32 value;

@@ -168,7 +168,7 @@ int hid_sensor_write_samp_freq_value(struct hid_sensor_iio_common *st,
 }
 EXPORT_SYMBOL(hid_sensor_write_samp_freq_value);
 
-int hid_sensor_read_raw_hyst_value(struct hid_sensor_iio_common *st,
+int hid_sensor_read_raw_hyst_value(struct hid_sensor_common *st,
 				int *val1, int *val2)
 {
 	s32 value;

@@ -190,7 +190,7 @@ int hid_sensor_read_raw_hyst_value(struct hid_sensor_iio_common *st,
 }
 EXPORT_SYMBOL(hid_sensor_read_raw_hyst_value);
 
-int hid_sensor_write_raw_hyst_value(struct hid_sensor_iio_common *st,
+int hid_sensor_write_raw_hyst_value(struct hid_sensor_common *st,
 					int val1, int val2)
 {
 	s32 value;

@@ -211,7 +211,7 @@ EXPORT_SYMBOL(hid_sensor_write_raw_hyst_value);
 
 int hid_sensor_parse_common_attributes(struct hid_sensor_hub_device *hsdev,
 					u32 usage_id,
-					struct hid_sensor_iio_common *st)
+					struct hid_sensor_common *st)
 {
 
 	sensor_hub_input_get_attribute_info(hsdev,

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

index b097b68..58fc108 100644
@@ -31,7 +31,7 @@
 static int hid_sensor_data_rdy_trigger_set_state(struct iio_trigger *trig,
 						bool state)
 {
-	struct hid_sensor_iio_common *st = trig->private_data;
+	struct hid_sensor_common *st = trig->private_data;
 	int state_val;
 
 	state_val = state ? 1 : 0;

@@ -65,7 +65,7 @@ static const struct iio_trigger_ops hid_sensor_trigger_ops = {
 };
 
 int hid_sensor_setup_trigger(struct iio_dev *indio_dev, const char *name,
-				struct hid_sensor_iio_common *attrb)
+				struct hid_sensor_common *attrb)
 {
 	int ret;
 	struct iio_trigger *trig;

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

index fd98297..9a87314 100644
@@ -20,7 +20,7 @@
 #define _HID_SENSOR_TRIGGER_H
 
 int hid_sensor_setup_trigger(struct iio_dev *indio_dev, const char *name,
-				struct hid_sensor_iio_common *attrb);
+				struct hid_sensor_common *attrb);
 void hid_sensor_remove_trigger(struct iio_dev *indio_dev);
 
 #endif

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

index b98cd70..85330ad 100644
@@ -43,7 +43,7 @@ enum gyro_3d_channel {
 
 struct gyro_3d_state {
 	struct hid_sensor_hub_callbacks callbacks;
-	struct hid_sensor_iio_common common_attributes;
+	struct hid_sensor_common common_attributes;
 	struct hid_sensor_hub_attribute_info gyro[GYRO_3D_CHANNEL_MAX];
 	u32 gyro_val[GYRO_3D_CHANNEL_MAX];
 };

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

index 9610989..051b88c 100644
@@ -38,7 +38,7 @@
 
 struct als_state {
 	struct hid_sensor_hub_callbacks callbacks;
-	struct hid_sensor_iio_common common_attributes;
+	struct hid_sensor_common common_attributes;
 	struct hid_sensor_hub_attribute_info als_illum;
 	u32 illum;
 };

drivers/iio/magnetometer/hid-sensor-magn-3d.c +1 -1

index 4957430..5c59044 100644
@@ -43,7 +43,7 @@ enum magn_3d_channel {
 
 struct magn_3d_state {
 	struct hid_sensor_hub_callbacks callbacks;
-	struct hid_sensor_iio_common common_attributes;
+	struct hid_sensor_common common_attributes;
 	struct hid_sensor_hub_attribute_info magn[MAGN_3D_CHANNEL_MAX];
 	u32 magn_val[MAGN_3D_CHANNEL_MAX];
 };

drivers/rtc/rtc-hid-sensor-time.c +1 -1

index 25cac6e..0438c9e 100644
@@ -39,7 +39,7 @@ enum hid_time_channel {
 
 struct hid_time_state {
 	struct hid_sensor_hub_callbacks callbacks;
-	struct hid_sensor_iio_common common_attributes;
+	struct hid_sensor_common common_attributes;
 	struct hid_sensor_hub_attribute_info info[TIME_RTC_CHANNEL_MAX];
 	struct rtc_time last_time;
 	spinlock_t lock_last_time;

include/linux/hid-sensor-hub.h +6 -6

index e6265f9..ecefb73 100644
@@ -161,7 +161,7 @@ int sensor_hub_get_feature(struct hid_sensor_hub_device *hsdev, u32 report_id,
 /* hid-sensor-attributes */
 
 /* Common hid sensor iio structure */
-struct hid_sensor_iio_common {
+struct hid_sensor_common {
 	struct hid_sensor_hub_device *hsdev;
 	struct platform_device *pdev;
 	unsigned usage_id;

@@ -185,14 +185,14 @@ static inline int hid_sensor_convert_exponent(int unit_expo)
 
 int hid_sensor_parse_common_attributes(struct hid_sensor_hub_device *hsdev,
 					u32 usage_id,
-					struct hid_sensor_iio_common *st);
-int hid_sensor_write_raw_hyst_value(struct hid_sensor_iio_common *st,
+					struct hid_sensor_common *st);
+int hid_sensor_write_raw_hyst_value(struct hid_sensor_common *st,
 					int val1, int val2);
-int hid_sensor_read_raw_hyst_value(struct hid_sensor_iio_common *st,
+int hid_sensor_read_raw_hyst_value(struct hid_sensor_common *st,
 					int *val1, int *val2);
-int hid_sensor_write_samp_freq_value(struct hid_sensor_iio_common *st,
+int hid_sensor_write_samp_freq_value(struct hid_sensor_common *st,
 					int val1, int val2);
-int hid_sensor_read_samp_freq_value(struct hid_sensor_iio_common *st,
+int hid_sensor_read_samp_freq_value(struct hid_sensor_common *st,
 					int *val1, int *val2);
 
 #endif

Signature · 1 line

1.7.8.6

These are Usage IDs for the attributes year, month, day, hour, minute and second, needed to read HID time sensors.

Signed-off-by Alexander Holler <[email protected]>

---
 include/linux/hid-sensor-ids.h |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

include/linux/hid-sensor-ids.h +9 -0

index ca8d7e9..3754ea9 100644
@@ -67,6 +67,15 @@
 #define HID_USAGE_SENSOR_ORIENT_MAGN_FLUX_Y_AXIS		0x200486
 #define HID_USAGE_SENSOR_ORIENT_MAGN_FLUX_Z_AXIS		0x200487
 
+/* Time (2000a0) */
+#define HID_USAGE_SENSOR_TIME					0x2000a0
+#define HID_USAGE_SENSOR_TIME_YEAR				0x200521
+#define HID_USAGE_SENSOR_TIME_MONTH				0x200522
+#define HID_USAGE_SENSOR_TIME_DAY				0x200523
+#define HID_USAGE_SENSOR_TIME_HOUR				0x200525
+#define HID_USAGE_SENSOR_TIME_MINUTE				0x200526
+#define HID_USAGE_SENSOR_TIME_SECOND				0x200527
+
 /* Units */
 #define HID_USAGE_SENSOR_UNITS_NOT_SPECIFIED			0x00
 #define HID_USAGE_SENSOR_UNITS_LUX				0x01

Signature · 1 line

1.7.8.6

Quoted 4 lines · Alexander Holler

These are Usage IDs for the attributes year, month, day, hour, minute and second, needed to read HID time sensors.

Signed-off-by Alexander Holler <[email protected]>

Signed-off-by Jiri Kosina <[email protected]>

Quoted 28 lines

---
 include/linux/hid-sensor-ids.h |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

include/linux/hid-sensor-ids.h +9 -0

index ca8d7e9..3754ea9 100644
@@ -67,6 +67,15 @@
 #define HID_USAGE_SENSOR_ORIENT_MAGN_FLUX_Y_AXIS		0x200486
 #define HID_USAGE_SENSOR_ORIENT_MAGN_FLUX_Z_AXIS		0x200487
 
+/* Time (2000a0) */
+#define HID_USAGE_SENSOR_TIME					0x2000a0
+#define HID_USAGE_SENSOR_TIME_YEAR				0x200521
+#define HID_USAGE_SENSOR_TIME_MONTH				0x200522
+#define HID_USAGE_SENSOR_TIME_DAY				0x200523
+#define HID_USAGE_SENSOR_TIME_HOUR				0x200525
+#define HID_USAGE_SENSOR_TIME_MINUTE				0x200526
+#define HID_USAGE_SENSOR_TIME_SECOND				0x200527
+
 /* Units */
 #define HID_USAGE_SENSOR_UNITS_NOT_SPECIFIED			0x00
 #define HID_USAGE_SENSOR_UNITS_LUX				0x01

Signature · 1 line

1.7.8.6

One minor comment.

include/linux/hid-sensor-hub.h +12 -0

+/* hid-sensor-attributes */
+
+/* Common hid sensor iio structure */
+struct hid_sensor_iio_common {
+	struct hid_sensor_hub_device *hsdev;
+	struct platform_device *pdev;
+	unsigned usage_id;
+	bool data_ready;
+	struct hid_sensor_hub_attribute_info poll;
+	struct hid_sensor_hub_attribute_info report_state;
+	struct hid_sensor_hub_attribute_info power_state;
+	struct hid_sensor_hub_attribute_info sensitivity; };

<Since it is not common to iio only, we should also remove iio in the structure name. >