Skip to content

Commit d400543

Browse files
spandruvadagregkh
authored andcommitted
Revert "iio: hid-sensor-als: Add light color temperature support"
This reverts commit 5f05285. This commit assumes that every HID descriptor for ALS sensor has presence of usage id ID HID_USAGE_SENSOR_LIGHT_COLOR_TEMPERATURE. When the above usage id is absent, driver probe fails. This breaks ALS sensor functionality on many platforms. Till we have a good solution, revert this commit. Reported-by: Thomas Weißschuh <thomas@t-8ch.de> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218223 Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Cc: <stable@vger.kernel.org> Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Link: https://lore.kernel.org/r/20231217200703.719876-3-srinivas.pandruvada@linux.intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent b9670ee commit d400543

File tree

2 files changed

+2
-36
lines changed

2 files changed

+2
-36
lines changed

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

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@
1414
#include "../common/hid-sensors/hid-sensor-trigger.h"
1515

1616
enum {
17-
CHANNEL_SCAN_INDEX_INTENSITY,
18-
CHANNEL_SCAN_INDEX_ILLUM,
19-
CHANNEL_SCAN_INDEX_COLOR_TEMP,
17+
CHANNEL_SCAN_INDEX_INTENSITY = 0,
18+
CHANNEL_SCAN_INDEX_ILLUM = 1,
2019
CHANNEL_SCAN_INDEX_MAX
2120
};
2221

@@ -66,16 +65,6 @@ static const struct iio_chan_spec als_channels[] = {
6665
BIT(IIO_CHAN_INFO_HYSTERESIS_RELATIVE),
6766
.scan_index = CHANNEL_SCAN_INDEX_ILLUM,
6867
},
69-
{
70-
.type = IIO_COLORTEMP,
71-
.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
72-
.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) |
73-
BIT(IIO_CHAN_INFO_SCALE) |
74-
BIT(IIO_CHAN_INFO_SAMP_FREQ) |
75-
BIT(IIO_CHAN_INFO_HYSTERESIS) |
76-
BIT(IIO_CHAN_INFO_HYSTERESIS_RELATIVE),
77-
.scan_index = CHANNEL_SCAN_INDEX_COLOR_TEMP,
78-
},
7968
IIO_CHAN_SOFT_TIMESTAMP(CHANNEL_SCAN_INDEX_TIMESTAMP)
8069
};
8170

@@ -114,11 +103,6 @@ static int als_read_raw(struct iio_dev *indio_dev,
114103
min = als_state->als[chan->scan_index].logical_minimum;
115104
address = HID_USAGE_SENSOR_LIGHT_ILLUM;
116105
break;
117-
case CHANNEL_SCAN_INDEX_COLOR_TEMP:
118-
report_id = als_state->als[chan->scan_index].report_id;
119-
min = als_state->als[chan->scan_index].logical_minimum;
120-
address = HID_USAGE_SENSOR_LIGHT_COLOR_TEMPERATURE;
121-
break;
122106
default:
123107
report_id = -1;
124108
break;
@@ -239,10 +223,6 @@ static int als_capture_sample(struct hid_sensor_hub_device *hsdev,
239223
als_state->scan.illum[CHANNEL_SCAN_INDEX_ILLUM] = sample_data;
240224
ret = 0;
241225
break;
242-
case HID_USAGE_SENSOR_LIGHT_COLOR_TEMPERATURE:
243-
als_state->scan.illum[CHANNEL_SCAN_INDEX_COLOR_TEMP] = sample_data;
244-
ret = 0;
245-
break;
246226
case HID_USAGE_SENSOR_TIME_TIMESTAMP:
247227
als_state->timestamp = hid_sensor_convert_timestamp(&als_state->common_attributes,
248228
*(s64 *)raw_data);
@@ -278,19 +258,6 @@ static int als_parse_report(struct platform_device *pdev,
278258
st->als[i].report_id);
279259
}
280260

281-
ret = sensor_hub_input_get_attribute_info(hsdev, HID_INPUT_REPORT,
282-
usage_id,
283-
HID_USAGE_SENSOR_LIGHT_COLOR_TEMPERATURE,
284-
&st->als[CHANNEL_SCAN_INDEX_COLOR_TEMP]);
285-
if (ret < 0)
286-
return ret;
287-
als_adjust_channel_bit_mask(channels, CHANNEL_SCAN_INDEX_COLOR_TEMP,
288-
st->als[CHANNEL_SCAN_INDEX_COLOR_TEMP].size);
289-
290-
dev_dbg(&pdev->dev, "als %x:%x\n",
291-
st->als[CHANNEL_SCAN_INDEX_COLOR_TEMP].index,
292-
st->als[CHANNEL_SCAN_INDEX_COLOR_TEMP].report_id);
293-
294261
st->scale_precision = hid_sensor_format_scale(usage_id,
295262
&st->als[CHANNEL_SCAN_INDEX_INTENSITY],
296263
&st->scale_pre_decml, &st->scale_post_decml);

include/linux/hid-sensor-ids.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#define HID_USAGE_SENSOR_ALS 0x200041
2222
#define HID_USAGE_SENSOR_DATA_LIGHT 0x2004d0
2323
#define HID_USAGE_SENSOR_LIGHT_ILLUM 0x2004d1
24-
#define HID_USAGE_SENSOR_LIGHT_COLOR_TEMPERATURE 0x2004d2
2524

2625
/* PROX (200011) */
2726
#define HID_USAGE_SENSOR_PROX 0x200011

0 commit comments

Comments
 (0)