HID: amd_sfh: Support for additional light sensor

There is support for additional light sensors in the SFH firmware.
As a result, add support for additional light sensors.

Signed-off-by: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_client.c b/drivers/hid/amd-sfh-hid/amd_sfh_client.c
index c751d12f5df8941fa9bf602d12a736bc5a602b2a..d9b7b01900b590137c54a3e60fedfcd3e2a97037 100644 (file)
--- a/drivers/hid/amd-sfh-hid/amd_sfh_client.c
+++ b/drivers/hid/amd-sfh-hid/amd_sfh_client.c
@@ -147,6 +147,7 @@ static const char *get_sensor_name(int idx)
        case mag_idx:
                return "magnetometer";
        case als_idx:
+       case ACS_IDX: /* ambient color sensor */
                return "ALS";
        case HPD_IDX:
                return "HPD";

diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
index c936d6a51c0cd6750d8f46c9a831d9655d9e3335..2530fa98b568beed5c32fc3e714ed72575b3ef8f 100644 (file)
--- a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
+++ b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.c
@@ -29,6 +29,7 @@
 #define MAGNO_EN       BIT(2)
 #define HPD_EN         BIT(16)
 #define ALS_EN         BIT(19)
+#define ACS_EN         BIT(22)
 
 static int sensor_mask_override = -1;
 module_param_named(sensor_mask, sensor_mask_override, int, 0444);
@@ -233,6 +234,9 @@ int amd_mp2_get_sensor_num(struct amd_mp2_dev *privdata, u8 *sensor_id)
        if (HPD_EN & activestatus)
                sensor_id[num_of_sensors++] = HPD_IDX;
 
+       if (ACS_EN & activestatus)
+               sensor_id[num_of_sensors++] = ACS_IDX;
+
        return num_of_sensors;
 }
 

diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.h b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.h
index dfb7cabd82efec722b842955c4ab2368018700b6..70add75fc5066085478bf3b7753a03c2b4e6f0c7 100644 (file)
--- a/drivers/hid/amd-sfh-hid/amd_sfh_pcie.h
+++ b/drivers/hid/amd-sfh-hid/amd_sfh_pcie.h
@@ -23,6 +23,7 @@
 #define V2_STATUS      0x2
 
 #define HPD_IDX                16
+#define ACS_IDX                22
 
 #define SENSOR_DISCOVERY_STATUS_MASK           GENMASK(5, 3)
 #define SENSOR_DISCOVERY_STATUS_SHIFT          3

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 f9a8c02d5a7bdb9fad3efb808f1c1c81ca1c0260..8716a05950c82e8ff4512da09cd004990a1fbafa 100644 (file)
--- 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
@@ -48,6 +48,7 @@ static int get_report_descriptor(int sensor_idx, u8 *rep_desc)
                       sizeof(comp3_report_descriptor));
                break;
        case als_idx: /* ambient light sensor */
+       case ACS_IDX: /* ambient color sensor */
                memset(rep_desc, 0, sizeof(als_report_descriptor));
                memcpy(rep_desc, als_report_descriptor,
                       sizeof(als_report_descriptor));
@@ -97,6 +98,7 @@ static u32 get_descr_sz(int sensor_idx, int descriptor_name)
                }
                break;
        case als_idx:
+       case ACS_IDX: /* ambient color sensor */
                switch (descriptor_name) {
                case descr_size:
                        return sizeof(als_report_descriptor);
@@ -174,6 +176,7 @@ static u8 get_feature_report(int sensor_idx, int report_id, u8 *feature_report)
                report_size = sizeof(magno_feature);
                break;
        case als_idx:  /* ambient light sensor */
+       case ACS_IDX: /* ambient color sensor */
                get_common_features(&als_feature.common_property, report_id);
                als_feature.als_change_sesnitivity = HID_DEFAULT_SENSITIVITY;
                als_feature.als_sensitivity_min = HID_DEFAULT_MIN_VALUE;
@@ -245,6 +248,7 @@ static u8 get_input_report(u8 current_index, int sensor_idx, int report_id,
                report_size = sizeof(magno_input);
                break;
        case als_idx: /* Als */
+       case ACS_IDX: /* ambient color sensor */
                get_common_inputs(&als_input.common_property, report_id);
                /* For ALS ,V2 Platforms uses C2P_MSG5 register instead of DRAM access method */
                if (supported_input == V2_STATUS)