From nobody Mon Feb 9 02:07:07 2026 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EA18327E7F3 for ; Thu, 15 May 2025 07:38:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747294717; cv=none; b=DIsX0VdiX4BhuOwC6rebe5lEv2T+SBuHbCugRHIELe73kt9FQYU0LvMP9FIIU0YA8g6UmvgWW3rkdqnJrNUD8h71E94F4q8GrfVOt7vGE76oDQ24r3rqbl8+Rz5CUhP/sMkeIj6BUNarexcezMdhJTwX/isWKaQ0oJFCaKdrDpA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747294717; c=relaxed/simple; bh=Ingfuo0h6fBMePKfCdsejuw4gdmtDKy4x/AMpfDfe4M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qt/oKnw/8lxWTTqN4fuR/V32NamX4etfVGbXXy5JmvBhgVUWRS/epImH814qxJXekl25MXMLKf1u0ev57r6KnRoZiIFWFxgbu49cjSkXkKZ6vm/kHMS6qL1ajgKH16835ch88CaG/r/mwhmZbbrhOyuwOih0EDz8XujuwxtDRdQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=U02+W4be; arc=none smtp.client-ip=209.85.214.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="U02+W4be" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-22e6880d106so4506685ad.1 for ; Thu, 15 May 2025 00:38:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1747294715; x=1747899515; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=79ms8c2FnuEoP2QG4BxhZzqQ6Y78M53niO7yuu/SbRQ=; b=U02+W4bezyHzv8CdaXcO7Uzgaws0HEF3r/AnUjaEENHLkdp+mBHfYeYAPX4AZPEfNR kNhTLlCp6yzYH8kjOEmyzBm9WXryeGcGeZRrB8EAStVHx2mhvkAL/Qj/f0n5S8vYwAXH aQZDnKjkKKRQln3zYolSPVaLVymFm2X6CNVyk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747294715; x=1747899515; 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=79ms8c2FnuEoP2QG4BxhZzqQ6Y78M53niO7yuu/SbRQ=; b=ChLfk04CQkyMkc5ri5YXeojsgKogU9cNn/fvjOSjOwwp2RA8M3S9Tqq6uk6R4Lb6T+ nXi+wwYH4Tncdw58rVeYc7Fexi5eNlGZENWWPQm5LHv+BTdT0w29pknMVHs5Xuc8FPCr r2nxXKVlFj+9ihedX5lAfZTgJ/QTZvIVVi/kNFHXqp8oAWIE9D5wFkKYPtUHMnAjfMOz ZWgn1TWDVGgxQokaTxUEGUYG0VDiWgUcOPhSVyuziUK9Q5aGYWtl4mgTWsIjglZBrP/P F3OvbGuULoUNOwnhGQihbNQloZ5zl5LPCEs61xmR2mDpBjJNhXfyG2ydbr5FzPQDW9hS cF5A== X-Forwarded-Encrypted: i=1; AJvYcCXMgu+skrqM1QfMByDB13mFoKybkxDL5JIxr7QEVnPu4sVSRGJHApxiVX+lXbX0JmWAaFqp96/t6qpX2qQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yy9vMh3hpPcACWbu4DLKJvsxPDhNgkWNebsxaTkDOgTRBtMuOnN 5z22IXRwja0vjHHsKtl9TAf4EbP/W+gmJxZTkgKZEe1ahqtmWol4J94aTTwU5A== X-Gm-Gg: ASbGncvugwDoW4YVvHIby7Dp0AfgZf/bjc9oHNd2tYrYOjMzwOWkO7Jyl4jrvlQYsuF qPcn4kTkyg2m+aHrgC8a0dbwjES7ruBWjg4fbuyui7apFE6LgrPG/RObTogu0WrLVc4dW20OUIR eZkF9/DJq1A2PXUn1NIplrjO0QWgky6wlVBPnv2+HDGIWKwMlTQ7O6wpEO8qCXTn2iR0Tp66bZn SB2GthI7Pv1iAxOtFqYUId7D9W0EZ5TXKtNDNFe0IDRBm1zhhYWV64UmyCXDNWB7l7v/1ybxNIK f3lyk4dHco0QLkxZemyxC1LYuKe+ZVysYYN/KdpoqsIpa/OtMY5HMrSd6TEP4EzJeQTy+g== X-Google-Smtp-Source: AGHT+IE+oWnqezIF5QTQ7EIBKtLTRzikzPqtq43CZyZeO14t1RTBDnr586S2uXPfRLUc6SCZYpMdRg== X-Received: by 2002:a17:903:1984:b0:21f:6a36:7bf3 with SMTP id d9443c01a7336-231b5e67c01mr20669115ad.12.1747294715147; Thu, 15 May 2025 00:38:35 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:c43a:aaea:5f52:5763]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22fc8271f61sm109750825ad.142.2025.05.15.00.38.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 00:38:34 -0700 (PDT) From: Chen-Yu Tsai To: Liam Girdwood , Mark Brown , Matthias Brugger , AngeloGioacchino Del Regno Cc: Chen-Yu Tsai , Jaroslav Kysela , Takashi Iwai , Jiaxin Yu , linux-sound@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, Darren Ye Subject: [PATCH v2 1/3] ASoC: mediatek: mt8183-afe-pcm: Shorten memif_data table using macros Date: Thu, 15 May 2025 15:38:21 +0800 Message-ID: <20250515073825.4155297-2-wenst@chromium.org> X-Mailer: git-send-email 2.49.0.1045.g170613ef41-goog In-Reply-To: <20250515073825.4155297-1-wenst@chromium.org> References: <20250515073825.4155297-1-wenst@chromium.org> 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 Content-Type: text/plain; charset="utf-8" The memif_data table describes all the supported PCM channels for the audio frontend. Most of the fields are either the same or can be derived from the interface's name. This results in a very long table (in source code) that can be shortened with macros. Do just that. Some "convenience" macros were added to cover non-existent register fields that would otherwise require multiple layers of macros to handle. Signed-off-by: Chen-Yu Tsai Reviewed-by: AngeloGioacchino Del Regno --- Changes since v1: - Rebased onto -next, dropping bits for DMA address MSB registers --- sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 243 +++++---------------- 1 file changed, 54 insertions(+), 189 deletions(-) diff --git a/sound/soc/mediatek/mt8183/mt8183-afe-pcm.c b/sound/soc/mediate= k/mt8183/mt8183-afe-pcm.c index d083b4bf0f95..a4bed8e335d8 100644 --- a/sound/soc/mediatek/mt8183/mt8183-afe-pcm.c +++ b/sound/soc/mediatek/mt8183/mt8183-afe-pcm.c @@ -424,196 +424,61 @@ static const struct snd_soc_component_driver mt8183_= afe_pcm_dai_component =3D { .name =3D "mt8183-afe-pcm-dai", }; =20 +#define MT8183_MEMIF_BASE(_id, _en_reg, _fs_reg, _mono_reg) \ + [MT8183_MEMIF_##_id] =3D { \ + .name =3D #_id, \ + .id =3D MT8183_MEMIF_##_id, \ + .reg_ofs_base =3D AFE_##_id##_BASE, \ + .reg_ofs_cur =3D AFE_##_id##_CUR, \ + .reg_ofs_end =3D AFE_##_id##_END, \ + .fs_reg =3D (_fs_reg), \ + .fs_shift =3D _id##_MODE_SFT, \ + .fs_maskbit =3D _id##_MODE_MASK, \ + .mono_reg =3D (_mono_reg), \ + .mono_shift =3D _id##_DATA_SFT, \ + .enable_reg =3D (_en_reg), \ + .enable_shift =3D _id##_ON_SFT, \ + .hd_reg =3D AFE_MEMIF_HD_MODE, \ + .hd_align_reg =3D AFE_MEMIF_HDALIGN, \ + .hd_shift =3D _id##_HD_SFT, \ + .hd_align_mshift =3D _id##_HD_ALIGN_SFT, \ + .agent_disable_reg =3D -1, \ + .agent_disable_shift =3D -1, \ + .msb_reg =3D -1, \ + .msb_shift =3D -1, \ + } + +#define MT8183_MEMIF(_id, _fs_reg, _mono_reg) \ + MT8183_MEMIF_BASE(_id, AFE_DAC_CON0, _fs_reg, _mono_reg) + +/* For convenience with macros: missing register fields */ +#define MOD_DAI_DATA_SFT -1 +#define HDMI_MODE_SFT -1 +#define HDMI_MODE_MASK -1 +#define HDMI_DATA_SFT -1 +#define HDMI_ON_SFT -1 + +/* For convenience with macros: register name differences */ +#define AFE_VUL12_BASE AFE_VUL_D2_BASE +#define AFE_VUL12_CUR AFE_VUL_D2_CUR +#define AFE_VUL12_END AFE_VUL_D2_END +#define AWB2_HD_ALIGN_SFT AWB2_ALIGN_SFT +#define VUL12_DATA_SFT VUL12_MONO_SFT +#define AFE_HDMI_BASE AFE_HDMI_OUT_BASE +#define AFE_HDMI_CUR AFE_HDMI_OUT_CUR +#define AFE_HDMI_END AFE_HDMI_OUT_END + static const struct mtk_base_memif_data memif_data[MT8183_MEMIF_NUM] =3D { - [MT8183_MEMIF_DL1] =3D { - .name =3D "DL1", - .id =3D MT8183_MEMIF_DL1, - .reg_ofs_base =3D AFE_DL1_BASE, - .reg_ofs_cur =3D AFE_DL1_CUR, - .fs_reg =3D AFE_DAC_CON1, - .fs_shift =3D DL1_MODE_SFT, - .fs_maskbit =3D DL1_MODE_MASK, - .mono_reg =3D AFE_DAC_CON1, - .mono_shift =3D DL1_DATA_SFT, - .enable_reg =3D AFE_DAC_CON0, - .enable_shift =3D DL1_ON_SFT, - .hd_reg =3D AFE_MEMIF_HD_MODE, - .hd_align_reg =3D AFE_MEMIF_HDALIGN, - .hd_shift =3D DL1_HD_SFT, - .hd_align_mshift =3D DL1_HD_ALIGN_SFT, - .agent_disable_reg =3D -1, - .agent_disable_shift =3D -1, - .msb_reg =3D -1, - .msb_shift =3D -1, - }, - [MT8183_MEMIF_DL2] =3D { - .name =3D "DL2", - .id =3D MT8183_MEMIF_DL2, - .reg_ofs_base =3D AFE_DL2_BASE, - .reg_ofs_cur =3D AFE_DL2_CUR, - .fs_reg =3D AFE_DAC_CON1, - .fs_shift =3D DL2_MODE_SFT, - .fs_maskbit =3D DL2_MODE_MASK, - .mono_reg =3D AFE_DAC_CON1, - .mono_shift =3D DL2_DATA_SFT, - .enable_reg =3D AFE_DAC_CON0, - .enable_shift =3D DL2_ON_SFT, - .hd_reg =3D AFE_MEMIF_HD_MODE, - .hd_align_reg =3D AFE_MEMIF_HDALIGN, - .hd_shift =3D DL2_HD_SFT, - .hd_align_mshift =3D DL2_HD_ALIGN_SFT, - .agent_disable_reg =3D -1, - .agent_disable_shift =3D -1, - .msb_reg =3D -1, - .msb_shift =3D -1, - }, - [MT8183_MEMIF_DL3] =3D { - .name =3D "DL3", - .id =3D MT8183_MEMIF_DL3, - .reg_ofs_base =3D AFE_DL3_BASE, - .reg_ofs_cur =3D AFE_DL3_CUR, - .fs_reg =3D AFE_DAC_CON2, - .fs_shift =3D DL3_MODE_SFT, - .fs_maskbit =3D DL3_MODE_MASK, - .mono_reg =3D AFE_DAC_CON1, - .mono_shift =3D DL3_DATA_SFT, - .enable_reg =3D AFE_DAC_CON0, - .enable_shift =3D DL3_ON_SFT, - .hd_reg =3D AFE_MEMIF_HD_MODE, - .hd_align_reg =3D AFE_MEMIF_HDALIGN, - .hd_shift =3D DL3_HD_SFT, - .hd_align_mshift =3D DL3_HD_ALIGN_SFT, - .agent_disable_reg =3D -1, - .agent_disable_shift =3D -1, - .msb_reg =3D -1, - .msb_shift =3D -1, - }, - [MT8183_MEMIF_VUL2] =3D { - .name =3D "VUL2", - .id =3D MT8183_MEMIF_VUL2, - .reg_ofs_base =3D AFE_VUL2_BASE, - .reg_ofs_cur =3D AFE_VUL2_CUR, - .fs_reg =3D AFE_DAC_CON2, - .fs_shift =3D VUL2_MODE_SFT, - .fs_maskbit =3D VUL2_MODE_MASK, - .mono_reg =3D AFE_DAC_CON2, - .mono_shift =3D VUL2_DATA_SFT, - .enable_reg =3D AFE_DAC_CON0, - .enable_shift =3D VUL2_ON_SFT, - .hd_reg =3D AFE_MEMIF_HD_MODE, - .hd_align_reg =3D AFE_MEMIF_HDALIGN, - .hd_shift =3D VUL2_HD_SFT, - .hd_align_mshift =3D VUL2_HD_ALIGN_SFT, - .agent_disable_reg =3D -1, - .agent_disable_shift =3D -1, - .msb_reg =3D -1, - .msb_shift =3D -1, - }, - [MT8183_MEMIF_AWB] =3D { - .name =3D "AWB", - .id =3D MT8183_MEMIF_AWB, - .reg_ofs_base =3D AFE_AWB_BASE, - .reg_ofs_cur =3D AFE_AWB_CUR, - .fs_reg =3D AFE_DAC_CON1, - .fs_shift =3D AWB_MODE_SFT, - .fs_maskbit =3D AWB_MODE_MASK, - .mono_reg =3D AFE_DAC_CON1, - .mono_shift =3D AWB_DATA_SFT, - .enable_reg =3D AFE_DAC_CON0, - .enable_shift =3D AWB_ON_SFT, - .hd_reg =3D AFE_MEMIF_HD_MODE, - .hd_align_reg =3D AFE_MEMIF_HDALIGN, - .hd_shift =3D AWB_HD_SFT, - .hd_align_mshift =3D AWB_HD_ALIGN_SFT, - .agent_disable_reg =3D -1, - .agent_disable_shift =3D -1, - .msb_reg =3D -1, - .msb_shift =3D -1, - }, - [MT8183_MEMIF_AWB2] =3D { - .name =3D "AWB2", - .id =3D MT8183_MEMIF_AWB2, - .reg_ofs_base =3D AFE_AWB2_BASE, - .reg_ofs_cur =3D AFE_AWB2_CUR, - .fs_reg =3D AFE_DAC_CON2, - .fs_shift =3D AWB2_MODE_SFT, - .fs_maskbit =3D AWB2_MODE_MASK, - .mono_reg =3D AFE_DAC_CON2, - .mono_shift =3D AWB2_DATA_SFT, - .enable_reg =3D AFE_DAC_CON0, - .enable_shift =3D AWB2_ON_SFT, - .hd_reg =3D AFE_MEMIF_HD_MODE, - .hd_align_reg =3D AFE_MEMIF_HDALIGN, - .hd_shift =3D AWB2_HD_SFT, - .hd_align_mshift =3D AWB2_ALIGN_SFT, - .agent_disable_reg =3D -1, - .agent_disable_shift =3D -1, - .msb_reg =3D -1, - .msb_shift =3D -1, - }, - [MT8183_MEMIF_VUL12] =3D { - .name =3D "VUL12", - .id =3D MT8183_MEMIF_VUL12, - .reg_ofs_base =3D AFE_VUL_D2_BASE, - .reg_ofs_cur =3D AFE_VUL_D2_CUR, - .fs_reg =3D AFE_DAC_CON0, - .fs_shift =3D VUL12_MODE_SFT, - .fs_maskbit =3D VUL12_MODE_MASK, - .mono_reg =3D AFE_DAC_CON0, - .mono_shift =3D VUL12_MONO_SFT, - .enable_reg =3D AFE_DAC_CON0, - .enable_shift =3D VUL12_ON_SFT, - .hd_reg =3D AFE_MEMIF_HD_MODE, - .hd_align_reg =3D AFE_MEMIF_HDALIGN, - .hd_shift =3D VUL12_HD_SFT, - .hd_align_mshift =3D VUL12_HD_ALIGN_SFT, - .agent_disable_reg =3D -1, - .agent_disable_shift =3D -1, - .msb_reg =3D -1, - .msb_shift =3D -1, - }, - [MT8183_MEMIF_MOD_DAI] =3D { - .name =3D "MOD_DAI", - .id =3D MT8183_MEMIF_MOD_DAI, - .reg_ofs_base =3D AFE_MOD_DAI_BASE, - .reg_ofs_cur =3D AFE_MOD_DAI_CUR, - .fs_reg =3D AFE_DAC_CON1, - .fs_shift =3D MOD_DAI_MODE_SFT, - .fs_maskbit =3D MOD_DAI_MODE_MASK, - .mono_reg =3D -1, - .mono_shift =3D 0, - .enable_reg =3D AFE_DAC_CON0, - .enable_shift =3D MOD_DAI_ON_SFT, - .hd_reg =3D AFE_MEMIF_HD_MODE, - .hd_align_reg =3D AFE_MEMIF_HDALIGN, - .hd_shift =3D MOD_DAI_HD_SFT, - .hd_align_mshift =3D MOD_DAI_HD_ALIGN_SFT, - .agent_disable_reg =3D -1, - .agent_disable_shift =3D -1, - .msb_reg =3D -1, - .msb_shift =3D -1, - }, - [MT8183_MEMIF_HDMI] =3D { - .name =3D "HDMI", - .id =3D MT8183_MEMIF_HDMI, - .reg_ofs_base =3D AFE_HDMI_OUT_BASE, - .reg_ofs_cur =3D AFE_HDMI_OUT_CUR, - .fs_reg =3D -1, - .fs_shift =3D -1, - .fs_maskbit =3D -1, - .mono_reg =3D -1, - .mono_shift =3D -1, - .enable_reg =3D -1, /* control in tdm for sync start */ - .enable_shift =3D -1, - .hd_reg =3D AFE_MEMIF_HD_MODE, - .hd_align_reg =3D AFE_MEMIF_HDALIGN, - .hd_shift =3D HDMI_HD_SFT, - .hd_align_mshift =3D HDMI_HD_ALIGN_SFT, - .agent_disable_reg =3D -1, - .agent_disable_shift =3D -1, - .msb_reg =3D -1, - .msb_shift =3D -1, - }, + MT8183_MEMIF(DL1, AFE_DAC_CON1, AFE_DAC_CON1), + MT8183_MEMIF(DL2, AFE_DAC_CON1, AFE_DAC_CON1), + MT8183_MEMIF(DL3, AFE_DAC_CON2, AFE_DAC_CON1), + MT8183_MEMIF(VUL2, AFE_DAC_CON2, AFE_DAC_CON2), + MT8183_MEMIF(AWB, AFE_DAC_CON1, AFE_DAC_CON1), + MT8183_MEMIF(AWB2, AFE_DAC_CON2, AFE_DAC_CON2), + MT8183_MEMIF(VUL12, AFE_DAC_CON0, AFE_DAC_CON0), + MT8183_MEMIF(MOD_DAI, AFE_DAC_CON1, -1), + /* enable control in tdm for sync start */ + MT8183_MEMIF_BASE(HDMI, -1, -1, -1), }; =20 static const struct mtk_base_irq_data irq_data[MT8183_IRQ_NUM] =3D { --=20 2.49.0.1045.g170613ef41-goog From nobody Mon Feb 9 02:07:07 2026 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7FAFA28313E for ; Thu, 15 May 2025 07:38:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747294720; cv=none; b=uFetQhO1OJG3oJ5c4j1fqvi30YLY7CCQlqRHSEK7V5KGH83l0JQugUnA9YEzwKCGgQLIhYCCved/YTgyWSM1+n5HxQYAdnymyRk7nx3Q5vFE0fmwTA9TczQXkc1wBJQYuF4kvapFZpQ5A9aLlIRLolKOhJmbYQEPmE+snihDSjQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747294720; c=relaxed/simple; bh=Aamm8tMZwvmn+zCf/R9rzd5Zoo8sxxgYpgtnjGEXVhM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cFVBlepVJcqMnazDq/vXhfmRRzff00PqzQD3mkvdbaUsM3PA95EUj2ldCw/1wF3Wc/NyifUbcZk9vNnTVWJOwcS1ClemOHEuLeWFI8SvT5zimNEhKUMU/bngJGUZ5UzLUuKGo1CGOvLzOrOt8D8blMKUeMUjuqzUNlapgfdJ5Qg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=crWfwblc; arc=none smtp.client-ip=209.85.214.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="crWfwblc" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-22e7eff58a0so6551985ad.3 for ; Thu, 15 May 2025 00:38:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1747294718; x=1747899518; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Cuw9i37af/1ORneMvev0+QG19FsjaSUWkPdlSl+CJ68=; b=crWfwblcKg/5SHeLmCmACv/za6xJ4iegdz1eUnsZLhOYnlyUrr5Pr/4oMb5Bp+iZKl Fxy5T7VKPQE4CI3kX4Q5g4qv2eR3qETY6PSk1pRH+eaOcfLZYp7kwdwFI4PPYhhnQR9+ JBe2Mh3mMvWEPgBGfG/hiE+wWJgjP3vNKn8Bk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747294718; x=1747899518; 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=Cuw9i37af/1ORneMvev0+QG19FsjaSUWkPdlSl+CJ68=; b=PGwKtDQM4GBvnu8vRSJdoUGmwwGmRU4gdjRz5GGFykoWm0KBObC+jw0NBqd4IEL36J xCYdCfbvxJcQXnbvsMsu/y/7pKVcacY5JT/0FnPVrdfCbsFhsrpTib8h6LXcPIU2Zggh 6UoJdHvDyz44N4CBkP5T6l7fEBWhZNbhXPxa0OB8bV/rKd1rYsNRg4xp7yNgtNwpQ0AZ YcbC5VmmH62L1IndQWIRz8TDZ3SCmz8pKPZvCQW2/Nm4hdFtkVfHtg1EZ2cUtPdhUoj+ iShaMyaWPxHNKft3OCf2feqPdZBTFFTmOyTAQ5UCEUMzbEnu6mfRm3RY7gScs1J/QNFV xTwA== X-Forwarded-Encrypted: i=1; AJvYcCUSht0GPoqJU2sr5Z70St7RWsn6njSUErdmtq3SRqPt/IXSbRXuMAF75tYEJjtaKfVSXrW/tRTW9rUbUfw=@vger.kernel.org X-Gm-Message-State: AOJu0YyO6PATQuYPdzHqHzvekL2hJA3JJSex+4bGd19pQ5QVdESjyI3j 1InLMvGaCK+jzqXlxMDW6Fhh/Ec8qjuepNjDLBcCROWXnu6TELSAp60nVRyz6g== X-Gm-Gg: ASbGncvUHW1W/6AWPjHVyLwV/thjVcvwOvqOJqZQ52UNBMIFz9Bj/VivtCWNUdWsUJ4 iix4qOtB/uO65MP1SOI65DLjnG32mRjGImTzP5niL4/Fn2/dnfWAzX9SLr2F7rqBb2fbN8LVjyJ XMRpAELJ/tNA0EDlGa7ILqVi/F5OTNapnRM42wAJaboEEO1kUViaEpfl3w1gIbkXJWSe3aXvqZ5 vXBdjoEzm8woQekIZPq1oi1W3Uygg+DT1P6LWT4UqC6ufODbOL3tLERF60CYtE3tyHj0dze8ISt tya5a8r1zvwupEpfCB2NB7qXJNmNQ3GFR0TgoyIcmkL+bFav0qpJYJy+4InUqEwKAe3hkw== X-Google-Smtp-Source: AGHT+IHe6IzxFNkLauCy9bZU1Uvquc1KSUc5NpKfBLs8LJxHMC9d6kRf1QOHhUOkDzpc6Nk9gUSZew== X-Received: by 2002:a17:903:3bc6:b0:224:18bb:44c2 with SMTP id d9443c01a7336-231b5e51feemr15907235ad.6.1747294717753; Thu, 15 May 2025 00:38:37 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:c43a:aaea:5f52:5763]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22fc8271f61sm109750825ad.142.2025.05.15.00.38.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 00:38:37 -0700 (PDT) From: Chen-Yu Tsai To: Liam Girdwood , Mark Brown , Matthias Brugger , AngeloGioacchino Del Regno Cc: Chen-Yu Tsai , Jaroslav Kysela , Takashi Iwai , Jiaxin Yu , linux-sound@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, Darren Ye Subject: [PATCH v2 2/3] ASoC: mediatek: mt8183-afe-pcm: Shorten irq_data table using macros Date: Thu, 15 May 2025 15:38:22 +0800 Message-ID: <20250515073825.4155297-3-wenst@chromium.org> X-Mailer: git-send-email 2.49.0.1045.g170613ef41-goog In-Reply-To: <20250515073825.4155297-1-wenst@chromium.org> References: <20250515073825.4155297-1-wenst@chromium.org> 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 Content-Type: text/plain; charset="utf-8" The irq_data table describes all the supported interrupts for the audio frontend. The parameters are either the same or can be derived from the interrupt number. This results in a very long table (in source code) that can be shortened with macros. Do just that. Signed-off-by: Chen-Yu Tsai Reviewed-by: AngeloGioacchino Del Regno --- sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 176 ++++----------------- 1 file changed, 33 insertions(+), 143 deletions(-) diff --git a/sound/soc/mediatek/mt8183/mt8183-afe-pcm.c b/sound/soc/mediate= k/mt8183/mt8183-afe-pcm.c index a4bed8e335d8..fe315224a259 100644 --- a/sound/soc/mediatek/mt8183/mt8183-afe-pcm.c +++ b/sound/soc/mediatek/mt8183/mt8183-afe-pcm.c @@ -481,150 +481,40 @@ static const struct mtk_base_memif_data memif_data[M= T8183_MEMIF_NUM] =3D { MT8183_MEMIF_BASE(HDMI, -1, -1, -1), }; =20 +#define MT8183_AFE_IRQ_BASE(_id, _fs_reg, _fs_shift, _fs_maskbit) \ + [MT8183_IRQ_##_id] =3D { \ + .id =3D MT8183_IRQ_##_id, \ + .irq_cnt_reg =3D AFE_IRQ_MCU_CNT##_id, \ + .irq_cnt_shift =3D 0, \ + .irq_cnt_maskbit =3D 0x3ffff, \ + .irq_fs_reg =3D _fs_reg, \ + .irq_fs_shift =3D _fs_shift, \ + .irq_fs_maskbit =3D _fs_maskbit, \ + .irq_en_reg =3D AFE_IRQ_MCU_CON0, \ + .irq_en_shift =3D IRQ##_id##_MCU_ON_SFT, \ + .irq_clr_reg =3D AFE_IRQ_MCU_CLR, \ + .irq_clr_shift =3D IRQ##_id##_MCU_CLR_SFT, \ + } + +#define MT8183_AFE_IRQ(_id) \ + MT8183_AFE_IRQ_BASE(_id, AFE_IRQ_MCU_CON1 + _id / 8 * 4, \ + IRQ##_id##_MCU_MODE_SFT, \ + IRQ##_id##_MCU_MODE_MASK) + +#define MT8183_AFE_IRQ_NOFS(_id) MT8183_AFE_IRQ_BASE(_id, -1, -1, -1) + static const struct mtk_base_irq_data irq_data[MT8183_IRQ_NUM] =3D { - [MT8183_IRQ_0] =3D { - .id =3D MT8183_IRQ_0, - .irq_cnt_reg =3D AFE_IRQ_MCU_CNT0, - .irq_cnt_shift =3D 0, - .irq_cnt_maskbit =3D 0x3ffff, - .irq_fs_reg =3D AFE_IRQ_MCU_CON1, - .irq_fs_shift =3D IRQ0_MCU_MODE_SFT, - .irq_fs_maskbit =3D IRQ0_MCU_MODE_MASK, - .irq_en_reg =3D AFE_IRQ_MCU_CON0, - .irq_en_shift =3D IRQ0_MCU_ON_SFT, - .irq_clr_reg =3D AFE_IRQ_MCU_CLR, - .irq_clr_shift =3D IRQ0_MCU_CLR_SFT, - }, - [MT8183_IRQ_1] =3D { - .id =3D MT8183_IRQ_1, - .irq_cnt_reg =3D AFE_IRQ_MCU_CNT1, - .irq_cnt_shift =3D 0, - .irq_cnt_maskbit =3D 0x3ffff, - .irq_fs_reg =3D AFE_IRQ_MCU_CON1, - .irq_fs_shift =3D IRQ1_MCU_MODE_SFT, - .irq_fs_maskbit =3D IRQ1_MCU_MODE_MASK, - .irq_en_reg =3D AFE_IRQ_MCU_CON0, - .irq_en_shift =3D IRQ1_MCU_ON_SFT, - .irq_clr_reg =3D AFE_IRQ_MCU_CLR, - .irq_clr_shift =3D IRQ1_MCU_CLR_SFT, - }, - [MT8183_IRQ_2] =3D { - .id =3D MT8183_IRQ_2, - .irq_cnt_reg =3D AFE_IRQ_MCU_CNT2, - .irq_cnt_shift =3D 0, - .irq_cnt_maskbit =3D 0x3ffff, - .irq_fs_reg =3D AFE_IRQ_MCU_CON1, - .irq_fs_shift =3D IRQ2_MCU_MODE_SFT, - .irq_fs_maskbit =3D IRQ2_MCU_MODE_MASK, - .irq_en_reg =3D AFE_IRQ_MCU_CON0, - .irq_en_shift =3D IRQ2_MCU_ON_SFT, - .irq_clr_reg =3D AFE_IRQ_MCU_CLR, - .irq_clr_shift =3D IRQ2_MCU_CLR_SFT, - }, - [MT8183_IRQ_3] =3D { - .id =3D MT8183_IRQ_3, - .irq_cnt_reg =3D AFE_IRQ_MCU_CNT3, - .irq_cnt_shift =3D 0, - .irq_cnt_maskbit =3D 0x3ffff, - .irq_fs_reg =3D AFE_IRQ_MCU_CON1, - .irq_fs_shift =3D IRQ3_MCU_MODE_SFT, - .irq_fs_maskbit =3D IRQ3_MCU_MODE_MASK, - .irq_en_reg =3D AFE_IRQ_MCU_CON0, - .irq_en_shift =3D IRQ3_MCU_ON_SFT, - .irq_clr_reg =3D AFE_IRQ_MCU_CLR, - .irq_clr_shift =3D IRQ3_MCU_CLR_SFT, - }, - [MT8183_IRQ_4] =3D { - .id =3D MT8183_IRQ_4, - .irq_cnt_reg =3D AFE_IRQ_MCU_CNT4, - .irq_cnt_shift =3D 0, - .irq_cnt_maskbit =3D 0x3ffff, - .irq_fs_reg =3D AFE_IRQ_MCU_CON1, - .irq_fs_shift =3D IRQ4_MCU_MODE_SFT, - .irq_fs_maskbit =3D IRQ4_MCU_MODE_MASK, - .irq_en_reg =3D AFE_IRQ_MCU_CON0, - .irq_en_shift =3D IRQ4_MCU_ON_SFT, - .irq_clr_reg =3D AFE_IRQ_MCU_CLR, - .irq_clr_shift =3D IRQ4_MCU_CLR_SFT, - }, - [MT8183_IRQ_5] =3D { - .id =3D MT8183_IRQ_5, - .irq_cnt_reg =3D AFE_IRQ_MCU_CNT5, - .irq_cnt_shift =3D 0, - .irq_cnt_maskbit =3D 0x3ffff, - .irq_fs_reg =3D AFE_IRQ_MCU_CON1, - .irq_fs_shift =3D IRQ5_MCU_MODE_SFT, - .irq_fs_maskbit =3D IRQ5_MCU_MODE_MASK, - .irq_en_reg =3D AFE_IRQ_MCU_CON0, - .irq_en_shift =3D IRQ5_MCU_ON_SFT, - .irq_clr_reg =3D AFE_IRQ_MCU_CLR, - .irq_clr_shift =3D IRQ5_MCU_CLR_SFT, - }, - [MT8183_IRQ_6] =3D { - .id =3D MT8183_IRQ_6, - .irq_cnt_reg =3D AFE_IRQ_MCU_CNT6, - .irq_cnt_shift =3D 0, - .irq_cnt_maskbit =3D 0x3ffff, - .irq_fs_reg =3D AFE_IRQ_MCU_CON1, - .irq_fs_shift =3D IRQ6_MCU_MODE_SFT, - .irq_fs_maskbit =3D IRQ6_MCU_MODE_MASK, - .irq_en_reg =3D AFE_IRQ_MCU_CON0, - .irq_en_shift =3D IRQ6_MCU_ON_SFT, - .irq_clr_reg =3D AFE_IRQ_MCU_CLR, - .irq_clr_shift =3D IRQ6_MCU_CLR_SFT, - }, - [MT8183_IRQ_7] =3D { - .id =3D MT8183_IRQ_7, - .irq_cnt_reg =3D AFE_IRQ_MCU_CNT7, - .irq_cnt_shift =3D 0, - .irq_cnt_maskbit =3D 0x3ffff, - .irq_fs_reg =3D AFE_IRQ_MCU_CON1, - .irq_fs_shift =3D IRQ7_MCU_MODE_SFT, - .irq_fs_maskbit =3D IRQ7_MCU_MODE_MASK, - .irq_en_reg =3D AFE_IRQ_MCU_CON0, - .irq_en_shift =3D IRQ7_MCU_ON_SFT, - .irq_clr_reg =3D AFE_IRQ_MCU_CLR, - .irq_clr_shift =3D IRQ7_MCU_CLR_SFT, - }, - [MT8183_IRQ_8] =3D { - .id =3D MT8183_IRQ_8, - .irq_cnt_reg =3D AFE_IRQ_MCU_CNT8, - .irq_cnt_shift =3D 0, - .irq_cnt_maskbit =3D 0x3ffff, - .irq_fs_reg =3D -1, - .irq_fs_shift =3D -1, - .irq_fs_maskbit =3D -1, - .irq_en_reg =3D AFE_IRQ_MCU_CON0, - .irq_en_shift =3D IRQ8_MCU_ON_SFT, - .irq_clr_reg =3D AFE_IRQ_MCU_CLR, - .irq_clr_shift =3D IRQ8_MCU_CLR_SFT, - }, - [MT8183_IRQ_11] =3D { - .id =3D MT8183_IRQ_11, - .irq_cnt_reg =3D AFE_IRQ_MCU_CNT11, - .irq_cnt_shift =3D 0, - .irq_cnt_maskbit =3D 0x3ffff, - .irq_fs_reg =3D AFE_IRQ_MCU_CON2, - .irq_fs_shift =3D IRQ11_MCU_MODE_SFT, - .irq_fs_maskbit =3D IRQ11_MCU_MODE_MASK, - .irq_en_reg =3D AFE_IRQ_MCU_CON0, - .irq_en_shift =3D IRQ11_MCU_ON_SFT, - .irq_clr_reg =3D AFE_IRQ_MCU_CLR, - .irq_clr_shift =3D IRQ11_MCU_CLR_SFT, - }, - [MT8183_IRQ_12] =3D { - .id =3D MT8183_IRQ_12, - .irq_cnt_reg =3D AFE_IRQ_MCU_CNT12, - .irq_cnt_shift =3D 0, - .irq_cnt_maskbit =3D 0x3ffff, - .irq_fs_reg =3D AFE_IRQ_MCU_CON2, - .irq_fs_shift =3D IRQ12_MCU_MODE_SFT, - .irq_fs_maskbit =3D IRQ12_MCU_MODE_MASK, - .irq_en_reg =3D AFE_IRQ_MCU_CON0, - .irq_en_shift =3D IRQ12_MCU_ON_SFT, - .irq_clr_reg =3D AFE_IRQ_MCU_CLR, - .irq_clr_shift =3D IRQ12_MCU_CLR_SFT, - }, + MT8183_AFE_IRQ(0), + MT8183_AFE_IRQ(1), + MT8183_AFE_IRQ(2), + MT8183_AFE_IRQ(3), + MT8183_AFE_IRQ(4), + MT8183_AFE_IRQ(5), + MT8183_AFE_IRQ(6), + MT8183_AFE_IRQ(7), + MT8183_AFE_IRQ_NOFS(8), + MT8183_AFE_IRQ(11), + MT8183_AFE_IRQ(12), }; =20 static bool mt8183_is_volatile_reg(struct device *dev, unsigned int reg) --=20 2.49.0.1045.g170613ef41-goog From nobody Mon Feb 9 02:07:07 2026 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 42EF0285419 for ; Thu, 15 May 2025 07:38:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747294723; cv=none; b=T1Ao+4HzyapcIguIZjZApQyocMRrAGif6WW+7NcLqh5PbjxdrZ3OaIhLwLvBmCC7sIs5x87y4lMhxk85bxJ84j/k9Mn8DjBBtZiBopwh789Ebw5vBex+htBHJ9zBIFBpxcA+5fDQNsp4qJO3o7csyO+JcgwhTPS55F/mM4FSh3A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747294723; c=relaxed/simple; bh=HJFU1pobyGKIRjhv6sWs+4KE/Eb7e+JkMbmBP8ECP0M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nPs+7Wtjk6dxdsEXqOIhhFw4rapVadkhKpzRBwKlPglw8ghCelsjeKnwlWDf1mB9bQ+0CB2GPmMMhIfMfOh+ZCejuGEhkdAuPM9bmmzNcULi+mYdfeJCJm7lACDwz4QZQ4o8zQnjHBmO0sIJ/TlvOPvKfmD8XEkMFKc97/KZlm4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=Ns0JczSi; arc=none smtp.client-ip=209.85.214.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Ns0JczSi" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-231bf5851b7so1307465ad.0 for ; Thu, 15 May 2025 00:38:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1747294720; x=1747899520; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RlgroavkFNmhZvJ2omBGrXCrXVWCsbUHz4C2BYIxmqs=; b=Ns0JczSi53YZeZenB2k2D6/CVD8GsSNtn9HlzYyo3ujvAAhXk92uKNEzKtDj5Nlemt Yaf95u98jQigNOMWy5+FaIHLphlIZXASooiGTJzr/Wb+upA6qGSg1+WIgTOtQRH/jvoo 5W0WdsBVuenjWHjRaIRMEutggw+GcSO7JLDK0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747294720; x=1747899520; 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=RlgroavkFNmhZvJ2omBGrXCrXVWCsbUHz4C2BYIxmqs=; b=ip5/c88S9PXh+rmwR21se8CHD18s50+MQ9YuXyGlJIUwna2oyjq1ITTRDvtTWVJjxO IGTukfIw8bVeI2PdZCneg82A97uS17XaBBSDBvxJ4MPT6MJ7PbJibVnog2ymnxLDDP19 S+Nj8b51yQGO+liCQ+Hkx6hnvkHa0KzEAro5CSg+YrVDAx8p6nE6QBvA0H1DyvvkpNVx fD07TDvSVm/QGM+97xmZirGYtuXRo4tKQorudAKSoovasAJepiTlCy/Aw6OSBa+nl0aN 4TAjXIuA9vDaHl4Adp2LEaCgW1U+pbLAiHbdpzFzRL2I5aSdNDvJro/+gj2FusL9Y/Xj zLOA== X-Forwarded-Encrypted: i=1; AJvYcCUSKR++FDcivWto0BYD4s9H7oLdT6xYr5xfwRLDInAeyWTc+507hMgFXmzgBwZMS12uvQzdesQUxLPR5ow=@vger.kernel.org X-Gm-Message-State: AOJu0YzYa8JLvAL0EduxMG/YhCwK/DqtdqNIaWsxgUO/yh0B2ON37e+W jWwDHUAVhj7WNCi4knDWwb3ong2onYv7fJXrEzb+qOkrGFXj79SdnC17HnErKQ== X-Gm-Gg: ASbGncv9yYdOew0ATkmrg3hNSVlthquaMhW38L/fMi4hmE49nampEzLbmGGvEix63fP Ql1ucN0bkhnEIblyIH1/pOM9KxhB1rDdlrl2kNgRUwgiwfJ6yIC5mzjFUa6JnZggrD/tAuDc0ps /OJOh3emv3RlIFDEuejHXDyp4Ahbp8ngOPSPiiAo8Yg/Oa6KIymeQpZ6icZGatbGfqRAQSFyVCZ Q3yBiWrV61iawuiI2uHzXg+Arf5na8oC3Oo9DLstlOVJbMMyrdDZzNoKeOL622VRqiP+CkmiLPn QgijDq7P8JfCaIBOd4H/YPo3lSiQpKrDcFx6EsbGhhJI8CAj1qApajZDsKyF4vR4ddnE0w== X-Google-Smtp-Source: AGHT+IGzxgKY4oRrN3kg0KvYeYGnTZCcfiHd8Yeu2SNTcwdxoN/9aBTg+QD8HzFianQMbmpb40NBpg== X-Received: by 2002:a17:903:190d:b0:223:669f:ca2d with SMTP id d9443c01a7336-231981453e0mr102895825ad.35.1747294720320; Thu, 15 May 2025 00:38:40 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:c43a:aaea:5f52:5763]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22fc8271f61sm109750825ad.142.2025.05.15.00.38.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 00:38:39 -0700 (PDT) From: Chen-Yu Tsai To: Liam Girdwood , Mark Brown , Matthias Brugger , AngeloGioacchino Del Regno Cc: Chen-Yu Tsai , Jaroslav Kysela , Takashi Iwai , Jiaxin Yu , linux-sound@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, Darren Ye Subject: [PATCH v2 3/3] ASoC: mediatek: mt8183-afe-pcm: shorten mt8183_is_volatile_reg() Date: Thu, 15 May 2025 15:38:23 +0800 Message-ID: <20250515073825.4155297-4-wenst@chromium.org> X-Mailer: git-send-email 2.49.0.1045.g170613ef41-goog In-Reply-To: <20250515073825.4155297-1-wenst@chromium.org> References: <20250515073825.4155297-1-wenst@chromium.org> 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 Content-Type: text/plain; charset="utf-8" mt8183_is_volatile_reg() is a large switch-case block that lists out every register that is volatile. Since many pairs of registers have consecutive addresses, the cases can be compressed down with the ellipsis, i.e. GCC extension "case ranges" [1] to cover more addresses in one case, shortening the source code. This is not completely the same, since the addresses are 4-byte aligned, and using the case ranges feature adds all unaligned addresses in between. In practice this doesn't matter since the unaligned addresses are blocked by the regmap core. This also ends up compiling slightly smaller with a reduction of 128 bytes in the text section. [1] https://gcc.gnu.org/onlinedocs/gcc/Case-Ranges.html Signed-off-by: Chen-Yu Tsai Reviewed-by: AngeloGioacchino Del Regno --- sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 152 ++++++--------------- 1 file changed, 40 insertions(+), 112 deletions(-) diff --git a/sound/soc/mediatek/mt8183/mt8183-afe-pcm.c b/sound/soc/mediate= k/mt8183/mt8183-afe-pcm.c index fe315224a259..e8884354995c 100644 --- a/sound/soc/mediatek/mt8183/mt8183-afe-pcm.c +++ b/sound/soc/mediatek/mt8183/mt8183-afe-pcm.c @@ -522,86 +522,46 @@ static bool mt8183_is_volatile_reg(struct device *dev= , unsigned int reg) /* these auto-gen reg has read-only bit, so put it as volatile */ /* volatile reg cannot be cached, so cannot be set when power off */ switch (reg) { - case AUDIO_TOP_CON0: /* reg bit controlled by CCF */ - case AUDIO_TOP_CON1: /* reg bit controlled by CCF */ + case AUDIO_TOP_CON0 ... AUDIO_TOP_CON1: /* reg bit controlled by CCF */ case AUDIO_TOP_CON3: - case AFE_DL1_CUR: - case AFE_DL1_END: - case AFE_DL2_CUR: - case AFE_DL2_END: - case AFE_AWB_END: - case AFE_AWB_CUR: - case AFE_VUL_END: - case AFE_VUL_CUR: - case AFE_MEMIF_MON0: - case AFE_MEMIF_MON1: - case AFE_MEMIF_MON2: - case AFE_MEMIF_MON3: - case AFE_MEMIF_MON4: - case AFE_MEMIF_MON5: - case AFE_MEMIF_MON6: - case AFE_MEMIF_MON7: - case AFE_MEMIF_MON8: - case AFE_MEMIF_MON9: - case AFE_ADDA_SRC_DEBUG_MON0: - case AFE_ADDA_SRC_DEBUG_MON1: - case AFE_ADDA_UL_SRC_MON0: - case AFE_ADDA_UL_SRC_MON1: + case AFE_DL1_CUR ... AFE_DL1_END: + case AFE_DL2_CUR ... AFE_DL2_END: + case AFE_AWB_END ... AFE_AWB_CUR: + case AFE_VUL_END ... AFE_VUL_CUR: + case AFE_MEMIF_MON0 ... AFE_MEMIF_MON9: + case AFE_ADDA_SRC_DEBUG_MON0 ... AFE_ADDA_SRC_DEBUG_MON1: + case AFE_ADDA_UL_SRC_MON0 ... AFE_ADDA_UL_SRC_MON1: case AFE_SIDETONE_MON: - case AFE_SIDETONE_CON0: - case AFE_SIDETONE_COEFF: + case AFE_SIDETONE_CON0 ... AFE_SIDETONE_COEFF: case AFE_BUS_MON0: - case AFE_MRGIF_MON0: - case AFE_MRGIF_MON1: - case AFE_MRGIF_MON2: - case AFE_I2S_MON: + case AFE_MRGIF_MON0 ... AFE_I2S_MON: case AFE_DAC_MON: - case AFE_VUL2_END: - case AFE_VUL2_CUR: - case AFE_IRQ0_MCU_CNT_MON: - case AFE_IRQ6_MCU_CNT_MON: - case AFE_MOD_DAI_END: - case AFE_MOD_DAI_CUR: - case AFE_VUL_D2_END: - case AFE_VUL_D2_CUR: - case AFE_DL3_CUR: - case AFE_DL3_END: + case AFE_VUL2_END ... AFE_VUL2_CUR: + case AFE_IRQ0_MCU_CNT_MON ... AFE_IRQ6_MCU_CNT_MON: + case AFE_MOD_DAI_END ... AFE_MOD_DAI_CUR: + case AFE_VUL_D2_END ... AFE_VUL_D2_CUR: + case AFE_DL3_CUR ... AFE_DL3_END: case AFE_HDMI_OUT_CON0: - case AFE_HDMI_OUT_CUR: - case AFE_HDMI_OUT_END: - case AFE_IRQ3_MCU_CNT_MON: - case AFE_IRQ4_MCU_CNT_MON: - case AFE_IRQ_MCU_STATUS: - case AFE_IRQ_MCU_CLR: + case AFE_HDMI_OUT_CUR ... AFE_HDMI_OUT_END: + case AFE_IRQ3_MCU_CNT_MON... AFE_IRQ4_MCU_CNT_MON: + case AFE_IRQ_MCU_STATUS ... AFE_IRQ_MCU_CLR: case AFE_IRQ_MCU_MON2: - case AFE_IRQ1_MCU_CNT_MON: - case AFE_IRQ2_MCU_CNT_MON: - case AFE_IRQ1_MCU_EN_CNT_MON: - case AFE_IRQ5_MCU_CNT_MON: + case AFE_IRQ1_MCU_CNT_MON ... AFE_IRQ5_MCU_CNT_MON: case AFE_IRQ7_MCU_CNT_MON: case AFE_GAIN1_CUR: case AFE_GAIN2_CUR: case AFE_SRAM_DELSEL_CON0: - case AFE_SRAM_DELSEL_CON2: - case AFE_SRAM_DELSEL_CON3: - case AFE_ASRC_2CH_CON12: - case AFE_ASRC_2CH_CON13: + case AFE_SRAM_DELSEL_CON2 ... AFE_SRAM_DELSEL_CON3: + case AFE_ASRC_2CH_CON12 ... AFE_ASRC_2CH_CON13: case PCM_INTF_CON2: - case FPGA_CFG0: - case FPGA_CFG1: - case FPGA_CFG2: - case FPGA_CFG3: - case AUDIO_TOP_DBG_MON0: - case AUDIO_TOP_DBG_MON1: - case AFE_IRQ8_MCU_CNT_MON: - case AFE_IRQ11_MCU_CNT_MON: - case AFE_IRQ12_MCU_CNT_MON: + case FPGA_CFG0 ... FPGA_CFG1: + case FPGA_CFG2 ... FPGA_CFG3: + case AUDIO_TOP_DBG_MON0 ... AUDIO_TOP_DBG_MON1: + case AFE_IRQ8_MCU_CNT_MON ... AFE_IRQ12_MCU_CNT_MON: case AFE_CBIP_MON0: - case AFE_CBIP_SLV_MUX_MON0: - case AFE_CBIP_SLV_DECODER_MON0: + case AFE_CBIP_SLV_MUX_MON0 ... AFE_CBIP_SLV_DECODER_MON0: case AFE_ADDA6_SRC_DEBUG_MON0: - case AFE_ADD6A_UL_SRC_MON0: - case AFE_ADDA6_UL_SRC_MON1: + case AFE_ADD6A_UL_SRC_MON0... AFE_ADDA6_UL_SRC_MON1: case AFE_DL1_CUR_MSB: case AFE_DL2_CUR_MSB: case AFE_AWB_CUR_MSB: @@ -611,55 +571,23 @@ static bool mt8183_is_volatile_reg(struct device *dev= , unsigned int reg) case AFE_VUL_D2_CUR_MSB: case AFE_DL3_CUR_MSB: case AFE_HDMI_OUT_CUR_MSB: - case AFE_AWB2_END: - case AFE_AWB2_CUR: + case AFE_AWB2_END ... AFE_AWB2_CUR: case AFE_AWB2_CUR_MSB: - case AFE_ADDA_DL_SDM_FIFO_MON: - case AFE_ADDA_DL_SRC_LCH_MON: - case AFE_ADDA_DL_SRC_RCH_MON: - case AFE_ADDA_DL_SDM_OUT_MON: - case AFE_CONNSYS_I2S_MON: - case AFE_ASRC_2CH_CON0: - case AFE_ASRC_2CH_CON2: - case AFE_ASRC_2CH_CON3: - case AFE_ASRC_2CH_CON4: - case AFE_ASRC_2CH_CON5: - case AFE_ASRC_2CH_CON7: - case AFE_ASRC_2CH_CON8: - case AFE_MEMIF_MON12: - case AFE_MEMIF_MON13: - case AFE_MEMIF_MON14: - case AFE_MEMIF_MON15: - case AFE_MEMIF_MON16: - case AFE_MEMIF_MON17: - case AFE_MEMIF_MON18: - case AFE_MEMIF_MON19: - case AFE_MEMIF_MON20: - case AFE_MEMIF_MON21: - case AFE_MEMIF_MON22: - case AFE_MEMIF_MON23: - case AFE_MEMIF_MON24: - case AFE_ADDA_MTKAIF_MON0: - case AFE_ADDA_MTKAIF_MON1: + case AFE_ADDA_DL_SDM_FIFO_MON ... AFE_ADDA_DL_SDM_OUT_MON: + case AFE_CONNSYS_I2S_MON ... AFE_ASRC_2CH_CON0: + case AFE_ASRC_2CH_CON2 ... AFE_ASRC_2CH_CON5: + case AFE_ASRC_2CH_CON7 ... AFE_ASRC_2CH_CON8: + case AFE_MEMIF_MON12 ... AFE_MEMIF_MON24: + case AFE_ADDA_MTKAIF_MON0 ... AFE_ADDA_MTKAIF_MON1: case AFE_AUD_PAD_TOP: case AFE_GENERAL1_ASRC_2CH_CON0: - case AFE_GENERAL1_ASRC_2CH_CON2: - case AFE_GENERAL1_ASRC_2CH_CON3: - case AFE_GENERAL1_ASRC_2CH_CON4: - case AFE_GENERAL1_ASRC_2CH_CON5: - case AFE_GENERAL1_ASRC_2CH_CON7: - case AFE_GENERAL1_ASRC_2CH_CON8: - case AFE_GENERAL1_ASRC_2CH_CON12: - case AFE_GENERAL1_ASRC_2CH_CON13: + case AFE_GENERAL1_ASRC_2CH_CON2 ... AFE_GENERAL1_ASRC_2CH_CON5: + case AFE_GENERAL1_ASRC_2CH_CON7 ... AFE_GENERAL1_ASRC_2CH_CON8: + case AFE_GENERAL1_ASRC_2CH_CON12 ... AFE_GENERAL1_ASRC_2CH_CON13: case AFE_GENERAL2_ASRC_2CH_CON0: - case AFE_GENERAL2_ASRC_2CH_CON2: - case AFE_GENERAL2_ASRC_2CH_CON3: - case AFE_GENERAL2_ASRC_2CH_CON4: - case AFE_GENERAL2_ASRC_2CH_CON5: - case AFE_GENERAL2_ASRC_2CH_CON7: - case AFE_GENERAL2_ASRC_2CH_CON8: - case AFE_GENERAL2_ASRC_2CH_CON12: - case AFE_GENERAL2_ASRC_2CH_CON13: + case AFE_GENERAL2_ASRC_2CH_CON2 ... AFE_GENERAL2_ASRC_2CH_CON5: + case AFE_GENERAL2_ASRC_2CH_CON7 ... AFE_GENERAL2_ASRC_2CH_CON8: + case AFE_GENERAL2_ASRC_2CH_CON12 ... AFE_GENERAL2_ASRC_2CH_CON13: return true; default: return false; --=20 2.49.0.1045.g170613ef41-goog