From nobody Wed Sep 10 08:27:37 2025 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 78E46313267 for ; Fri, 5 Sep 2025 15:44:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757087090; cv=none; b=g6KBX1iYzOU4+8/7xO+U4Mw5M3CSjg7aZnnBn2v00S2856Oe4A2/sLYAMkxsF3AsAslrCAWIPkqcnTaFxiMA5MDwuH0gSC9nOHR0JxY24wK7SdInNrGEBll8L70i5aaNfh0ThxDeeEKYULuiW5tRBF3pvVSS4bbntTDTWh8yVTE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757087090; c=relaxed/simple; bh=+lRquaM51dxX8JXB+bAfJaVIJHFdA0SHDaYrJorpboE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uPxe/ILeFr4azpdGCpj6uP/g37RZuqAeSiOWg2tSNIzS4BMn1ku53MlnYVIocASB0BKiVbceKYT4rDrwGg2+fG+a0+3WoDDGJsSLvCRLSG7HoeGH+UIz3m4nMmwJgZBYLXFGEbTxgwT7eek9k+Cax2tp91L5TgN+4EJrT4fG8Co= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=OIrXD5DU; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="OIrXD5DU" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5857LlQb008288 for ; Fri, 5 Sep 2025 15:44:47 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=cI7DDVHRTaw wq/wL1fsHHzj2jmP533uEbcYvxWbbLHU=; b=OIrXD5DUwZO7axT8T6m9eIAnKNh 2/hgi7GAdPwnlGRzKqKwXwUHtdbVu30ICGt+8r7vj1QQE9zo/T+aKpkrzdDUSMyP tljD60+0psdfBKGXuMg28d55Q1sJO5/Mr6JwERAhG5Ak49ePhPplr1f23wbjW7U7 hApyc7OCI1P65XXWpC0NxlMks1x/T60jWXsZ+McJsErY68Wga4sK0sPdlONy7rh3 H0eJ0OawHJQ1GU6cbrdgtx7QqZb30T2LgFXLvOt90wWgIv9NZF4RAK1X3132xzSn XyGBQHD7w20fi7PdUrS8uL4SYwUDkHtcufBxNnaBWRyYzDK1+R/5dQTl7fA== Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 48urmjujbq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 05 Sep 2025 15:44:47 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-4b30cb3c705so68514011cf.3 for ; Fri, 05 Sep 2025 08:44:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757087086; x=1757691886; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cI7DDVHRTawwq/wL1fsHHzj2jmP533uEbcYvxWbbLHU=; b=YV3V3/NwVMpbSpATm92QLpUAR4MMmAsbOStfocFBpYYTOqSgv0MZu5mxg139gGB7vq ichtUdrGSi+HAcvGJLQyNoX95MEOS67pYcVYsnr5JPoAuhp6rwJP9PV1ZdxjL+K09ZP0 y1lfWVBOhYeOl4hIeull90GYlKd/NOwM+GTyRa/UutqqDMtbXn9MpOo1GfOXtY6yRVwV 6AiGDTZHi2Z2LTlvtWvzWUBFfDaankirmAEYJyxibCQCxfTk5ZMF1xbaKBAZvEpTxgKB WI9eCq8rUD49SWE3aIy/lVU/bhrLSxqn4RZALrIus96i6tBkwonQFX0fCm8LxOHDa6AD EYaA== X-Forwarded-Encrypted: i=1; AJvYcCVcXRDT+SRP5K64mGc7PI9EvcJ9nPH32h+jBK1Dmm+i15bhGK7RD0Rq/5gf8apPd0BPlnylsSmTZwlhcJM=@vger.kernel.org X-Gm-Message-State: AOJu0YzuG/IOURKbFVouvEJCsPqXgrrtaXXru2IIWkA/HCl/iDFxosEw Qx2n7JhOQBMIitAjqs+PLAbzWV7Kb7ijI7vIf3fkFqy+ZD2v+JdMug6/qG444DHXL0ucMsNd9xi ZvRz5zacMlop/TVLfml/UcHFQZIllZgIgrX7uG5zGXXAOfwgM2aId8C4yRrW4FtVLIs4= X-Gm-Gg: ASbGncvLLqmdhRiBUN9rWJc4nDwMSo9NEpOpKpoa7yuML3xtCsCTlMfzUYrQS4APO79 N9XUALmo7JvZ4Kq3EFxKHOkVLxWiwSXRRLV/weaFg4s0+iDbWsb8npERkjgi0w4oScSEyBPm8KZ D6YECPSCGwGVLRz74bf7fMne5l5sm/4Xax/37biu24Q4l/XrAm2zXbTk7Zw4vHskojeoSvXjCBP qMOUqESSVceXngKoXoIgEZXCe9c/n2+Vfir/Ugrhmj13wOP1YlXRCvMv2I//g6u/qzQAMilfsOg nawcKysmOwLK38A0ARpu2i2IyAVYMdDNTEaKzgIehCayqQPxuGPtnw== X-Received: by 2002:ac8:570f:0:b0:4b5:ed9d:7bcd with SMTP id d75a77b69052e-4b5ed9d7e9dmr30935921cf.16.1757087085640; Fri, 05 Sep 2025 08:44:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF4WvMUoDvxSAN603DuIaOljtHSUjPhwERnfhL6Um8GJkFedqQolzxDTxosGub2VKLwajiEsg== X-Received: by 2002:ac8:570f:0:b0:4b5:ed9d:7bcd with SMTP id d75a77b69052e-4b5ed9d7e9dmr30935391cf.16.1757087084920; Fri, 05 Sep 2025 08:44:44 -0700 (PDT) Received: from debian ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b9bcda91dsm165716585e9.6.2025.09.05.08.44.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Sep 2025 08:44:44 -0700 (PDT) From: Srinivas Kandagatla To: broonie@kernel.org Cc: lgirdwood@gmail.com, tiwai@suse.com, vkoul@kernel.org, srini@kernel.org, yung-chuan.liao@linux.intel.com, pierre-louis.bossart@linux.dev, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, neil.armstrong@linaro.org, krzysztof.kozlowski@linaro.org, dmitry.baryshkov@oss.qualcomm.com, linux-sound@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH v3 08/12] ASoC: codecs: wcd-common: move component ops to common Date: Fri, 5 Sep 2025 16:44:26 +0100 Message-ID: <20250905154430.12268-9-srinivas.kandagatla@oss.qualcomm.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250905154430.12268-1-srinivas.kandagatla@oss.qualcomm.com> References: <20250905154430.12268-1-srinivas.kandagatla@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authority-Analysis: v=2.4 cv=OemYDgTY c=1 sm=1 tr=0 ts=68bb056f cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=ZsC4DHZuhs/kKio7QBcDoQ==:17 a=yJojWOMRYYMA:10 a=EUspDBNiAAAA:8 a=eQjB__F64b99YC4tFhYA:9 a=a_PwQJl-kcHnX1M80qC6:22 X-Proofpoint-GUID: S8v7oQRxmj0kVS954fByqOk5AwuzafOY X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwODMwMDAyNCBTYWx0ZWRfX3dL5NePZrOta qis+Ld4v3HmM41YxI6deicNjcV5+LFAIkVzfUVES4uxVMwUt6kgGC50Eylqts+SZSd3JJMUDHRs tkWFBcscfyJ0rYLrKt7wYDTfGpf6WIlw/NJUoL7fYmA2ldNCbZp1wzQ9hFGgVB7nslUJdCpDR0g aN5VAu/8ldv2WKSJ/RALkZ4CYGxOn7GdVk1YFO0ZpZ8rhisNo86FDZkhh9ECVfvcNdxFddn40Xf W2R3pMeUjiWJkqRcNz60vwONnZ4nrnSAMFpnhp2TtRzTfjWoy1TrdqWWCV5fh2DXdyKuZaxaDZs WwreE9gUmzcH73nC9XAutPf/NjrRaph51crXghTsGI6Yz8BPh3bP4fuEjxANWT2xRENACfk7wyZ V78kQezA X-Proofpoint-ORIG-GUID: S8v7oQRxmj0kVS954fByqOk5AwuzafOY X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1117,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-09-05_05,2025-09-04_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 suspectscore=0 spamscore=0 bulkscore=0 priorityscore=1501 adultscore=0 clxscore=1015 phishscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2507300000 definitions=main-2508300024 Content-Type: text/plain; charset="utf-8" component_ops for wcd97x, wcd938x, wcd939x soundwire codecs are exactly identlical, move them to common driver to remove this duplicate code. Signed-off-by: Srinivas Kandagatla Reviewed-by: Dmitry Baryshkov --- sound/soc/codecs/wcd-common.c | 27 +++++++++++++++++++++++++++ sound/soc/codecs/wcd-common.h | 1 + sound/soc/codecs/wcd937x-sdw.c | 29 ++--------------------------- sound/soc/codecs/wcd938x-sdw.c | 20 ++------------------ sound/soc/codecs/wcd939x-sdw.c | 29 ++--------------------------- 5 files changed, 34 insertions(+), 72 deletions(-) diff --git a/sound/soc/codecs/wcd-common.c b/sound/soc/codecs/wcd-common.c index 25c0a48ff858..585d3e036900 100644 --- a/sound/soc/codecs/wcd-common.c +++ b/sound/soc/codecs/wcd-common.c @@ -7,6 +7,8 @@ #include #include #include +#include +#include =20 #include "wcd-common.h" =20 @@ -66,5 +68,30 @@ int wcd_dt_parse_micbias_info(struct wcd_common *common) return 0; } EXPORT_SYMBOL_GPL(wcd_dt_parse_micbias_info); + +static int wcd_sdw_component_bind(struct device *dev, struct device *maste= r, void *data) +{ + pm_runtime_set_autosuspend_delay(dev, 3000); + pm_runtime_use_autosuspend(dev); + pm_runtime_mark_last_busy(dev); + pm_runtime_set_active(dev); + pm_runtime_enable(dev); + + return 0; +} + +static void wcd_sdw_component_unbind(struct device *dev, struct device *ma= ster, void *data) +{ + pm_runtime_disable(dev); + pm_runtime_set_suspended(dev); + pm_runtime_dont_use_autosuspend(dev); +} + +const struct component_ops wcd_sdw_component_ops =3D { + .bind =3D wcd_sdw_component_bind, + .unbind =3D wcd_sdw_component_unbind, +}; +EXPORT_SYMBOL_GPL(wcd_sdw_component_ops); + MODULE_DESCRIPTION("Common Qualcomm WCD Codec helpers driver"); MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/wcd-common.h b/sound/soc/codecs/wcd-common.h index ca602718c9ba..85e5818b9b0c 100644 --- a/sound/soc/codecs/wcd-common.h +++ b/sound/soc/codecs/wcd-common.h @@ -32,6 +32,7 @@ struct wcd_common { u32 micb_vout[WCD_MAX_MICBIAS]; }; =20 +extern const struct component_ops wcd_sdw_component_ops; int wcd_get_micb_vout_ctl_val(struct device *dev, u32 micb_mv); int wcd_dt_parse_micbias_info(struct wcd_common *common); =20 diff --git a/sound/soc/codecs/wcd937x-sdw.c b/sound/soc/codecs/wcd937x-sdw.c index 8f2819163527..59c353cafd31 100644 --- a/sound/soc/codecs/wcd937x-sdw.c +++ b/sound/soc/codecs/wcd937x-sdw.c @@ -983,31 +983,6 @@ static const struct sdw_slave_ops wcd9370_slave_ops = =3D { .interrupt_callback =3D wcd9370_interrupt_callback, }; =20 -static int wcd937x_sdw_component_bind(struct device *dev, - struct device *master, void *data) -{ - pm_runtime_set_autosuspend_delay(dev, 3000); - pm_runtime_use_autosuspend(dev); - pm_runtime_mark_last_busy(dev); - pm_runtime_set_active(dev); - pm_runtime_enable(dev); - - return 0; -} - -static void wcd937x_sdw_component_unbind(struct device *dev, - struct device *master, void *data) -{ - pm_runtime_disable(dev); - pm_runtime_set_suspended(dev); - pm_runtime_dont_use_autosuspend(dev); -} - -static const struct component_ops wcd937x_sdw_component_ops =3D { - .bind =3D wcd937x_sdw_component_bind, - .unbind =3D wcd937x_sdw_component_unbind, -}; - static int wcd9370_probe(struct sdw_slave *pdev, const struct sdw_device_id *id) { @@ -1093,7 +1068,7 @@ static int wcd9370_probe(struct sdw_slave *pdev, } =20 =20 - ret =3D component_add(dev, &wcd937x_sdw_component_ops); + ret =3D component_add(dev, &wcd_sdw_component_ops); if (ret) return ret; =20 @@ -1107,7 +1082,7 @@ static int wcd9370_remove(struct sdw_slave *pdev) { struct device *dev =3D &pdev->dev; =20 - component_del(dev, &wcd937x_sdw_component_ops); + component_del(dev, &wcd_sdw_component_ops); =20 return 0; } diff --git a/sound/soc/codecs/wcd938x-sdw.c b/sound/soc/codecs/wcd938x-sdw.c index 1dc13b6fabfa..92714aef09d5 100644 --- a/sound/soc/codecs/wcd938x-sdw.c +++ b/sound/soc/codecs/wcd938x-sdw.c @@ -1182,22 +1182,6 @@ static const struct sdw_slave_ops wcd9380_slave_ops = =3D { .bus_config =3D wcd9380_bus_config, }; =20 -static int wcd938x_sdw_component_bind(struct device *dev, - struct device *master, void *data) -{ - return 0; -} - -static void wcd938x_sdw_component_unbind(struct device *dev, - struct device *master, void *data) -{ -} - -static const struct component_ops wcd938x_sdw_component_ops =3D { - .bind =3D wcd938x_sdw_component_bind, - .unbind =3D wcd938x_sdw_component_unbind, -}; - static int wcd9380_probe(struct sdw_slave *pdev, const struct sdw_device_id *id) { @@ -1262,7 +1246,7 @@ static int wcd9380_probe(struct sdw_slave *pdev, pm_runtime_set_active(dev); pm_runtime_enable(dev); =20 - ret =3D component_add(dev, &wcd938x_sdw_component_ops); + ret =3D component_add(dev, &wcd_sdw_component_ops); if (ret) goto err_disable_rpm; =20 @@ -1280,7 +1264,7 @@ static int wcd9380_remove(struct sdw_slave *pdev) { struct device *dev =3D &pdev->dev; =20 - component_del(dev, &wcd938x_sdw_component_ops); + component_del(dev, &wcd_sdw_component_ops); =20 pm_runtime_disable(dev); pm_runtime_set_suspended(dev); diff --git a/sound/soc/codecs/wcd939x-sdw.c b/sound/soc/codecs/wcd939x-sdw.c index 97a829e3ce4f..6aecad2a28aa 100644 --- a/sound/soc/codecs/wcd939x-sdw.c +++ b/sound/soc/codecs/wcd939x-sdw.c @@ -1378,31 +1378,6 @@ static const struct sdw_slave_ops wcd9390_slave_ops = =3D { .bus_config =3D wcd9390_bus_config, }; =20 -static int wcd939x_sdw_component_bind(struct device *dev, struct device *m= aster, - void *data) -{ - pm_runtime_set_autosuspend_delay(dev, 3000); - pm_runtime_use_autosuspend(dev); - pm_runtime_mark_last_busy(dev); - pm_runtime_set_active(dev); - pm_runtime_enable(dev); - - return 0; -} - -static void wcd939x_sdw_component_unbind(struct device *dev, - struct device *master, void *data) -{ - pm_runtime_disable(dev); - pm_runtime_set_suspended(dev); - pm_runtime_dont_use_autosuspend(dev); -} - -static const struct component_ops wcd939x_sdw_component_ops =3D { - .bind =3D wcd939x_sdw_component_bind, - .unbind =3D wcd939x_sdw_component_unbind, -}; - static int wcd9390_probe(struct sdw_slave *pdev, const struct sdw_device_i= d *id) { struct device *dev =3D &pdev->dev; @@ -1466,7 +1441,7 @@ static int wcd9390_probe(struct sdw_slave *pdev, cons= t struct sdw_device_id *id) regcache_cache_only(wcd->regmap, true); } =20 - ret =3D component_add(dev, &wcd939x_sdw_component_ops); + ret =3D component_add(dev, &wcd_sdw_component_ops); if (ret) return ret; =20 @@ -1481,7 +1456,7 @@ static int wcd9390_remove(struct sdw_slave *pdev) struct device *dev =3D &pdev->dev; struct wcd939x_sdw_priv *wcd =3D dev_get_drvdata(dev); =20 - component_del(dev, &wcd939x_sdw_component_ops); + component_del(dev, &wcd_sdw_component_ops); =20 if (wcd->regmap) regmap_exit(wcd->regmap); --=20 2.50.0