From nobody Wed Apr 15 18:12:22 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9AE4BC4332F for ; Thu, 17 Nov 2022 12:34:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240171AbiKQMeC (ORCPT ); Thu, 17 Nov 2022 07:34:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55760 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240059AbiKQMdX (ORCPT ); Thu, 17 Nov 2022 07:33:23 -0500 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.154.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E78CE14D36 for ; Thu, 17 Nov 2022 04:33:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1668688388; x=1700224388; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=mriXUUv4YdVpJ92OHSjzRqvTpbgG5OABDyze4/Hv4to=; b=NjTVonB6rztUISm0KDDKcA4UE/ydaUb1OQOvO9lslJqRnSRxOrvN/poB 10WkmjwCU6dPxo8oId7z+Er/jLf8wRoybjfa6Su+xbIMwstoqufv704OV 26JTSxlXFKE0u0M2VkwuT+k8Hf/bKcHy8AVTolkl6HStBiB2l6xHILBT1 6pgRD650Ulj+VxBrlwMjaMX7QjBxFwESwhp23g7n1skuHaqUKCPeOf+q9 h6UcgoEG8AgF1Gmjup0QVRCYELLn4B+ITtTQkNjVGRDUZY4PvkVFHghVd o9/yKkUD4sV4jcNHhS+JKrS0UuDj/NQQTssgdIYrDyVrtaev63Ucmz80k g==; X-IronPort-AV: E=Sophos;i="5.96,171,1665471600"; d="scan'208";a="183977381" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa4.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 17 Nov 2022 05:33:08 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.12; Thu, 17 Nov 2022 05:33:06 -0700 Received: from localhost.localdomain (10.10.115.15) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.2507.12 via Frontend Transport; Thu, 17 Nov 2022 05:33:03 -0700 From: Claudiu Beznea To: , , , , , CC: , , , Claudiu Beznea Subject: [PATCH 1/3] ASoC: mchp-spdiftx: simplify locking around ctrl->ch_stat Date: Thu, 17 Nov 2022 14:37:48 +0200 Message-ID: <20221117123750.291911-2-claudiu.beznea@microchip.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20221117123750.291911-1-claudiu.beznea@microchip.com> References: <20221117123750.291911-1-claudiu.beznea@microchip.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use a temporary variable to keep the AES3 value. With this a spin_unlock_irqrestore() call has been removed from the final code. Signed-off-by: Claudiu Beznea --- sound/soc/atmel/mchp-spdiftx.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/sound/soc/atmel/mchp-spdiftx.c b/sound/soc/atmel/mchp-spdiftx.c index ab2d7a791f39..4e231cec9045 100644 --- a/sound/soc/atmel/mchp-spdiftx.c +++ b/sound/soc/atmel/mchp-spdiftx.c @@ -355,6 +355,7 @@ static int mchp_spdiftx_hw_params(struct snd_pcm_substr= eam *substream, struct mchp_spdiftx_mixer_control *ctrl =3D &dev->control; u32 mr; unsigned int bps =3D params_physical_width(params) / 8; + unsigned char aes3; int ret; =20 dev_dbg(dev->dev, "%s() rate=3D%u format=3D%#x width=3D%u channels=3D%u\n= ", @@ -440,48 +441,48 @@ static int mchp_spdiftx_hw_params(struct snd_pcm_subs= tream *substream, =20 mr |=3D SPDIFTX_MR_BPS(bps); =20 - spin_lock_irqsave(&ctrl->lock, flags); - ctrl->ch_stat[3] &=3D ~IEC958_AES3_CON_FS; switch (params_rate(params)) { case 22050: - ctrl->ch_stat[3] |=3D IEC958_AES3_CON_FS_22050; + aes3 =3D IEC958_AES3_CON_FS_22050; break; case 24000: - ctrl->ch_stat[3] |=3D IEC958_AES3_CON_FS_24000; + aes3 =3D IEC958_AES3_CON_FS_24000; break; case 32000: - ctrl->ch_stat[3] |=3D IEC958_AES3_CON_FS_32000; + aes3 =3D IEC958_AES3_CON_FS_32000; break; case 44100: - ctrl->ch_stat[3] |=3D IEC958_AES3_CON_FS_44100; + aes3 =3D IEC958_AES3_CON_FS_44100; break; case 48000: - ctrl->ch_stat[3] |=3D IEC958_AES3_CON_FS_48000; + aes3 =3D IEC958_AES3_CON_FS_48000; break; case 88200: - ctrl->ch_stat[3] |=3D IEC958_AES3_CON_FS_88200; + aes3 =3D IEC958_AES3_CON_FS_88200; break; case 96000: - ctrl->ch_stat[3] |=3D IEC958_AES3_CON_FS_96000; + aes3 =3D IEC958_AES3_CON_FS_96000; break; case 176400: - ctrl->ch_stat[3] |=3D IEC958_AES3_CON_FS_176400; + aes3 =3D IEC958_AES3_CON_FS_176400; break; case 192000: - ctrl->ch_stat[3] |=3D IEC958_AES3_CON_FS_192000; + aes3 =3D IEC958_AES3_CON_FS_192000; break; case 8000: case 11025: case 16000: case 64000: - ctrl->ch_stat[3] |=3D IEC958_AES3_CON_FS_NOTID; + aes3 =3D IEC958_AES3_CON_FS_NOTID; break; default: dev_err(dev->dev, "unsupported sample frequency: %u\n", params_rate(params)); - spin_unlock_irqrestore(&ctrl->lock, flags); return -EINVAL; } + spin_lock_irqsave(&ctrl->lock, flags); + ctrl->ch_stat[3] &=3D ~IEC958_AES3_CON_FS; + ctrl->ch_stat[3] |=3D aes3; mchp_spdiftx_channel_status_write(dev); spin_unlock_irqrestore(&ctrl->lock, flags); =20 --=20 2.34.1 From nobody Wed Apr 15 18:12:22 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6F41C433FE for ; Thu, 17 Nov 2022 12:34:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240185AbiKQMeU (ORCPT ); Thu, 17 Nov 2022 07:34:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240237AbiKQMds (ORCPT ); Thu, 17 Nov 2022 07:33:48 -0500 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.153.233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19981742E7 for ; Thu, 17 Nov 2022 04:33:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1668688396; x=1700224396; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LrOFW9Vh6X7OMwaap7k/XBm9i91mJbYjMGPAIkdigpQ=; b=z8DrCgBkGj84PyeeAlnSjhcu/fUn982e61zZIvJ5+XeAapbsQHajyL/M MYk5SHgN6zbFRTqhrDvjXWzMjxehXCWUhWOcI5tIbrtbIGjF+6KX15tHR 4m3Eq64CTVFhmen8VYQEMyiqpJ8umrKeKFSvb4cncHdsV8C4xuSBrVlc7 7w9SlFq8n08s9tZK6HpBuRmAbUjj2UwR/7r/uSDOL92o0R0ZgBIT3wD+V wmvpB9NS3Wg3ohPykeuwoUxsaMs2xo/bU/BR3JUr+fAhXxYXUcPe41UEP 2YTb0ki3V+2aJyAn380SlJ5/eilALtg0v52u8JIv4iAHwLbie9y5JLdVp Q==; X-IronPort-AV: E=Sophos;i="5.96,171,1665471600"; d="scan'208";a="200202331" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa1.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 17 Nov 2022 05:33:15 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.12; Thu, 17 Nov 2022 05:33:11 -0700 Received: from localhost.localdomain (10.10.115.15) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.2507.12 via Frontend Transport; Thu, 17 Nov 2022 05:33:07 -0700 From: Claudiu Beznea To: , , , , , CC: , , , Claudiu Beznea Subject: [PATCH 2/3] ASoC: mchp-spdiftx: add runtime pm support Date: Thu, 17 Nov 2022 14:37:49 +0200 Message-ID: <20221117123750.291911-3-claudiu.beznea@microchip.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20221117123750.291911-1-claudiu.beznea@microchip.com> References: <20221117123750.291911-1-claudiu.beznea@microchip.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add runtime PM support for Microchip SPDIFTX driver. The runtime PM APIs disables/enables IP's clock and enables/disable caching for regmap. Signed-off-by: Claudiu Beznea --- sound/soc/atmel/mchp-spdiftx.c | 116 ++++++++++++++++++++++++--------- 1 file changed, 86 insertions(+), 30 deletions(-) diff --git a/sound/soc/atmel/mchp-spdiftx.c b/sound/soc/atmel/mchp-spdiftx.c index 4e231cec9045..ec454e64d85c 100644 --- a/sound/soc/atmel/mchp-spdiftx.c +++ b/sound/soc/atmel/mchp-spdiftx.c @@ -9,6 +9,7 @@ #include #include #include +#include #include =20 #include @@ -175,6 +176,7 @@ static const struct regmap_config mchp_spdiftx_regmap_c= onfig =3D { .readable_reg =3D mchp_spdiftx_readable_reg, .writeable_reg =3D mchp_spdiftx_writeable_reg, .precious_reg =3D mchp_spdiftx_precious_reg, + .cache_type =3D REGCACHE_FLAT, }; =20 #define SPDIFTX_GCLK_RATIO 128 @@ -196,7 +198,6 @@ struct mchp_spdiftx_dev { struct clk *pclk; struct clk *gclk; unsigned int fmt; - unsigned int gclk_enabled:1; }; =20 static inline int mchp_spdiftx_is_running(struct mchp_spdiftx_dev *dev) @@ -486,10 +487,9 @@ static int mchp_spdiftx_hw_params(struct snd_pcm_subst= ream *substream, mchp_spdiftx_channel_status_write(dev); spin_unlock_irqrestore(&ctrl->lock, flags); =20 - if (dev->gclk_enabled) { - clk_disable_unprepare(dev->gclk); - dev->gclk_enabled =3D 0; - } + /* GCLK is enabled by runtime PM. */ + clk_disable_unprepare(dev->gclk); + ret =3D clk_set_rate(dev->gclk, params_rate(params) * SPDIFTX_GCLK_RATIO); if (ret) { @@ -503,7 +503,7 @@ static int mchp_spdiftx_hw_params(struct snd_pcm_substr= eam *substream, dev_err(dev->dev, "unable to enable gclk: %d\n", ret); return ret; } - dev->gclk_enabled =3D 1; + dev_dbg(dev->dev, "%s(): GCLK set to %d\n", __func__, params_rate(params) * SPDIFTX_GCLK_RATIO); =20 @@ -523,10 +523,6 @@ static int mchp_spdiftx_hw_free(struct snd_pcm_substre= am *substream, =20 regmap_write(dev->regmap, SPDIFTX_IDR, SPDIFTX_IR_TXUDR | SPDIFTX_IR_TXOVR); - if (dev->gclk_enabled) { - clk_disable_unprepare(dev->gclk); - dev->gclk_enabled =3D 0; - } =20 return regmap_write(dev->regmap, SPDIFTX_CR, SPDIFTX_CR_SWRST | SPDIFTX_CR_FCLR); @@ -709,17 +705,9 @@ static struct snd_kcontrol_new mchp_spdiftx_ctrls[] = =3D { static int mchp_spdiftx_dai_probe(struct snd_soc_dai *dai) { struct mchp_spdiftx_dev *dev =3D snd_soc_dai_get_drvdata(dai); - int ret; =20 snd_soc_dai_init_dma_data(dai, &dev->playback, NULL); =20 - ret =3D clk_prepare_enable(dev->pclk); - if (ret) { - dev_err(dev->dev, - "failed to enable the peripheral clock: %d\n", ret); - return ret; - } - /* Add controls */ snd_soc_add_dai_controls(dai, mchp_spdiftx_ctrls, ARRAY_SIZE(mchp_spdiftx_ctrls)); @@ -727,19 +715,9 @@ static int mchp_spdiftx_dai_probe(struct snd_soc_dai *= dai) return 0; } =20 -static int mchp_spdiftx_dai_remove(struct snd_soc_dai *dai) -{ - struct mchp_spdiftx_dev *dev =3D snd_soc_dai_get_drvdata(dai); - - clk_disable_unprepare(dev->pclk); - - return 0; -} - static struct snd_soc_dai_driver mchp_spdiftx_dai =3D { .name =3D "mchp-spdiftx", .probe =3D mchp_spdiftx_dai_probe, - .remove =3D mchp_spdiftx_dai_remove, .playback =3D { .stream_name =3D "S/PDIF Playback", .channels_min =3D 1, @@ -763,6 +741,54 @@ static const struct of_device_id mchp_spdiftx_dt_ids[]= =3D { }; MODULE_DEVICE_TABLE(of, mchp_spdiftx_dt_ids); =20 +static int mchp_spdiftx_runtime_suspend(struct device *dev) +{ + struct mchp_spdiftx_dev *spdiftx =3D dev_get_drvdata(dev); + + regcache_cache_only(spdiftx->regmap, true); + + clk_disable_unprepare(spdiftx->gclk); + clk_disable_unprepare(spdiftx->pclk); + + return 0; +} + +static int mchp_spdiftx_runtime_resume(struct device *dev) +{ + struct mchp_spdiftx_dev *spdiftx =3D dev_get_drvdata(dev); + int ret; + + ret =3D clk_prepare_enable(spdiftx->pclk); + if (ret) { + dev_err(spdiftx->dev, + "failed to enable the peripheral clock: %d\n", ret); + return ret; + } + ret =3D clk_prepare_enable(spdiftx->gclk); + if (ret) { + dev_err(spdiftx->dev, + "failed to enable generic clock: %d\n", ret); + goto disable_pclk; + } + + regcache_cache_only(spdiftx->regmap, false); + regcache_mark_dirty(spdiftx->regmap); + ret =3D regcache_sync(spdiftx->regmap); + if (ret) { + regcache_cache_only(spdiftx->regmap, true); + clk_disable_unprepare(spdiftx->gclk); +disable_pclk: + clk_disable_unprepare(spdiftx->pclk); + } + + return ret; +} + +static const struct dev_pm_ops mchp_spdiftx_pm_ops =3D { + RUNTIME_PM_OPS(mchp_spdiftx_runtime_suspend, mchp_spdiftx_runtime_resume, + NULL) +}; + static int mchp_spdiftx_probe(struct platform_device *pdev) { struct mchp_spdiftx_dev *dev; @@ -827,29 +853,59 @@ static int mchp_spdiftx_probe(struct platform_device = *pdev) dev->regmap =3D regmap; platform_set_drvdata(pdev, dev); =20 + pm_runtime_enable(dev->dev); + if (!pm_runtime_enabled(dev->dev)) { + err =3D mchp_spdiftx_runtime_resume(dev->dev); + if (err) + return err; + } + dev->playback.addr =3D (dma_addr_t)mem->start + SPDIFTX_CDR; dev->playback.addr_width =3D DMA_SLAVE_BUSWIDTH_4_BYTES; =20 err =3D devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); if (err) { dev_err(&pdev->dev, "failed to register PMC: %d\n", err); - return err; + goto pm_runtime_suspend; } =20 err =3D devm_snd_soc_register_component(&pdev->dev, &mchp_spdiftx_component, &mchp_spdiftx_dai, 1); - if (err) + if (err) { dev_err(&pdev->dev, "failed to register component: %d\n", err); + goto pm_runtime_suspend; + } + + return 0; + +pm_runtime_suspend: + if (!pm_runtime_status_suspended(dev->dev)) + mchp_spdiftx_runtime_suspend(dev->dev); + pm_runtime_disable(dev->dev); =20 return err; } =20 +static int mchp_spdiftx_remove(struct platform_device *pdev) +{ + struct mchp_spdiftx_dev *dev =3D platform_get_drvdata(pdev); + + if (!pm_runtime_status_suspended(dev->dev)) + mchp_spdiftx_runtime_suspend(dev->dev); + + pm_runtime_disable(dev->dev); + + return 0; +} + static struct platform_driver mchp_spdiftx_driver =3D { .probe =3D mchp_spdiftx_probe, + .remove =3D mchp_spdiftx_remove, .driver =3D { .name =3D "mchp_spdiftx", .of_match_table =3D of_match_ptr(mchp_spdiftx_dt_ids), + .pm =3D pm_ptr(&mchp_spdiftx_pm_ops) }, }; =20 --=20 2.34.1 From nobody Wed Apr 15 18:12:22 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F3720C4332F for ; Thu, 17 Nov 2022 12:34:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239369AbiKQMe0 (ORCPT ); Thu, 17 Nov 2022 07:34:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55472 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240244AbiKQMdt (ORCPT ); Thu, 17 Nov 2022 07:33:49 -0500 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.153.233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 21A6A742F4 for ; Thu, 17 Nov 2022 04:33:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1668688401; x=1700224401; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=dC+Z+2dJnvsXSsxV5IVXyOSHXTLenZC0GCwpi+PbA7c=; b=GMTLUBs7XffKEK7ICH5o2rI5aRZYXuV1ibCy+AhP57KT7Crd8XUfIGAJ dm/LRTx4+OOav9tjDamkmqyB4f9UNEGy+fkuYrVpsuGwO0kq5w63ADRVT 4oybVUwQG2vqBjS1WKE5VNfbmUSY5INVGzOvUJZbHu2/FwDHTFhLXN/3z Q2UTSTiYsN4mTgUK9gciNAx/1H8QDaTMNX6DLyiNfvmK9egEqvt5kAY+L YONoXdvPCTdr/Krbc0UdWz2QDTdb8XlWQnrUEDhO6Xrk/HWA0iGhdeLnD qdOwUUwbS2bAjdkyigX7X+nAp6vFkxRMMrOMbPo4nfMUz8Pj38sfQdnWx w==; X-IronPort-AV: E=Sophos;i="5.96,171,1665471600"; d="scan'208";a="189407195" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa3.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 17 Nov 2022 05:33:21 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.12; Thu, 17 Nov 2022 05:33:16 -0700 Received: from localhost.localdomain (10.10.115.15) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.2507.12 via Frontend Transport; Thu, 17 Nov 2022 05:33:12 -0700 From: Claudiu Beznea To: , , , , , CC: , , , Claudiu Beznea Subject: [PATCH 3/3] ASoC: mchp-spdiftx: add support for system suspend/resume Date: Thu, 17 Nov 2022 14:37:50 +0200 Message-ID: <20221117123750.291911-4-claudiu.beznea@microchip.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20221117123750.291911-1-claudiu.beznea@microchip.com> References: <20221117123750.291911-1-claudiu.beznea@microchip.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add support for system suspend/resume by moving the enable/disable of interrupts in mchp_spdiftx_trigger() on SNDRV_PCM_TRIGGER_SUSPEND/ SNDRV_PCM_TRIGGER_RESUME commands. Signed-off-by: Claudiu Beznea --- sound/soc/atmel/mchp-spdiftx.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/sound/soc/atmel/mchp-spdiftx.c b/sound/soc/atmel/mchp-spdiftx.c index ec454e64d85c..dc96a6fbf514 100644 --- a/sound/soc/atmel/mchp-spdiftx.c +++ b/sound/soc/atmel/mchp-spdiftx.c @@ -198,6 +198,7 @@ struct mchp_spdiftx_dev { struct clk *pclk; struct clk *gclk; unsigned int fmt; + unsigned int suspend_irq; }; =20 static inline int mchp_spdiftx_is_running(struct mchp_spdiftx_dev *dev) @@ -318,16 +319,25 @@ static int mchp_spdiftx_trigger(struct snd_pcm_substr= eam *substream, int cmd, running =3D !!(mr & SPDIFTX_MR_TXEN_ENABLE); =20 switch (cmd) { - case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_RESUME: + case SNDRV_PCM_TRIGGER_START: + regmap_write(dev->regmap, SPDIFTX_IER, dev->suspend_irq | + SPDIFTX_IR_TXUDR | SPDIFTX_IR_TXOVR); + dev->suspend_irq =3D 0; + fallthrough; case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: if (!running) { mr &=3D ~SPDIFTX_MR_TXEN_MASK; mr |=3D SPDIFTX_MR_TXEN_ENABLE; } break; - case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_SUSPEND: + regmap_read(dev->regmap, SPDIFTX_IMR, &dev->suspend_irq); + fallthrough; + case SNDRV_PCM_TRIGGER_STOP: + regmap_write(dev->regmap, SPDIFTX_IDR, dev->suspend_irq | + SPDIFTX_IR_TXUDR | SPDIFTX_IR_TXOVR); + fallthrough; case SNDRV_PCM_TRIGGER_PAUSE_PUSH: if (running) { mr &=3D ~SPDIFTX_MR_TXEN_MASK; @@ -507,10 +517,6 @@ static int mchp_spdiftx_hw_params(struct snd_pcm_subst= ream *substream, dev_dbg(dev->dev, "%s(): GCLK set to %d\n", __func__, params_rate(params) * SPDIFTX_GCLK_RATIO); =20 - /* Enable interrupts */ - regmap_write(dev->regmap, SPDIFTX_IER, - SPDIFTX_IR_TXUDR | SPDIFTX_IR_TXOVR); - regmap_write(dev->regmap, SPDIFTX_MR, mr); =20 return 0; @@ -521,9 +527,6 @@ static int mchp_spdiftx_hw_free(struct snd_pcm_substrea= m *substream, { struct mchp_spdiftx_dev *dev =3D snd_soc_dai_get_drvdata(dai); =20 - regmap_write(dev->regmap, SPDIFTX_IDR, - SPDIFTX_IR_TXUDR | SPDIFTX_IR_TXOVR); - return regmap_write(dev->regmap, SPDIFTX_CR, SPDIFTX_CR_SWRST | SPDIFTX_CR_FCLR); } @@ -785,6 +788,7 @@ static int mchp_spdiftx_runtime_resume(struct device *d= ev) } =20 static const struct dev_pm_ops mchp_spdiftx_pm_ops =3D { + SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume) RUNTIME_PM_OPS(mchp_spdiftx_runtime_suspend, mchp_spdiftx_runtime_resume, NULL) }; --=20 2.34.1