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

asoc: codec: defer the probe if msm cdc pinctrl is not probed

Browse Source 
Defer the probe when the msm cdc pinctrl driver is not
proded.

Change-Id: Ia6aaaca7c55b60b53008ffda0fc40e5db407cd2a
Signed-off-by: Prasad Kumpatla <quic_pkumpatl@quicinc.com>
This commit is contained in:
Prasad Kumpatla
2024-02-01 12:46:12 +05:30
parent 74ecbee24e
commit 3dd1953f31
3 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* Copyright (c) 2018-2021, The Linux Foundation. All rights reserved. * Copyright (c) 2018-2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2022-2024, Qualcomm Innovation Center, Inc. All rights reserved.
*/ */
#include <linux/module.h> #include <linux/module.h>
@@ -3170,7 +3170,7 @@ static int wcd937x_reset(struct device *dev)
if (rc) { if (rc) {
dev_err(dev, "%s: wcd sleep state request fail!\n", dev_err(dev, "%s: wcd sleep state request fail!\n",
__func__); __func__);
return rc; return -EPROBE_DEFER;
} }
/* 20ms sleep required after pulling the reset gpio to LOW */ /* 20ms sleep required after pulling the reset gpio to LOW */
usleep_range(20, 30); usleep_range(20, 30);
@@ -3179,7 +3179,7 @@ static int wcd937x_reset(struct device *dev)
if (rc) { if (rc) {
dev_err(dev, "%s: wcd active state request fail!\n", dev_err(dev, "%s: wcd active state request fail!\n",
__func__); __func__);
return rc; return -EPROBE_DEFER;
} }
/* 20ms sleep required after pulling the reset gpio to HIGH */ /* 20ms sleep required after pulling the reset gpio to HIGH */
usleep_range(20, 30); usleep_range(20, 30);
@@ -3403,7 +3403,11 @@ static int wcd937x_bind(struct device *dev)
goto err_bind_all; goto err_bind_all;
} }
wcd937x_reset(dev); ret = wcd937x_reset(dev);
if (ret == -EPROBE_DEFER) {
dev_err(dev, "%s: wcd reset failed!\n", __func__);
goto err_bind_all;
}
/* /*
* Add 5msec delay to provide sufficient time for * Add 5msec delay to provide sufficient time for
* soundwire auto enumeration of slave devices as * soundwire auto enumeration of slave devices as

12
asoc/codecs/wcd938x/wcd938x.c
View File

@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* Copyright (c) 2018-2021, The Linux Foundation. All rights reserved. * Copyright (c) 2018-2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2022,2024 Qualcomm Innovation Center, Inc. All rights reserved.
*/ */
#include <linux/module.h> #include <linux/module.h>
@@ -4181,7 +4181,7 @@ static int wcd938x_reset(struct device *dev)
if (rc) { if (rc) {
dev_err_ratelimited(dev, "%s: wcd sleep state request fail!\n", dev_err_ratelimited(dev, "%s: wcd sleep state request fail!\n",
__func__); __func__);
return rc; return -EPROBE_DEFER;
} }
/* 20us sleep required after pulling the reset gpio to LOW */ /* 20us sleep required after pulling the reset gpio to LOW */
usleep_range(20, 30); usleep_range(20, 30);
@@ -4190,7 +4190,7 @@ static int wcd938x_reset(struct device *dev)
if (rc) { if (rc) {
dev_err_ratelimited(dev, "%s: wcd active state request fail!\n", dev_err_ratelimited(dev, "%s: wcd active state request fail!\n",
__func__); __func__);
return rc; return -EPROBE_DEFER;
} }
/* 20us sleep required after pulling the reset gpio to HIGH */ /* 20us sleep required after pulling the reset gpio to HIGH */
usleep_range(20, 30); usleep_range(20, 30);
@@ -4619,7 +4619,11 @@ static int wcd938x_probe(struct platform_device *pdev)
if (ret) if (ret)
goto err_lock_init; goto err_lock_init;
wcd938x_reset(dev); ret = wcd938x_reset(dev);
if (ret == -EPROBE_DEFER) {
dev_err(dev, "%s: wcd reset failed!\n", __func__);
goto err_lock_init;
}
wcd938x->wakeup = wcd938x_wakeup; wcd938x->wakeup = wcd938x_wakeup;

12
asoc/codecs/wcd939x/wcd939x.c
View File

@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* Copyright (c) 2018-2021, The Linux Foundation. All rights reserved. * Copyright (c) 2018-2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2022-2024, Qualcomm Innovation Center, Inc. All rights reserved.
*/ */
#include <linux/module.h> #include <linux/module.h>
@@ -4706,7 +4706,7 @@ static int wcd939x_reset(struct device *dev)
if (rc) { if (rc) {
dev_err_ratelimited(dev, "%s: wcd sleep state request fail!\n", dev_err_ratelimited(dev, "%s: wcd sleep state request fail!\n",
__func__); __func__);
return rc; return -EPROBE_DEFER;
} }
/* 20us sleep required after pulling the reset gpio to LOW */ /* 20us sleep required after pulling the reset gpio to LOW */
usleep_range(20, 30); usleep_range(20, 30);
@@ -4715,7 +4715,7 @@ static int wcd939x_reset(struct device *dev)
if (rc) { if (rc) {
dev_err_ratelimited(dev, "%s: wcd active state request fail!\n", dev_err_ratelimited(dev, "%s: wcd active state request fail!\n",
__func__); __func__);
return rc; return -EPROBE_DEFER;
} }
/* 20us sleep required after pulling the reset gpio to HIGH */ /* 20us sleep required after pulling the reset gpio to HIGH */
usleep_range(20, 30); usleep_range(20, 30);
@@ -5497,7 +5497,11 @@ static int wcd939x_probe(struct platform_device *pdev)
if (ret) if (ret)
goto err_lock_init; goto err_lock_init;
wcd939x_reset(dev); ret = wcd939x_reset(dev);
if (ret == -EPROBE_DEFER) {
dev_err(dev, "%s: wcd reset failed!\n", __func__);
goto err_lock_init;
}
wcd939x->wakeup = wcd939x_wakeup; wcd939x->wakeup = wcd939x_wakeup;