iio: hid-sensor-als: Add light chromaticity support
On some platforms, ambient color sensors also support the x and y light colors, which represent the coordinates on the CIE 1931 chromaticity diagram. Add light chromaticity x and y. Signed-off-by: Basavaraj Natikar <Basavaraj.Natikar@amd.com> Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Link: https://lore.kernel.org/r/20240205185926.3030521-5-srinivas.pandruvada@linux.intel.com Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
parent
3765d426fe
commit
2ec17b1950
2 changed files with 49 additions and 0 deletions
|
@ -17,6 +17,8 @@ enum {
|
|||
CHANNEL_SCAN_INDEX_INTENSITY,
|
||||
CHANNEL_SCAN_INDEX_ILLUM,
|
||||
CHANNEL_SCAN_INDEX_COLOR_TEMP,
|
||||
CHANNEL_SCAN_INDEX_CHROMATICITY_X,
|
||||
CHANNEL_SCAN_INDEX_CHROMATICITY_Y,
|
||||
CHANNEL_SCAN_INDEX_MAX
|
||||
};
|
||||
|
||||
|
@ -45,6 +47,8 @@ static const u32 als_usage_ids[] = {
|
|||
HID_USAGE_SENSOR_LIGHT_ILLUM,
|
||||
HID_USAGE_SENSOR_LIGHT_ILLUM,
|
||||
HID_USAGE_SENSOR_LIGHT_COLOR_TEMPERATURE,
|
||||
HID_USAGE_SENSOR_LIGHT_CHROMATICITY_X,
|
||||
HID_USAGE_SENSOR_LIGHT_CHROMATICITY_Y,
|
||||
};
|
||||
|
||||
static const u32 als_sensitivity_addresses[] = {
|
||||
|
@ -86,6 +90,30 @@ static const struct iio_chan_spec als_channels[] = {
|
|||
BIT(IIO_CHAN_INFO_HYSTERESIS_RELATIVE),
|
||||
.scan_index = CHANNEL_SCAN_INDEX_COLOR_TEMP,
|
||||
},
|
||||
{
|
||||
.type = IIO_CHROMATICITY,
|
||||
.modified = 1,
|
||||
.channel2 = IIO_MOD_X,
|
||||
.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
|
||||
.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) |
|
||||
BIT(IIO_CHAN_INFO_SCALE) |
|
||||
BIT(IIO_CHAN_INFO_SAMP_FREQ) |
|
||||
BIT(IIO_CHAN_INFO_HYSTERESIS) |
|
||||
BIT(IIO_CHAN_INFO_HYSTERESIS_RELATIVE),
|
||||
.scan_index = CHANNEL_SCAN_INDEX_CHROMATICITY_X,
|
||||
},
|
||||
{
|
||||
.type = IIO_CHROMATICITY,
|
||||
.modified = 1,
|
||||
.channel2 = IIO_MOD_Y,
|
||||
.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
|
||||
.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) |
|
||||
BIT(IIO_CHAN_INFO_SCALE) |
|
||||
BIT(IIO_CHAN_INFO_SAMP_FREQ) |
|
||||
BIT(IIO_CHAN_INFO_HYSTERESIS) |
|
||||
BIT(IIO_CHAN_INFO_HYSTERESIS_RELATIVE),
|
||||
.scan_index = CHANNEL_SCAN_INDEX_CHROMATICITY_Y,
|
||||
},
|
||||
IIO_CHAN_SOFT_TIMESTAMP(CHANNEL_SCAN_INDEX_TIMESTAMP)
|
||||
};
|
||||
|
||||
|
@ -129,6 +157,16 @@ static int als_read_raw(struct iio_dev *indio_dev,
|
|||
min = als_state->als[chan->scan_index].logical_minimum;
|
||||
address = HID_USAGE_SENSOR_LIGHT_COLOR_TEMPERATURE;
|
||||
break;
|
||||
case CHANNEL_SCAN_INDEX_CHROMATICITY_X:
|
||||
report_id = als_state->als[chan->scan_index].report_id;
|
||||
min = als_state->als[chan->scan_index].logical_minimum;
|
||||
address = HID_USAGE_SENSOR_LIGHT_CHROMATICITY_X;
|
||||
break;
|
||||
case CHANNEL_SCAN_INDEX_CHROMATICITY_Y:
|
||||
report_id = als_state->als[chan->scan_index].report_id;
|
||||
min = als_state->als[chan->scan_index].logical_minimum;
|
||||
address = HID_USAGE_SENSOR_LIGHT_CHROMATICITY_Y;
|
||||
break;
|
||||
default:
|
||||
report_id = -1;
|
||||
break;
|
||||
|
@ -253,6 +291,14 @@ static int als_capture_sample(struct hid_sensor_hub_device *hsdev,
|
|||
als_state->scan.illum[CHANNEL_SCAN_INDEX_COLOR_TEMP] = sample_data;
|
||||
ret = 0;
|
||||
break;
|
||||
case HID_USAGE_SENSOR_LIGHT_CHROMATICITY_X:
|
||||
als_state->scan.illum[CHANNEL_SCAN_INDEX_CHROMATICITY_X] = sample_data;
|
||||
ret = 0;
|
||||
break;
|
||||
case HID_USAGE_SENSOR_LIGHT_CHROMATICITY_Y:
|
||||
als_state->scan.illum[CHANNEL_SCAN_INDEX_CHROMATICITY_Y] = sample_data;
|
||||
ret = 0;
|
||||
break;
|
||||
case HID_USAGE_SENSOR_TIME_TIMESTAMP:
|
||||
als_state->timestamp = hid_sensor_convert_timestamp(&als_state->common_attributes,
|
||||
*(s64 *)raw_data);
|
||||
|
|
|
@ -22,6 +22,9 @@
|
|||
#define HID_USAGE_SENSOR_DATA_LIGHT 0x2004d0
|
||||
#define HID_USAGE_SENSOR_LIGHT_ILLUM 0x2004d1
|
||||
#define HID_USAGE_SENSOR_LIGHT_COLOR_TEMPERATURE 0x2004d2
|
||||
#define HID_USAGE_SENSOR_LIGHT_CHROMATICITY 0x2004d3
|
||||
#define HID_USAGE_SENSOR_LIGHT_CHROMATICITY_X 0x2004d4
|
||||
#define HID_USAGE_SENSOR_LIGHT_CHROMATICITY_Y 0x2004d5
|
||||
|
||||
/* PROX (200011) */
|
||||
#define HID_USAGE_SENSOR_PROX 0x200011
|
||||
|
|
Loading…
Reference in a new issue