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

asoc: wcd937x: use swr device wakeup api

Browse Source 
Use device wakeup api exposed by soundwire to
vote and unvote for soundwire master for mbhc
operations.

Change-Id: Id83c8d3fb2eb351133790f69af56e4981bcac543
Signed-off-by: Ramprasad Katkam <katkam@codeaurora.org>
This commit is contained in:
Ramprasad Katkam
2018-10-23 18:25:30 +05:30
committed by Meng Wang
parent 6abd2debae
commit b6dda1e6be
3 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
asoc/codecs/wcd937x/internal.h
View File

@@ -70,7 +70,6 @@ struct wcd937x_priv {
struct codec_port_info struct codec_port_info
rx_port_mapping[MAX_PORT][MAX_CH_PER_PORT]; rx_port_mapping[MAX_PORT][MAX_CH_PER_PORT];
struct regulator_bulk_data *supplies; struct regulator_bulk_data *supplies;
struct notifier_block nblock; struct notifier_block nblock;
/* wcd callback to bolero */ /* wcd callback to bolero */
void *handle; void *handle;
@@ -78,7 +77,7 @@ struct wcd937x_priv {
int (*register_notifier)(void *handle, int (*register_notifier)(void *handle,
struct notifier_block *nblock, struct notifier_block *nblock,
bool enable); bool enable);
int (*wakeup)(void *handle, bool enable);
u32 version; u32 version;
/* Entry for version info */ /* Entry for version info */
struct snd_info_entry *entry; struct snd_info_entry *entry;

4
asoc/codecs/wcd937x/wcd937x-mbhc.c
View File

@@ -240,6 +240,10 @@ static void wcd937x_mbhc_program_btn_thr(struct snd_soc_component *component,
static bool wcd937x_mbhc_lock_sleep(struct wcd_mbhc *mbhc, bool lock) static bool wcd937x_mbhc_lock_sleep(struct wcd_mbhc *mbhc, bool lock)
{ {
struct snd_soc_component *component = mbhc->component;
struct wcd937x_priv *wcd937x = dev_get_drvdata(component->dev);
wcd937x->wakeup((void*)wcd937x, lock);
return true; return true;
} }

20
asoc/codecs/wcd937x/wcd937x.c
View File

@@ -2426,6 +2426,25 @@ struct wcd937x_pdata *wcd937x_populate_dt_data(struct device *dev)
return pdata; return pdata;
} }
static int wcd937x_wakeup(void *handle, bool enable)
{
struct wcd937x_priv *priv;
if (!handle) {
pr_err("%s: NULL handle\n", __func__);
return -EINVAL;
}
priv = (struct wcd937x_priv *)handle;
if (!priv->tx_swr_dev) {
pr_err("%s: tx swr dev is NULL\n", __func__);
return -EINVAL;
}
if (enable)
return swr_device_wakeup_vote(priv->tx_swr_dev);
else
return swr_device_wakeup_unvote(priv->tx_swr_dev);
}
static int wcd937x_bind(struct device *dev) static int wcd937x_bind(struct device *dev)
{ {
int ret = 0, i = 0; int ret = 0, i = 0;
@@ -2495,6 +2514,7 @@ static int wcd937x_bind(struct device *dev)
* as per HW requirement. * as per HW requirement.
*/ */
usleep_range(5000, 5010); usleep_range(5000, 5010);
wcd937x->wakeup = wcd937x_wakeup;
ret = component_bind_all(dev, wcd937x); ret = component_bind_all(dev, wcd937x);
if (ret) { if (ret) {