duff/android_kernel_motorola_sm6225
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fogona:aw96105A brint up[5]

Browse Source 
WHY:closing a channel causes the entire
chip to shut down
HOW:if all chs disabled, then disable all

Change-Id: I882e906fa861932a6cf652edc1b99ec153529af7
Signed-off-by: longc <longc130@motorola.com>
Reviewed-on: https://gerrit.mot.com/2692034
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: <yangyi31@motorola.com>
Reviewed-by: Yuchang Guo <guoyc1@lenovo.com>
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
longc authored and yangyi31 committed 2023-07-28 04:18:29 -05:00
1 parent 58fb7eee96
commit e1d3552183
1 file changed
+18 -4
Download Patch File Download Diff File Expand all files Collapse all files
drivers/misc/aw9610x/aw9610x_sar.c
+18 -4
View File
@@ -51,7 +51,7 @@
#define LOG_TAG "<AW9610X_LOG>" #define LOG_TAG "<AW9610X_LOG>"
#define LOG_INFO(fmt, args...) pr_info(LOG_TAG "[INFO]" "<%s><%d>"fmt, __func__, __LINE__, ##args) #define LOG_INFO(fmt, args...) pr_info(LOG_TAG "[INFO]" "<%s><%d>"fmt, __func__, __LINE__, ##args)
#define LOG_DBG(fmt, args...) pr_debug(LOG_TAG "[DBG]" "<%s><%d>"fmt, __func__, __LINE__, ##args) #define LOG_DBG(fmt, args...) pr_debug(LOG_TAG "[DBG]" "<%s><%d>"fmt, __func__, __LINE__, ##args)
#define LOG_ERR(fmt, args...) pr_err(LOG_TAG "[ERR]" "<%s><%d>"fmt, __func__, __LINE__, ##args) #define LOG_ERR(fmt, args...) pr_err(LOG_TAG "[ERR]" "<%s><%d>"fmt, __func__, __LINE__, ##args)
struct aw9610x *g_aw9610x; struct aw9610x *g_aw9610x;
@@ -1430,16 +1430,19 @@ static int capsensor_set_enable(struct sensors_classdev *sensors_cdev, unsigned
{ {
struct aw9610x *aw9610x = g_aw9610x; struct aw9610x *aw9610x = g_aw9610x;
uint8_t i = 0; uint8_t i = 0;
uint32_t data_en = 0; uint32_t data_en = 0;
bool enableFlag = false;
for (i = 0; i < aw9610x->aw_channel_number; i++) for (i = 0; i < aw9610x->aw_channel_number; i++)
{ {
if ((aw9610x->aw_ref_channel >> i) & 0x1) continue; if ((aw9610x->aw_ref_channel >> i) & 0x1) continue;
if (!strcmp(sensors_cdev->name, aw9610x->aw_ch_name[aw9610x->sar_num * AW_CHANNEL_MAX + i])) { if (!strcmp(sensors_cdev->name, aw9610x->aw_ch_name[aw9610x->sar_num * AW_CHANNEL_MAX + i])) {
if (enable == 1){ if (enable == 1){
sensors_capsensor_chs[i].enabled = 1;
input_report_abs(aw9610x->aw_pad[i].input, ABS_DISTANCE, 0); input_report_abs(aw9610x->aw_pad[i].input, ABS_DISTANCE, 0);
input_sync(aw9610x->aw_pad[i].input); input_sync(aw9610x->aw_pad[i].input);
}else if (enable == 0){ }else if (enable == 0){
sensors_capsensor_chs[i].enabled = 0;
input_report_abs(aw9610x->aw_pad[i].input, ABS_DISTANCE, -1); input_report_abs(aw9610x->aw_pad[i].input, ABS_DISTANCE, -1);
input_sync(aw9610x->aw_pad[i].input); input_sync(aw9610x->aw_pad[i].input);
} }
@@ -1447,14 +1450,24 @@ static int capsensor_set_enable(struct sensors_classdev *sensors_cdev, unsigned
} }
} }
//if all chs disabled, then disable all
for (i = 0; i < aw9610x->aw_channel_number; i++)
{
if ((aw9610x->aw_ref_channel >> i) & 0x1) continue;
if (sensors_capsensor_chs[i].enabled) {
enableFlag = true;
break;
}
}
aw9610x->mode = enable; aw9610x->mode = enable;
if (aw9610x->mode == AW9610X_ACTIVE_AP_MODE) { if (enableFlag == AW9610X_ACTIVE_AP_MODE) {
aw9610x_i2c_read(aw9610x, REG_SCANCTRL0, &data_en); aw9610x_i2c_read(aw9610x, REG_SCANCTRL0, &data_en);
aw9610x_i2c_write_bits(aw9610x, REG_SCANCTRL0, ~(0x3f << 8), (data_en & 0x3f) << 8); aw9610x_i2c_write_bits(aw9610x, REG_SCANCTRL0, ~(0x3f << 8), (data_en & 0x3f) << 8);
if (aw9610x->mode_flag1 == AW9610X_FUNC_ON) if (aw9610x->mode_flag1 == AW9610X_FUNC_ON)
aw9610x_i2c_write(aw9610x, REG_HOSTCTRL1, 1); aw9610x_i2c_write(aw9610x, REG_HOSTCTRL1, 1);
aw9610x_i2c_write(aw9610x, REG_CMD, AW9610X_ACTIVE_MODE); aw9610x_i2c_write(aw9610x, REG_CMD, AW9610X_ACTIVE_MODE);
} else if (aw9610x->mode == AW9610X_SLEEP_AP_MODE) { } else if (enableFlag == AW9610X_SLEEP_AP_MODE) {
if (aw9610x->mode_flag1 == AW9610X_FUNC_ON) if (aw9610x->mode_flag1 == AW9610X_FUNC_ON)
aw9610x_i2c_write(aw9610x, REG_HOSTCTRL1, 1); aw9610x_i2c_write(aw9610x, REG_HOSTCTRL1, 1);
aw9610x_i2c_write(aw9610x, REG_CMD, AW9610X_SLEEP_MODE); aw9610x_i2c_write(aw9610x, REG_CMD, AW9610X_SLEEP_MODE);
@@ -2164,6 +2177,7 @@ aw9610x_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
sensors_capsensor_chs[i].sensors_enable = capsensor_set_enable; sensors_capsensor_chs[i].sensors_enable = capsensor_set_enable;
sensors_capsensor_chs[i].sensors_poll_delay = NULL; sensors_capsensor_chs[i].sensors_poll_delay = NULL;
sensors_capsensor_chs[i].name = aw9610x->aw_ch_name[aw9610x->sar_num * AW_CHANNEL_MAX + i]; sensors_capsensor_chs[i].name = aw9610x->aw_ch_name[aw9610x->sar_num * AW_CHANNEL_MAX + i];
sensors_capsensor_chs[i].enabled = 0;
LOG_INFO("cap sensor_class channel_name:%s\n", aw9610x->aw_ch_name[aw9610x->sar_num * AW_CHANNEL_MAX + i]); LOG_INFO("cap sensor_class channel_name:%s\n", aw9610x->aw_ch_name[aw9610x->sar_num * AW_CHANNEL_MAX + i]);
ret = sensors_classdev_register(&aw9610x->aw_pad[i].input->dev, &sensors_capsensor_chs[i]); ret = sensors_classdev_register(&aw9610x->aw_pad[i].input->dev, &sensors_capsensor_chs[i]);
if (ret < 0) if (ret < 0)