A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-09 13:49:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

ASoC: monitor key registers in aw882xx

Browse source 
In Astro, aw882xx doesnt work correctly and causes speaker has
no sound, after checking resgiters dump,0x04 bit6 I2SEN, 
0x06 bit12 I2SRXEN is not right 
Driver never set these two bits after init done, I don't why
it happens, monitor these 2 registers, correct them if any
readback value is wrong.

Change-Id: I2837d706c7c4836879a483a9d12371664b2614f5
Signed-off-by: zhouwl <zhouwl@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1532728
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Hujun Liao <liaohj@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
zhouwl 2020-04-12 21:04:48 +08:00 • committed by Wanlong Zhou
commit 76c1100992
2 changed files with 32 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

31
sound/soc/codecs/aw882xx.c
View file

@ -203,7 +203,9 @@ static int aw882xx_i2c_write(struct aw882xx *aw882xx,
buf[0] = (reg_data&0xff00)>>8;
buf[1] = (reg_data&0x00ff)>>0;
if (aw882xx->monitor.sysctrl) {
pr_info("%s: 0x%x <= 0x%x\n", __func__, reg_addr, reg_data);
}
while (cnt < AW_I2C_RETRIES) {
ret = aw882xx_i2c_writes(aw882xx, reg_addr, buf, 2);
if (ret < 0)
@ -250,6 +252,21 @@ static int aw882xx_i2c_write_bits(struct aw882xx *aw882xx,
pr_err("%s: i2c read error, ret=%d\n", __func__, ret);
return ret;
}
if (aw882xx->monitor.sysctrl) {
if ((reg_addr == AW882XX_SYSCTRL_REG) && ((reg_val & 0x40) == 0)) {
pr_err("%s: 0x04 => 0x%x, I2SEN wrong!\n", __func__, reg_val);
reg_val &= 0xFFC7;
reg_val |= 0x4440; // init value in bin
pr_info("%s: errata 0x04 => 0x%x\n", __func__, reg_val);
} else if ((reg_addr == AW882XX_I2SCTRL_REG) && ((reg_val & 0x1000) == 0)) {
pr_err("%s: 0x06 => 0x%x, I2SRXEN wrong!\n", __func__, reg_val);
reg_val &= 0x3FFF;
reg_val |= 0x1408; // init value in bin
pr_info("%s: errata 0x06 => 0x%x\n", __func__, reg_val);
}
}
reg_val &= mask;
reg_val |= reg_data;
ret = aw882xx_i2c_write(aw882xx, reg_addr, reg_val);
@ -292,6 +309,9 @@ static bool aw882xx_get_power_status(struct aw882xx *aw882xx)
pr_err("%s: read reg %d failed \n", __func__, AW882XX_SYSCTRL_REG);
return false;
}
if (aw882xx->monitor.sysctrl) {
pr_info("%s: 0x04 => 0x%x\n", __func__, reg_value);
}
/*bit 0: 1 power off, 0 power on*/
if (reg_value & 0x01) {
return false;
@ -1523,6 +1543,15 @@ static int aw882xx_parse_dt(struct device *dev, struct aw882xx *aw882xx,
dev_info(dev, "%s: monitor-timer-val = %d\n",
__func__, monitor->timer_val);
}
ret = of_property_read_u32(np, "monitor-sysctrl", &monitor->sysctrl);
if (ret) {
monitor->timer_val = AW882XX_MONITOR_SYSCTRL;
dev_err(dev, "%s: monitor-sysctrl get failed,user default value!\n", __func__);
} else {
dev_info(dev, "%s: monitor-sysctrl = %d\n",
__func__, monitor->sysctrl);
}
return 0;
}

2
sound/soc/codecs/aw882xx.h
View file

@ -132,6 +132,7 @@ enum aw882xx_vmax_percentage {
};
#define AW882XX_MONITOR_DEFAULT_FLAG 0
#define AW882XX_MONITOR_SYSCTRL 0
#define AW882XX_MONITOR_DEFAULT_TIMER_VAL 30000
#define AW882XX_MONITOR_VBAT_RANGE 6025
#define AW882XX_MONITOR_INT_10BIT 1023
@ -159,6 +160,7 @@ struct aw882xx_monitor{
uint32_t timer_val;
struct work_struct work;
uint32_t is_enable;
uint32_t sysctrl;
uint16_t pre_vol;
int16_t pre_temp;
#ifdef AW_DEBUG