Commit d4005431 authored by Srinivas Pandruvada's avatar Srinivas Pandruvada Committed by Greg Kroah-Hartman
Browse files

Revert "iio: hid-sensor-als: Add light color temperature support" 



This reverts commit 5f05285d.

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: default avatarThomas Weißschuh <thomas@t-8ch.de>
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218223


Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Cc:  <stable@vger.kernel.org>
Acked-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/r/20231217200703.719876-3-srinivas.pandruvada@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b9670ee2

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

+2 −35
Original line number Diff line number Diff line
@@ -14,9 +14,8 @@ 
#include "../common/hid-sensors/hid-sensor-trigger.h"



enum {

	CHANNEL_SCAN_INDEX_INTENSITY,

	CHANNEL_SCAN_INDEX_ILLUM,

	CHANNEL_SCAN_INDEX_COLOR_TEMP,

	CHANNEL_SCAN_INDEX_INTENSITY = 0,

	CHANNEL_SCAN_INDEX_ILLUM = 1,

	CHANNEL_SCAN_INDEX_MAX

};
@@ -66,16 +65,6 @@ static const struct iio_chan_spec als_channels[] = { 
		BIT(IIO_CHAN_INFO_HYSTERESIS_RELATIVE),

		.scan_index = CHANNEL_SCAN_INDEX_ILLUM,

	},

	{

		.type = IIO_COLORTEMP,

		.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_COLOR_TEMP,

	},

	IIO_CHAN_SOFT_TIMESTAMP(CHANNEL_SCAN_INDEX_TIMESTAMP)

};
@@ -114,11 +103,6 @@ static int als_read_raw(struct iio_dev *indio_dev, 
			min = als_state->als[chan->scan_index].logical_minimum;

			address = HID_USAGE_SENSOR_LIGHT_ILLUM;

			break;

		case  CHANNEL_SCAN_INDEX_COLOR_TEMP:

			report_id = als_state->als[chan->scan_index].report_id;

			min = als_state->als[chan->scan_index].logical_minimum;

			address = HID_USAGE_SENSOR_LIGHT_COLOR_TEMPERATURE;

			break;

		default:

			report_id = -1;

			break;
@@ -239,10 +223,6 @@ static int als_capture_sample(struct hid_sensor_hub_device *hsdev, 
		als_state->scan.illum[CHANNEL_SCAN_INDEX_ILLUM] = sample_data;

		ret = 0;

		break;

	case HID_USAGE_SENSOR_LIGHT_COLOR_TEMPERATURE:

		als_state->scan.illum[CHANNEL_SCAN_INDEX_COLOR_TEMP] = 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);
@@ -278,19 +258,6 @@ static int als_parse_report(struct platform_device *pdev, 
			st->als[i].report_id);

	}



	ret = sensor_hub_input_get_attribute_info(hsdev, HID_INPUT_REPORT,

				usage_id,

				HID_USAGE_SENSOR_LIGHT_COLOR_TEMPERATURE,

				&st->als[CHANNEL_SCAN_INDEX_COLOR_TEMP]);

	if (ret < 0)

		return ret;

	als_adjust_channel_bit_mask(channels, CHANNEL_SCAN_INDEX_COLOR_TEMP,

				st->als[CHANNEL_SCAN_INDEX_COLOR_TEMP].size);



	dev_dbg(&pdev->dev, "als %x:%x\n",

		st->als[CHANNEL_SCAN_INDEX_COLOR_TEMP].index,

		st->als[CHANNEL_SCAN_INDEX_COLOR_TEMP].report_id);



	st->scale_precision = hid_sensor_format_scale(usage_id,

				&st->als[CHANNEL_SCAN_INDEX_INTENSITY],

				&st->scale_pre_decml, &st->scale_post_decml);

include/linux/hid-sensor-ids.h

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#define HID_USAGE_SENSOR_ALS					0x200041

#define HID_USAGE_SENSOR_DATA_LIGHT				0x2004d0

#define HID_USAGE_SENSOR_LIGHT_ILLUM				0x2004d1

#define HID_USAGE_SENSOR_LIGHT_COLOR_TEMPERATURE		0x2004d2



/* PROX (200011) */

#define HID_USAGE_SENSOR_PROX                                   0x200011