samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "soc: swr-mstr: Fix headset detection during sva clk switch"

Browse Source
This commit is contained in:
qctecmdr
2020-06-19 23:23:56 -07:00
committed by Gerrit - the friendly Code Review server
parent dc40c1136d f0c7f88868
commit cbbff6809b
2 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
soc/swr-mstr-ctrl.c
View File

@@ -121,7 +121,7 @@ static bool swrm_lock_sleep(struct swr_mstr_ctrl *swrm);
static void swrm_unlock_sleep(struct swr_mstr_ctrl *swrm);
static u32 swr_master_read(struct swr_mstr_ctrl *swrm, unsigned int reg_addr);
static void swr_master_write(struct swr_mstr_ctrl *swrm, u16 reg_addr, u32 val);
static int swrm_runtime_resume(struct device *dev);
static u8 swrm_get_clk_div(int mclk_freq, int bus_clk_freq)
{
@@ -901,6 +901,8 @@ static int swrm_read(struct swr_master *master, u8 dev_num, u16 reg_addr,
mutex_unlock(&swrm->devlock);
pm_runtime_get_sync(swrm->dev);
if (swrm->req_clk_switch)
swrm_runtime_resume(swrm->dev);
ret = swrm_cmd_fifo_rd_cmd(swrm, &val, dev_num, 0, reg_addr, len);
if (!ret)
@@ -934,6 +936,8 @@ static int swrm_write(struct swr_master *master, u8 dev_num, u16 reg_addr,
mutex_unlock(&swrm->devlock);
pm_runtime_get_sync(swrm->dev);
if (swrm->req_clk_switch)
swrm_runtime_resume(swrm->dev);
ret = swrm_cmd_fifo_wr_cmd(swrm, reg_val, dev_num, 0, reg_addr);
pm_runtime_put_autosuspend(swrm->dev);
@@ -1925,16 +1929,22 @@ handle_irq:
swrm->intr_mask);
break;
case SWRM_INTERRUPT_STATUS_RD_FIFO_OVERFLOW:
dev_dbg(swrm->dev, "%s: SWR read FIFO overflow\n",
__func__);
value = swr_master_read(swrm, SWRM_CMD_FIFO_STATUS);
dev_err(swrm->dev,
"%s: SWR read FIFO overflow fifo status\n",
__func__, value);
break;
case SWRM_INTERRUPT_STATUS_RD_FIFO_UNDERFLOW:
dev_dbg(swrm->dev, "%s: SWR read FIFO underflow\n",
__func__);
value = swr_master_read(swrm, SWRM_CMD_FIFO_STATUS);
dev_err(swrm->dev,
"%s: SWR read FIFO underflow fifo status\n",
__func__, value);
break;
case SWRM_INTERRUPT_STATUS_WR_CMD_FIFO_OVERFLOW:
dev_dbg(swrm->dev, "%s: SWR write FIFO overflow\n",
__func__);
value = swr_master_read(swrm, SWRM_CMD_FIFO_STATUS);
dev_err(swrm->dev,
"%s: SWR write FIFO overflow fifo status\n",
__func__, value);
swr_master_write(swrm, SWRM_CMD_FIFO_CMD, 0x1);
break;
case SWRM_INTERRUPT_STATUS_CMD_ERROR:
@@ -2928,6 +2938,8 @@ exit:
else
pm_runtime_set_autosuspend_delay(&pdev->dev,
auto_suspend_timer);
if (swrm->req_clk_switch)
swrm->req_clk_switch = false;
mutex_unlock(&swrm->reslock);
trace_printk("%s: pm_runtime: resume done, state:%d\n",
@@ -3217,8 +3229,12 @@ int swrm_wcd_notify(struct platform_device *pdev, u32 id, void *data)
}
mutex_lock(&swrm->mlock);
if (swrm->clk_src != *(int *)data) {
if (swrm->state == SWR_MSTR_UP)
if (swrm->state == SWR_MSTR_UP) {
swrm->req_clk_switch = true;
swrm_device_suspend(&pdev->dev);
if (swrm->state == SWR_MSTR_UP)
swrm->req_clk_switch = false;
}
swrm->clk_src = *(int *)data;
}
mutex_unlock(&swrm->mlock);

1
soc/swr-mstr-ctrl.h
View File

@@ -179,6 +179,7 @@ struct swr_mstr_ctrl {
bool dev_up;
bool ipc_wakeup_triggered;
bool aud_core_err;
bool req_clk_switch;
struct pm_qos_request pm_qos_req;
enum swrm_pm_state pm_state;
wait_queue_head_t pm_wq;