diff options
| author | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2023-09-24 13:39:25 +0100 |
|---|---|---|
| committer | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2023-09-24 13:39:25 +0100 |
| commit | 431dffc1df07b93ce9be26d264b7946cd65cb949 (patch) | |
| tree | f8aaf7d46c8d90f5b2ebe0d6af6f8991b658ea0b /drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.c | |
| parent | 57d3909596f9941c7d0777004994438df1b5ba0a (diff) | |
| parent | c6c97210e27237438689611980f8a7b87bcc79bf (diff) | |
Merge branch 'ib-iio-hid-sensors-v6.6-rc1' into togreg
The deta angle and deta velocity channels were added in parallel with
color temperature and chromacity so this merge had to assign a
consistent order. I put the color related ones second.
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Diffstat (limited to 'drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.c')
| -rw-r--r-- | drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.c b/drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.c index 8716a05950c8..ef1f9be8b893 100644 --- a/drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.c +++ b/drivers/hid/amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.c @@ -257,6 +257,13 @@ static u8 get_input_report(u8 current_index, int sensor_idx, int report_id, else als_input.illuminance_value = (int)sensor_virt_addr[0] / AMD_SFH_FW_MULTIPLIER; + + if (sensor_idx == ACS_IDX) { + als_input.light_color_temp = sensor_virt_addr[1]; + als_input.chromaticity_x_value = sensor_virt_addr[2]; + als_input.chromaticity_y_value = sensor_virt_addr[3]; + } + report_size = sizeof(als_input); memcpy(input_report, &als_input, sizeof(als_input)); break; |