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

soc: swr-mstr-ctrl: dedicated ports for enable/disable of PCM usescases

Browse Source 
For PCM usecase enable/disable we have dedicated ports, so no need of
using counter to manage enable and disable of ports.
This is revert of change-id: I2c65e7658bf90ae01203ebb1b15f14db581ffa55.

Change-Id: Id1953f529569ae48b01dce1c88d2790479cf1a6b
Signed-off-by: Prasad Kumpatla <quic_pkumpatl@quicinc.com>
This commit is contained in:
Prasad Kumpatla
2022-12-27 10:17:05 +05:30
parent 17be5c5a10
commit f76f408091
2 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* Copyright (c) 2015-2021, The Linux Foundation. All rights reserved. * Copyright (c) 2015-2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved.
*/ */
#include <linux/irq.h> #include <linux/irq.h>
@@ -800,19 +800,9 @@ static int swrm_pcm_port_config(struct swr_mstr_ctrl *swrm, u8 port_num,
reg_addr = ((dir) ? SWRM_DIN_DP_PCM_PORT_CTRL(port_num) : \ reg_addr = ((dir) ? SWRM_DIN_DP_PCM_PORT_CTRL(port_num) : \
SWRM_DOUT_DP_PCM_PORT_CTRL(port_num)); SWRM_DOUT_DP_PCM_PORT_CTRL(port_num));
reg_val = enable ? 0x3 : 0x0; reg_val = enable ? 0x3 : 0x0;
if (enable) { swr_master_write(swrm, reg_addr, reg_val);
if (swrm->pcm_enable_count == 0) dev_dbg(swrm->dev, "%s : pcm port %s, reg_val = %d, for addr %x\n",
swr_master_write(swrm, reg_addr, reg_val); __func__, enable ? "Enabled" : "disabled", reg_val, reg_addr);
swrm->pcm_enable_count++;
} else {
if (swrm->pcm_enable_count > 0)
swrm->pcm_enable_count--;
if (swrm->pcm_enable_count == 0)
swr_master_write(swrm, reg_addr, reg_val);
}
dev_dbg(swrm->dev, "%s : pcm port %s, reg_val = %d, for addr %x, pcm_enable_cnt:%d\n",
__func__, enable ? "Enabled" : "disabled", reg_val, reg_addr,
swrm->pcm_enable_count);
return 0; return 0;
} }
@@ -1710,8 +1700,6 @@ static int swrm_slvdev_datapath_control(struct swr_master *master, bool enable)
} }
clear_bit(DISABLE_PENDING, &swrm->port_req_pending); clear_bit(DISABLE_PENDING, &swrm->port_req_pending);
swrm_cleanup_disabled_port_reqs(master); swrm_cleanup_disabled_port_reqs(master);
/* reset enable_count to 0 in SSR if master is already down */
swrm->pcm_enable_count = 0;
if (!swrm_is_port_en(master)) { if (!swrm_is_port_en(master)) {
dev_dbg(&master->dev, "%s: pm_runtime auto suspend triggered\n", dev_dbg(&master->dev, "%s: pm_runtime auto suspend triggered\n",
__func__); __func__);
@@ -2846,7 +2834,7 @@ static int swrm_probe(struct platform_device *pdev)
dev_err(swrm->dev, "missing port mapping\n"); dev_err(swrm->dev, "missing port mapping\n");
goto err_pdata_fail; goto err_pdata_fail;
} }
swrm->pcm_enable_count = 0;
map_length = map_size / (3 * sizeof(u32)); map_length = map_size / (3 * sizeof(u32));
if (num_ports > SWR_MSTR_PORT_LEN) { if (num_ports > SWR_MSTR_PORT_LEN) {
dev_err(&pdev->dev, "%s:invalid number of swr ports\n", dev_err(&pdev->dev, "%s:invalid number of swr ports\n",

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

@@ -1,6 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
/* /*
* Copyright (c) 2015-2021, The Linux Foundation. All rights reserved. * Copyright (c) 2015-2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved.
*/ */
#ifndef _SWR_WCD_CTRL_H #ifndef _SWR_WCD_CTRL_H
@@ -185,7 +186,6 @@ struct swr_mstr_ctrl {
struct clk *lpass_core_hw_vote; struct clk *lpass_core_hw_vote;
struct clk *lpass_core_audio; struct clk *lpass_core_audio;
u8 num_usecase; u8 num_usecase;
u32 pcm_enable_count;
u32 swr_irq_wakeup_capable; u32 swr_irq_wakeup_capable;
int hw_core_clk_en; int hw_core_clk_en;
int aud_core_clk_en; int aud_core_clk_en;