From patchwork Tue Mar 25 21:15:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brady Norander X-Patchwork-Id: 876560 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B8693C3600E for ; Wed, 26 Mar 2025 09:11:58 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [45.14.194.44]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id CA12660194; Wed, 26 Mar 2025 10:11:46 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz CA12660194 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1742980316; bh=xdUAEPlkjdFnId0CwibWv0kfo4J1OSdEA+5uuQwXCdI=; h=From:To:Cc:Subject:Date:List-Id:List-Archive:List-Help:List-Owner: List-Post:List-Subscribe:List-Unsubscribe:From; b=qvhtIhofyuU2pdWVXpsp/LXw/KkA9EkDpoQH3wQ1k/k26zCxd62NOTdr/9n081Xdr Ow8r0uYhZmTdVWmRPAKekXHuK5V+3K/PXW/dH6THm3KWtkkETGei5A1RYWTVppsGcx 6ruM++yRuKm2R5yfNhkYdUS6EGpaxTmThdl8RY3s= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 956AFF805B4; Wed, 26 Mar 2025 10:11:34 +0100 (CET) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 7F032F805C3; Wed, 26 Mar 2025 10:11:34 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E3A61F80424; Tue, 25 Mar 2025 22:16:04 +0100 (CET) Received: from mail-qk1-x732.google.com (mail-qk1-x732.google.com [IPv6:2607:f8b0:4864:20::732]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 12992F800D0 for ; Tue, 25 Mar 2025 22:16:02 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 12992F800D0 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=lmGisFaR Received: by mail-qk1-x732.google.com with SMTP id af79cd13be357-7c5e39d1e0eso56002385a.1 for ; Tue, 25 Mar 2025 14:16:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742937361; x=1743542161; darn=alsa-project.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=40K5pq7mYVh4VrEl8AnjijJbn+gIm8U/aSBOA3s0pZQ=; b=lmGisFaR3QC6k5BTEUMknFnXJyaojarEPvNheGFGTqLYhVEXgVQ+X5o/9y6ZNW4i2h Fd6wchU12Kd6blQNbXx9DckDvz+uJN/1fNUYj7Q6/fTMFgahXTU1hxvrpiKO0fW4DAH7 0QswErD91riJJ5R/6XASFoxKm5pIBNziFmVYULQJcU62OCp8Kk5Wa3u6Rrp+SPeXrolh jCrBF8XeXVH6qLVsvzGDtTVUdI33tKw2aHA0MRUetN8oImfoTnyM8Hsksxw+RYYQyDK5 8UMQgDfoEJKeDBo8gYAx49kISphxBkjv+byvRyIMw+b1okdPS/pv3a4CsvEQEronspFA 3U4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742937361; x=1743542161; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=40K5pq7mYVh4VrEl8AnjijJbn+gIm8U/aSBOA3s0pZQ=; b=soceO8eFT8Rvm+3FC2LJ7cAggqyevJJaaiVZI5/0bl2s/PEouc2VvU5UxXlWIocYQZ 8BaWiHaHrQ1Tv89vD6qpyka7yWDz81i8v44hoAVfrVtJQ4UgnFombOaZaMYD31B5ADsz V+SRMNPkRE8dvuKWAbXaJ6hxDfblNfX7w+MU58xAHJ3vAkxeaSe+5McHfQMiaZkt3UaS 9XoB/sKYEtXz/Z10PLMPsZBAOua9KcqINZeXc1U2BOSU9sGiniKrCXsjm++w90No/3HX ZkKOnkcoVjG2Q5eKbAkOVocibGZevy26hYro04roNMSQlwLWqXAWFZvi5o+nzFCPtYwD fv6A== X-Forwarded-Encrypted: i=1; AJvYcCXajq0yYxZMwmSXkPkuETqx1+hBtflAPrUNsfYHpHLULeSDZC1+Rk2iSp/UBvzKdf3KO9MskqFVbmU0@alsa-project.org X-Gm-Message-State: AOJu0YzJyMVF+5pG6adqbVcoPWx+QRTf+n7UlH5+fJK1CTvuq4xEp7XI 8orX/KOSNVMQmG8HK+GoIQFJOS01sRO3rj1ZrtwOmc87RsTbkRPb X-Gm-Gg: ASbGncsZiEqtD+afttIULHVS9Bxw+M7JVim+2krQXsN08zf7oRt9ySJdhEiOH+/XQEP 0Hj9hbUaILZ47xzAv8+Przew/zs4kDsRNt/s7TvkihXUuEp28RmqR1zOswvuP1Exq2b38U4q60y gVm6iXOVLCaBLZJgdpLXuA8YL9Kz97SI+wyDrjLMghS+14e+3aytOM6FpdQ/YFXf/byWvlR2/I2 R3rwkTwdNAvpFFhfUBtcnzTPqRpSS+o7vg9tCv3XfPlGUU/wbyp17SVyfRWBrQwXsGEmTPZUqVo kbWynfSmx4PbnvD5UKBjRKsX95eyI+ildjj8v72VLHi3DVg5HD4buQnvcHeYiCkEpnwOJvhQYUq U90DetYOHStFzNLq4vDM= X-Google-Smtp-Source: AGHT+IHZN0DvqR3zf6bcLPm5iIDPZ4bv5imEYKlo5WLdo3X0XPq9mZKrg6GEYfXA8J0c5SD86F7baA== X-Received: by 2002:ad4:5d42:0:b0:6d8:b115:76a6 with SMTP id 6a1803df08f44-6eb3f1a7037mr239109526d6.0.1742937360994; Tue, 25 Mar 2025 14:16:00 -0700 (PDT) Received: from localhost.localdomain (c-68-55-107-1.hsd1.mi.comcast.net. [68.55.107.1]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6eb3efc5944sm59648256d6.75.2025.03.25.14.16.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Mar 2025 14:16:00 -0700 (PDT) From: Brady Norander To: Mark Brown , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski , Aleksandr Mishin , Vijendar Mukunda , Brady Norander Subject: [PATCH 2/3] ASoC: amd: use new ACP dev names for DAI links Date: Tue, 25 Mar 2025 17:15:45 -0400 Message-ID: <20250325211545.2099169-1-bradynorander@gmail.com> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 X-MailFrom: bradynorander@gmail.com X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1 Message-ID-Hash: 3I5WIDGTJ2QGQQGN7SJXAHRYLRC7M5OH X-Message-ID-Hash: 3I5WIDGTJ2QGQQGN7SJXAHRYLRC7M5OH X-Mailman-Approved-At: Wed, 26 Mar 2025 09:11:31 +0000 X-Mailman-Version: 3.3.9 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: The old names used automatic platform device ids, which means they could change. Use the new device names which will never change. Depends on patch: drm/amdgpu: use static ids for ACP platform devs [1] [1] https://lore.kernel.org/all/20250325210517.2097188-1-bradynorander@gmail.com/ Signed-off-by: Brady Norander --- sound/soc/amd/acp-da7219-max98357a.c | 8 ++++---- sound/soc/amd/acp-es8336.c | 4 ++-- sound/soc/amd/acp-rt5645.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c index 02b04f355ca6..42aa009c4e13 100644 --- a/sound/soc/amd/acp-da7219-max98357a.c +++ b/sound/soc/amd/acp-da7219-max98357a.c @@ -517,11 +517,11 @@ static const struct snd_soc_ops cz_rt5682_dmic1_cap_ops = { }; SND_SOC_DAILINK_DEF(designware1, - DAILINK_COMP_ARRAY(COMP_CPU("designware-i2s.1.auto"))); + DAILINK_COMP_ARRAY(COMP_CPU("designware-i2s.1"))); SND_SOC_DAILINK_DEF(designware2, - DAILINK_COMP_ARRAY(COMP_CPU("designware-i2s.2.auto"))); + DAILINK_COMP_ARRAY(COMP_CPU("designware-i2s.2"))); SND_SOC_DAILINK_DEF(designware3, - DAILINK_COMP_ARRAY(COMP_CPU("designware-i2s.3.auto"))); + DAILINK_COMP_ARRAY(COMP_CPU("designware-i2s.3"))); SND_SOC_DAILINK_DEF(dlgs, DAILINK_COMP_ARRAY(COMP_CODEC("i2c-DLGS7219:00", "da7219-hifi"))); @@ -533,7 +533,7 @@ SND_SOC_DAILINK_DEF(adau, DAILINK_COMP_ARRAY(COMP_CODEC("ADAU7002:00", "adau7002-hifi"))); SND_SOC_DAILINK_DEF(platform, - DAILINK_COMP_ARRAY(COMP_PLATFORM("acp_audio_dma.0.auto"))); + DAILINK_COMP_ARRAY(COMP_PLATFORM("acp_audio_dma.0"))); static struct snd_soc_dai_link cz_dai_7219_98357[] = { { diff --git a/sound/soc/amd/acp-es8336.c b/sound/soc/amd/acp-es8336.c index 0193b3eae7a6..b16dde0e2987 100644 --- a/sound/soc/amd/acp-es8336.c +++ b/sound/soc/amd/acp-es8336.c @@ -137,11 +137,11 @@ static const struct snd_soc_ops st_es8336_ops = { }; SND_SOC_DAILINK_DEF(designware1, - DAILINK_COMP_ARRAY(COMP_CPU("designware-i2s.2.auto"))); + DAILINK_COMP_ARRAY(COMP_CPU("designware-i2s.1"))); SND_SOC_DAILINK_DEF(codec, DAILINK_COMP_ARRAY(COMP_CODEC("i2c-ESSX8336:00", "ES8316 HiFi"))); SND_SOC_DAILINK_DEF(platform, - DAILINK_COMP_ARRAY(COMP_PLATFORM("acp_audio_dma.1.auto"))); + DAILINK_COMP_ARRAY(COMP_PLATFORM("acp_audio_dma.0"))); static struct snd_soc_dai_link st_dai_es8336[] = { { diff --git a/sound/soc/amd/acp-rt5645.c b/sound/soc/amd/acp-rt5645.c index 72ddad24dbda..11d373169380 100644 --- a/sound/soc/amd/acp-rt5645.c +++ b/sound/soc/amd/acp-rt5645.c @@ -108,15 +108,15 @@ static const struct snd_soc_ops cz_aif1_ops = { }; SND_SOC_DAILINK_DEF(designware1, - DAILINK_COMP_ARRAY(COMP_CPU("designware-i2s.1.auto"))); + DAILINK_COMP_ARRAY(COMP_CPU("designware-i2s.1"))); SND_SOC_DAILINK_DEF(designware2, - DAILINK_COMP_ARRAY(COMP_CPU("designware-i2s.2.auto"))); + DAILINK_COMP_ARRAY(COMP_CPU("designware-i2s.2"))); SND_SOC_DAILINK_DEF(codec, DAILINK_COMP_ARRAY(COMP_CODEC("i2c-10EC5650:00", "rt5645-aif1"))); SND_SOC_DAILINK_DEF(platform, - DAILINK_COMP_ARRAY(COMP_PLATFORM("acp_audio_dma.0.auto"))); + DAILINK_COMP_ARRAY(COMP_PLATFORM("acp_audio_dma.0"))); static struct snd_soc_dai_link cz_dai_rt5650[] = { { From patchwork Tue Mar 25 21:18:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brady Norander X-Patchwork-Id: 876325 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 507D6C36010 for ; Wed, 26 Mar 2025 09:12:10 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [45.14.194.44]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 807F860207; Wed, 26 Mar 2025 10:11:58 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 807F860207 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1742980328; bh=kYCJ1vNNmu4cnX3Zv4N65BeeWCJFNxqzoBhji8GJHME=; h=From:To:Cc:Subject:Date:List-Id:List-Archive:List-Help:List-Owner: List-Post:List-Subscribe:List-Unsubscribe:From; b=D7lQeSs9GV291uYMX9IhfLrBO5P/0+Fjf/j6HgP/rzy/rmPNtcSVt2vuMWPDLacMx AK15Tpfc+9TgjSrd/1HgbrGFv+nwo6HL96a5rrDQCEWZkHYTOIe6iXzyVljjvbQ552 d5jii/W9pLjDiC1B8/hlKP28rdlNMIwYmYKqfcK8= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 73705F805EA; Wed, 26 Mar 2025 10:11:36 +0100 (CET) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 64F78F805E7; Wed, 26 Mar 2025 10:11:36 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id ACC42F80424; Tue, 25 Mar 2025 22:18:16 +0100 (CET) Received: from mail-qk1-x72d.google.com (mail-qk1-x72d.google.com [IPv6:2607:f8b0:4864:20::72d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id DDFD4F800B6 for ; Tue, 25 Mar 2025 22:18:14 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz DDFD4F800B6 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=eV2y2OIW Received: by mail-qk1-x72d.google.com with SMTP id af79cd13be357-7c547932d2eso364993385a.0 for ; Tue, 25 Mar 2025 14:18:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742937493; x=1743542293; darn=alsa-project.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=YORNRy4OTXMv3Yhi6ofZ1+35f+Xdz3ifIja4azR4a6Q=; b=eV2y2OIWTDs0WBUS7Eo7h38+72uG2j80LFzHKz/BfBqc3L8V6KYHaFMClYp6fYVRJ8 i7TWiJ2MUUgu/kodgILCX3Z/zJe7AbK5hT0+oNdB51wB9eHc3nJmv13LafX3iaTwoStE 9z94wG8QnwLunPVHSTL57Zd1JzwKMZmto+lgCMlse8klrU1ZMvJoDhvfLFDf0IBp73aU z+dIHTvr4oor7DWRMPckhrZfq8jkenPJD9f9ZVjJWmsNDwvgjFnU8S8GiJ2d0kMCH8SX GNCbI4v/bkxLbHxPTCOJtD7dc48haXmdV/t5YXN3elUU8TCNPlTTN78BMkVcHjzU6Thj kZKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742937493; x=1743542293; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=YORNRy4OTXMv3Yhi6ofZ1+35f+Xdz3ifIja4azR4a6Q=; b=HCnOJm+/UdxFC14Dvly9F6uHi0Nykm2S+48bYTndQs4Lxg340UEVwgCZlPBp3gRtKj zwp3I9vwHlbcsjnxcAEPuqTeo1ZqW2I6XdpMeu3nY7Ue9MvF3Oil31YFPAHe7mVciOYt MaSNyR1JjniQSLJefOgxvOb70qq0fosdW8Wx9emSam5f7Lk3LU/5JAJFQXvaqzeCkf1P avmndmLqs/x+kaMWz3h0VY8C/w3riLVjjSZJ5diHiPlLp/NZ5X/qCsIwtXwbdaaX5J7p gdcqTacCPgOOG1laVNkF26cnzZs06p27oBsIPnRRz4RJsKOTe4AdGpQNj3SF458RCeOH 2ggA== X-Forwarded-Encrypted: i=1; AJvYcCVfcSOW4HX7wuXpP2o/xDy1xLlUjVVpAK443bdA/BrE8MPrryxHOYnHDYpmgeP9+Di8NPspP5XO1aBT@alsa-project.org X-Gm-Message-State: AOJu0YykyU9ouGA8pCTNj5nff86wLuvYOfQx/4/uV97T79vqbDEpxoWV +iFBYjTTcptwrGJ4Pw6tP+jSnudAzScJF7trQof5aBGrra9+yGCS X-Gm-Gg: ASbGncsuPKf4YEdPjdISvLB7hEBiDsHitfHXY8XYg6lDkhCHqN/zcxmc8AQRM95oMrX xEp/u0ZHNzfjX9quTygaNzma1cBAzZDFJF539SCEO+HmSf/PDLJjQYcpOkH6iYmb/7DxKLzFqCp ovBFEpvpJG+UDASHs8gJljYFsjTgDRic8NchqEfPfSLk7ImQ2tVB1tPyZSL1RP/zc3aKs1pIEVv o3bK0N8bxhEO5wF1dGanPDca/n8qFCfQ/Y8HF0xZZYdV6ZDqMe2Viyg/QMtAXdiluOtyu4mDo6P 5L+SNHv0N03rVCeTiQ1+XRwpbgPEq7in/FCHZb8dw7ng+3Jg/RIb/pyJKL6+QgaLqbOtrj5AF/Q ykocTIg8YQgqeSyPO6Ao= X-Google-Smtp-Source: AGHT+IHr7MEJqWj2AbT6Erl+Fujw+8uJX4cGimN+hCDY0WysNw8kbTVhRB2c+75HV6llOMRnBSRRgg== X-Received: by 2002:a05:620a:19a3:b0:7c5:4278:d151 with SMTP id af79cd13be357-7c5ba211387mr2958874585a.43.1742937492920; Tue, 25 Mar 2025 14:18:12 -0700 (PDT) Received: from localhost.localdomain (c-68-55-107-1.hsd1.mi.comcast.net. [68.55.107.1]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7c5b9348308sm680685485a.89.2025.03.25.14.18.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Mar 2025 14:18:12 -0700 (PDT) From: Brady Norander To: Mark Brown , linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org Cc: Jaroslav Kysela , Takashi Iwai , u.kleine-koenig@baylibre.com, Wu Bo , Brady Norander Subject: [PATCH 3/3] ASoC: dwc: always enable/disable i2s irqs Date: Tue, 25 Mar 2025 17:18:05 -0400 Message-ID: <20250325211805.2099278-1-bradynorander@gmail.com> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 X-MailFrom: bradynorander@gmail.com X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1 Message-ID-Hash: ZU4GXR747LM5ZXNPIR3KSJ2XJHIQCBJ4 X-Message-ID-Hash: ZU4GXR747LM5ZXNPIR3KSJ2XJHIQCBJ4 X-Mailman-Approved-At: Wed, 26 Mar 2025 09:11:31 +0000 X-Mailman-Version: 3.3.9 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Commit a42e988 ("ASoC: dwc: add DMA handshake control") changed the behavior of the driver to not enable or disable i2s irqs if using DMA. This breaks platforms such as AMD ACP. Revert to the old behavior by always enabling and disabling i2s irqs while keeping DMA handshake control. Fixes: a42e988 ("ASoC: dwc: add DMA handshake control") Signed-off-by: Brady Norander --- sound/soc/dwc/dwc-i2s.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sound/soc/dwc/dwc-i2s.c b/sound/soc/dwc/dwc-i2s.c index 57b789d7fbed..5b4f20dbf7bb 100644 --- a/sound/soc/dwc/dwc-i2s.c +++ b/sound/soc/dwc/dwc-i2s.c @@ -199,12 +199,10 @@ static void i2s_start(struct dw_i2s_dev *dev, else i2s_write_reg(dev->i2s_base, IRER, 1); - /* I2S needs to enable IRQ to make a handshake with DMAC on the JH7110 SoC */ - if (dev->use_pio || dev->is_jh7110) - i2s_enable_irqs(dev, substream->stream, config->chan_nr); - else + if (!(dev->use_pio || dev->is_jh7110)) i2s_enable_dma(dev, substream->stream); + i2s_enable_irqs(dev, substream->stream, config->chan_nr); i2s_write_reg(dev->i2s_base, CER, 1); } @@ -218,11 +216,12 @@ static void i2s_stop(struct dw_i2s_dev *dev, else i2s_write_reg(dev->i2s_base, IRER, 0); - if (dev->use_pio || dev->is_jh7110) - i2s_disable_irqs(dev, substream->stream, 8); - else + if (!(dev->use_pio || dev->is_jh7110)) i2s_disable_dma(dev, substream->stream); + i2s_disable_irqs(dev, substream->stream, 8); + + if (!dev->active) { i2s_write_reg(dev->i2s_base, CER, 0); i2s_write_reg(dev->i2s_base, IER, 0);