From nobody Tue May 6 07:01:59 2025
Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com
[209.85.208.51])
(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 957C424BBE4
for <linux-kernel@vger.kernel.org>; Thu, 3 Apr 2025 08:59:16 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
arc=none smtp.client-ip=209.85.208.51
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
t=1743670763; cv=none;
b=e+8uKV8dVTdCvlCTCD4l3yIQkmKb1cDCe9o85gm2Sd6RhYF7+bj6HgNEh9TA3TxVuNno72lPCCsxGIus6FK2vdV3FNAwdYH6vCis9VcTBcaW3ab2ArUJE+TKQR6UNzTXYFRnqWZE3+qR/ZJGE8ySfcfE7vKjtkqIuVSRUbBZjvM=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1743670763; c=relaxed/simple;
bh=MZ30T8KMJXBJoDDM3cr1kCmHXcpVB3LCx1uy4q775s8=;
h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References:
In-Reply-To:To:Cc;
b=ZTQDvQWzcXUBhKXUeMrpQOosKJ4plGUAeq0sNEjexuu+yLXNT522Nc9xRkHpcOXLFWIik3jP6EnKAAumFj4yANGXYasLzzXfYAB3lE9JXXoaoAXIv9DGpMrKXBl2NpS3BBlOw+qvaVSoYxMqDTveQHSqeGO2dSKNv44inc9CQxk=
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
dmarc=pass (p=none dis=none) header.from=linaro.org;
spf=pass smtp.mailfrom=linaro.org;
dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org
header.b=nCuKztsJ; arc=none smtp.client-ip=209.85.208.51
Authentication-Results: smtp.subspace.kernel.org;
dmarc=pass (p=none dis=none) header.from=linaro.org
Authentication-Results: smtp.subspace.kernel.org;
spf=pass smtp.mailfrom=linaro.org
Authentication-Results: smtp.subspace.kernel.org;
dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org
header.b="nCuKztsJ"
Received: by mail-ed1-f51.google.com with SMTP id
4fb4d7f45d1cf-5efe8d9ebdfso1352143a12.3
for <linux-kernel@vger.kernel.org>;
Thu, 03 Apr 2025 01:59:16 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1743670754; x=1744275554;
darn=vger.kernel.org;
h=cc:to:in-reply-to:references:message-id:content-transfer-encoding
:mime-version:subject:date:from:from:to:cc:subject:date:message-id
:reply-to;
bh=Op+5mEOgNYYFAMowJxBfybjaNESu4Eako9395vK9N0c=;
b=nCuKztsJOwVZ+l74OPqvInr+LbkOUaG+Mc4RjAlpXfS5WWYnf+BuuScaeLHNDUSoC+
ibAP8ek9/oeauOAuXstLsQeveROR5n7JQ9vBmCGo7GuQxi96/aP1wqA3wPifbgIbJ9hQ
qrKYL13b1wyjsr/b6n6jVAGV7JQCWXMJKxJwE2o1TY3DqeshHIiA4wYJO5SAEUSdpxBm
synGqyDxM0vEqLi0M4e86vXERFQe3OB3/w+u+/pUeOz0k/9ZRkR6tKgJwjiHOLFhWu/v
QFY3RRcIcA4vIBk5VVfmzcOoSZBymQ+UIijb4iTOtMF9uohzU79iDxHK+CwPGd4CkrhS
7Olw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1743670754; x=1744275554;
h=cc:to:in-reply-to:references:message-id:content-transfer-encoding
:mime-version:subject:date:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=Op+5mEOgNYYFAMowJxBfybjaNESu4Eako9395vK9N0c=;
b=A2JV2Lnx23JnSbG8kpo330L8/Nqy9J77tvorwBrARghxUlArlDvpRs3giV2L4WjGpF
9kOvfbWTxq5vEF1roruy9GtVvdl3XQ/I/MHDXsVHXhyOhUl7FRyyIw0fOynuMsUDtDwb
hYTWqp5QCtTDJ12WeoApJ4gESJMgjETU3FA+L623ZVqyvtaWwMmFvHtws3Gbc3w3uXNi
tASDvUDhOc8FFBjuWTKROlqKpcNsz1HGmpTXGb2A2lSKwj1IpC47IAJdhWOodkmQ9FY1
+N64dvO1s8TXdXS3Z8O6LVCUOnH83F3LtFVcgqoMFOd2ytyB5PgmMz2zWBW8dfp61P+T
ZKEQ==
X-Forwarded-Encrypted: i=1;
AJvYcCUv3qlkLhMfYP+fyiQ+qvAXW7nIjE3jL7Min2a9JYhwyMVqyWowTT/g2Ge40d4M3NJ6YPj5kcLwNCas2Is=@vger.kernel.org
X-Gm-Message-State: AOJu0Yy10goFNo/Y5JTzztfTUfutyQzjYSJzbSd1d6zl7XlcE0sZulvg
/FGlVA90/YLTpcXCqau9hqqSKGPdvQqfVMkrvKH2frtDyKKBvbbZN8Y9bhAi0M0=
X-Gm-Gg: ASbGncuaMNvFK+Mrbh4c/6zT6o+OZa829RTbe9v6G0BqZhEZ7Cpyx8azDz5axGSasC1
5Azl0evKo20eC4jD3pF2g3IDXb2Tn34NrAK0xhHxasAICkhG1p2GcrBnhNiuDI0fMUr5V1S9W4K
U+CHwAFDKwSmEHylnXMGl8eIQvRK1Ou16AnXceLdzEQOUQS2QLwzkNQ4pAEJS3NCx06t2AUuF9L
uzM9YQ53zB4aTrB6/vIaOAFPVEFjR4HDzALGGO/DsFBOAcdIc+tsYqIVVZNw8dAQQvr02CJl15w
2SkmFfWJ5vPBupdDMJBhtkjhbFCZq3p/T6H09oIVAXrTe4CXoAaOKz4QeeZxE7Y/yGzTfCnSCOt
3IaYceLOooD2p7C9A57OsSs5Z8pf0
X-Google-Smtp-Source:
AGHT+IHje6/Aj3m3WFy82BhNMOZ83g9HkkSQjWHGqlCFxMgpj6dst82siBK7kkVhW9a2sxdihxbs6A==
X-Received: by 2002:a05:6402:4307:b0:5e7:b02b:6430 with SMTP id
4fb4d7f45d1cf-5f087224bedmr1275094a12.23.1743670753725;
Thu, 03 Apr 2025 01:59:13 -0700 (PDT)
Received: from puffmais.c.googlers.com (8.239.204.35.bc.googleusercontent.com.
[35.204.239.8])
by smtp.gmail.com with ESMTPSA id
4fb4d7f45d1cf-5f0880a535fsm637614a12.80.2025.04.03.01.59.13
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 03 Apr 2025 01:59:13 -0700 (PDT)
From: =?utf-8?q?Andr=C3=A9_Draszik?= <andre.draszik@linaro.org>
Date: Thu, 03 Apr 2025 09:59:14 +0100
Subject: [PATCH v3 22/32] mfd: sec: convert to using REGMAP_IRQ_REG()
macros
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Message-Id: <20250403-s2mpg10-v3-22-b542b3505e68@linaro.org>
References: <20250403-s2mpg10-v3-0-b542b3505e68@linaro.org>
In-Reply-To: <20250403-s2mpg10-v3-0-b542b3505e68@linaro.org>
To: Krzysztof Kozlowski <krzk@kernel.org>, Lee Jones <lee@kernel.org>,
Rob Herring <robh@kernel.org>, Conor Dooley <conor+dt@kernel.org>,
Sylwester Nawrocki <s.nawrocki@samsung.com>,
Chanwoo Choi <cw00.choi@samsung.com>, Alim Akhtar <alim.akhtar@samsung.com>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>, Russell King <linux@armlinux.org.uk>,
Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>,
Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: Peter Griffin <peter.griffin@linaro.org>,
Tudor Ambarus <tudor.ambarus@linaro.org>,
Will McVicker <willmcvicker@google.com>, kernel-team@android.com,
linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org,
devicetree@vger.kernel.org, linux-clk@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-rtc@vger.kernel.org,
=?utf-8?q?Andr=C3=A9_Draszik?= <andre.draszik@linaro.org>
X-Mailer: b4 0.14.2
Use REGMAP_IRQ_REG macro helpers instead of open coding. This makes the
code a bit shorter and more obvious.
Signed-off-by: Andr=C3=A9 Draszik <andre.draszik@linaro.org>
---
drivers/mfd/sec-irq.c | 343 +++++++++++-----------------------------------=
----
1 file changed, 75 insertions(+), 268 deletions(-)
diff --git a/drivers/mfd/sec-irq.c b/drivers/mfd/sec-irq.c
index 5cd9667a21e9e8b052b2ef0b5d2991369bffe8bb..a2c821704b771a9f8a10c7efc90=
0812684771862 100644
--- a/drivers/mfd/sec-irq.c
+++ b/drivers/mfd/sec-irq.c
@@ -74,212 +74,68 @@ static const struct regmap_irq s2mpg10_irqs[] =3D {
};
=20
static const struct regmap_irq s2mps11_irqs[] =3D {
- [S2MPS11_IRQ_PWRONF] =3D {
- .reg_offset =3D 0,
- .mask =3D S2MPS11_IRQ_PWRONF_MASK,
- },
- [S2MPS11_IRQ_PWRONR] =3D {
- .reg_offset =3D 0,
- .mask =3D S2MPS11_IRQ_PWRONR_MASK,
- },
- [S2MPS11_IRQ_JIGONBF] =3D {
- .reg_offset =3D 0,
- .mask =3D S2MPS11_IRQ_JIGONBF_MASK,
- },
- [S2MPS11_IRQ_JIGONBR] =3D {
- .reg_offset =3D 0,
- .mask =3D S2MPS11_IRQ_JIGONBR_MASK,
- },
- [S2MPS11_IRQ_ACOKBF] =3D {
- .reg_offset =3D 0,
- .mask =3D S2MPS11_IRQ_ACOKBF_MASK,
- },
- [S2MPS11_IRQ_ACOKBR] =3D {
- .reg_offset =3D 0,
- .mask =3D S2MPS11_IRQ_ACOKBR_MASK,
- },
- [S2MPS11_IRQ_PWRON1S] =3D {
- .reg_offset =3D 0,
- .mask =3D S2MPS11_IRQ_PWRON1S_MASK,
- },
- [S2MPS11_IRQ_MRB] =3D {
- .reg_offset =3D 0,
- .mask =3D S2MPS11_IRQ_MRB_MASK,
- },
- [S2MPS11_IRQ_RTC60S] =3D {
- .reg_offset =3D 1,
- .mask =3D S2MPS11_IRQ_RTC60S_MASK,
- },
- [S2MPS11_IRQ_RTCA1] =3D {
- .reg_offset =3D 1,
- .mask =3D S2MPS11_IRQ_RTCA1_MASK,
- },
- [S2MPS11_IRQ_RTCA0] =3D {
- .reg_offset =3D 1,
- .mask =3D S2MPS11_IRQ_RTCA0_MASK,
- },
- [S2MPS11_IRQ_SMPL] =3D {
- .reg_offset =3D 1,
- .mask =3D S2MPS11_IRQ_SMPL_MASK,
- },
- [S2MPS11_IRQ_RTC1S] =3D {
- .reg_offset =3D 1,
- .mask =3D S2MPS11_IRQ_RTC1S_MASK,
- },
- [S2MPS11_IRQ_WTSR] =3D {
- .reg_offset =3D 1,
- .mask =3D S2MPS11_IRQ_WTSR_MASK,
- },
- [S2MPS11_IRQ_INT120C] =3D {
- .reg_offset =3D 2,
- .mask =3D S2MPS11_IRQ_INT120C_MASK,
- },
- [S2MPS11_IRQ_INT140C] =3D {
- .reg_offset =3D 2,
- .mask =3D S2MPS11_IRQ_INT140C_MASK,
- },
+ REGMAP_IRQ_REG(S2MPS11_IRQ_PWRONF, 0, S2MPS11_IRQ_PWRONF_MASK),
+ REGMAP_IRQ_REG(S2MPS11_IRQ_PWRONR, 0, S2MPS11_IRQ_PWRONR_MASK),
+ REGMAP_IRQ_REG(S2MPS11_IRQ_JIGONBF, 0, S2MPS11_IRQ_JIGONBF_MASK),
+ REGMAP_IRQ_REG(S2MPS11_IRQ_JIGONBR, 0, S2MPS11_IRQ_JIGONBR_MASK),
+ REGMAP_IRQ_REG(S2MPS11_IRQ_ACOKBF, 0, S2MPS11_IRQ_ACOKBF_MASK),
+ REGMAP_IRQ_REG(S2MPS11_IRQ_ACOKBR, 0, S2MPS11_IRQ_ACOKBR_MASK),
+ REGMAP_IRQ_REG(S2MPS11_IRQ_PWRON1S, 0, S2MPS11_IRQ_PWRON1S_MASK),
+ REGMAP_IRQ_REG(S2MPS11_IRQ_MRB, 0, S2MPS11_IRQ_MRB_MASK),
+
+ REGMAP_IRQ_REG(S2MPS11_IRQ_RTC60S, 1, S2MPS11_IRQ_RTC60S_MASK),
+ REGMAP_IRQ_REG(S2MPS11_IRQ_RTCA1, 1, S2MPS11_IRQ_RTCA1_MASK),
+ REGMAP_IRQ_REG(S2MPS11_IRQ_RTCA0, 1, S2MPS11_IRQ_RTCA0_MASK),
+ REGMAP_IRQ_REG(S2MPS11_IRQ_SMPL, 1, S2MPS11_IRQ_SMPL_MASK),
+ REGMAP_IRQ_REG(S2MPS11_IRQ_RTC1S, 1, S2MPS11_IRQ_RTC1S_MASK),
+ REGMAP_IRQ_REG(S2MPS11_IRQ_WTSR, 1, S2MPS11_IRQ_WTSR_MASK),
+
+ REGMAP_IRQ_REG(S2MPS11_IRQ_INT120C, 2, S2MPS11_IRQ_INT120C_MASK),
+ REGMAP_IRQ_REG(S2MPS11_IRQ_INT140C, 2, S2MPS11_IRQ_INT140C_MASK),
};
=20
static const struct regmap_irq s2mps14_irqs[] =3D {
- [S2MPS14_IRQ_PWRONF] =3D {
- .reg_offset =3D 0,
- .mask =3D S2MPS11_IRQ_PWRONF_MASK,
- },
- [S2MPS14_IRQ_PWRONR] =3D {
- .reg_offset =3D 0,
- .mask =3D S2MPS11_IRQ_PWRONR_MASK,
- },
- [S2MPS14_IRQ_JIGONBF] =3D {
- .reg_offset =3D 0,
- .mask =3D S2MPS11_IRQ_JIGONBF_MASK,
- },
- [S2MPS14_IRQ_JIGONBR] =3D {
- .reg_offset =3D 0,
- .mask =3D S2MPS11_IRQ_JIGONBR_MASK,
- },
- [S2MPS14_IRQ_ACOKBF] =3D {
- .reg_offset =3D 0,
- .mask =3D S2MPS11_IRQ_ACOKBF_MASK,
- },
- [S2MPS14_IRQ_ACOKBR] =3D {
- .reg_offset =3D 0,
- .mask =3D S2MPS11_IRQ_ACOKBR_MASK,
- },
- [S2MPS14_IRQ_PWRON1S] =3D {
- .reg_offset =3D 0,
- .mask =3D S2MPS11_IRQ_PWRON1S_MASK,
- },
- [S2MPS14_IRQ_MRB] =3D {
- .reg_offset =3D 0,
- .mask =3D S2MPS11_IRQ_MRB_MASK,
- },
- [S2MPS14_IRQ_RTC60S] =3D {
- .reg_offset =3D 1,
- .mask =3D S2MPS11_IRQ_RTC60S_MASK,
- },
- [S2MPS14_IRQ_RTCA1] =3D {
- .reg_offset =3D 1,
- .mask =3D S2MPS11_IRQ_RTCA1_MASK,
- },
- [S2MPS14_IRQ_RTCA0] =3D {
- .reg_offset =3D 1,
- .mask =3D S2MPS11_IRQ_RTCA0_MASK,
- },
- [S2MPS14_IRQ_SMPL] =3D {
- .reg_offset =3D 1,
- .mask =3D S2MPS11_IRQ_SMPL_MASK,
- },
- [S2MPS14_IRQ_RTC1S] =3D {
- .reg_offset =3D 1,
- .mask =3D S2MPS11_IRQ_RTC1S_MASK,
- },
- [S2MPS14_IRQ_WTSR] =3D {
- .reg_offset =3D 1,
- .mask =3D S2MPS11_IRQ_WTSR_MASK,
- },
- [S2MPS14_IRQ_INT120C] =3D {
- .reg_offset =3D 2,
- .mask =3D S2MPS11_IRQ_INT120C_MASK,
- },
- [S2MPS14_IRQ_INT140C] =3D {
- .reg_offset =3D 2,
- .mask =3D S2MPS11_IRQ_INT140C_MASK,
- },
- [S2MPS14_IRQ_TSD] =3D {
- .reg_offset =3D 2,
- .mask =3D S2MPS14_IRQ_TSD_MASK,
- },
+ REGMAP_IRQ_REG(S2MPS14_IRQ_PWRONF, 0, S2MPS11_IRQ_PWRONF_MASK),
+ REGMAP_IRQ_REG(S2MPS14_IRQ_PWRONR, 0, S2MPS11_IRQ_PWRONR_MASK),
+ REGMAP_IRQ_REG(S2MPS14_IRQ_JIGONBF, 0, S2MPS11_IRQ_JIGONBF_MASK),
+ REGMAP_IRQ_REG(S2MPS14_IRQ_JIGONBR, 0, S2MPS11_IRQ_JIGONBR_MASK),
+ REGMAP_IRQ_REG(S2MPS14_IRQ_ACOKBF, 0, S2MPS11_IRQ_ACOKBF_MASK),
+ REGMAP_IRQ_REG(S2MPS14_IRQ_ACOKBR, 0, S2MPS11_IRQ_ACOKBR_MASK),
+ REGMAP_IRQ_REG(S2MPS14_IRQ_PWRON1S, 0, S2MPS11_IRQ_PWRON1S_MASK),
+ REGMAP_IRQ_REG(S2MPS14_IRQ_MRB, 0, S2MPS11_IRQ_MRB_MASK),
+
+ REGMAP_IRQ_REG(S2MPS14_IRQ_RTC60S, 1, S2MPS11_IRQ_RTC60S_MASK),
+ REGMAP_IRQ_REG(S2MPS14_IRQ_RTCA1, 1, S2MPS11_IRQ_RTCA1_MASK),
+ REGMAP_IRQ_REG(S2MPS14_IRQ_RTCA0, 1, S2MPS11_IRQ_RTCA0_MASK),
+ REGMAP_IRQ_REG(S2MPS14_IRQ_SMPL, 1, S2MPS11_IRQ_SMPL_MASK),
+ REGMAP_IRQ_REG(S2MPS14_IRQ_RTC1S, 1, S2MPS11_IRQ_RTC1S_MASK),
+ REGMAP_IRQ_REG(S2MPS14_IRQ_WTSR, 1, S2MPS11_IRQ_WTSR_MASK),
+
+ REGMAP_IRQ_REG(S2MPS14_IRQ_INT120C, 2, S2MPS11_IRQ_INT120C_MASK),
+ REGMAP_IRQ_REG(S2MPS14_IRQ_INT140C, 2, S2MPS11_IRQ_INT140C_MASK),
+ REGMAP_IRQ_REG(S2MPS14_IRQ_TSD, 2, S2MPS14_IRQ_TSD_MASK),
};
=20
static const struct regmap_irq s2mpu02_irqs[] =3D {
- [S2MPU02_IRQ_PWRONF] =3D {
- .reg_offset =3D 0,
- .mask =3D S2MPS11_IRQ_PWRONF_MASK,
- },
- [S2MPU02_IRQ_PWRONR] =3D {
- .reg_offset =3D 0,
- .mask =3D S2MPS11_IRQ_PWRONR_MASK,
- },
- [S2MPU02_IRQ_JIGONBF] =3D {
- .reg_offset =3D 0,
- .mask =3D S2MPS11_IRQ_JIGONBF_MASK,
- },
- [S2MPU02_IRQ_JIGONBR] =3D {
- .reg_offset =3D 0,
- .mask =3D S2MPS11_IRQ_JIGONBR_MASK,
- },
- [S2MPU02_IRQ_ACOKBF] =3D {
- .reg_offset =3D 0,
- .mask =3D S2MPS11_IRQ_ACOKBF_MASK,
- },
- [S2MPU02_IRQ_ACOKBR] =3D {
- .reg_offset =3D 0,
- .mask =3D S2MPS11_IRQ_ACOKBR_MASK,
- },
- [S2MPU02_IRQ_PWRON1S] =3D {
- .reg_offset =3D 0,
- .mask =3D S2MPS11_IRQ_PWRON1S_MASK,
- },
- [S2MPU02_IRQ_MRB] =3D {
- .reg_offset =3D 0,
- .mask =3D S2MPS11_IRQ_MRB_MASK,
- },
- [S2MPU02_IRQ_RTC60S] =3D {
- .reg_offset =3D 1,
- .mask =3D S2MPS11_IRQ_RTC60S_MASK,
- },
- [S2MPU02_IRQ_RTCA1] =3D {
- .reg_offset =3D 1,
- .mask =3D S2MPS11_IRQ_RTCA1_MASK,
- },
- [S2MPU02_IRQ_RTCA0] =3D {
- .reg_offset =3D 1,
- .mask =3D S2MPS11_IRQ_RTCA0_MASK,
- },
- [S2MPU02_IRQ_SMPL] =3D {
- .reg_offset =3D 1,
- .mask =3D S2MPS11_IRQ_SMPL_MASK,
- },
- [S2MPU02_IRQ_RTC1S] =3D {
- .reg_offset =3D 1,
- .mask =3D S2MPS11_IRQ_RTC1S_MASK,
- },
- [S2MPU02_IRQ_WTSR] =3D {
- .reg_offset =3D 1,
- .mask =3D S2MPS11_IRQ_WTSR_MASK,
- },
- [S2MPU02_IRQ_INT120C] =3D {
- .reg_offset =3D 2,
- .mask =3D S2MPS11_IRQ_INT120C_MASK,
- },
- [S2MPU02_IRQ_INT140C] =3D {
- .reg_offset =3D 2,
- .mask =3D S2MPS11_IRQ_INT140C_MASK,
- },
- [S2MPU02_IRQ_TSD] =3D {
- .reg_offset =3D 2,
- .mask =3D S2MPS14_IRQ_TSD_MASK,
- },
+ REGMAP_IRQ_REG(S2MPU02_IRQ_PWRONF, 0, S2MPS11_IRQ_PWRONF_MASK),
+ REGMAP_IRQ_REG(S2MPU02_IRQ_PWRONR, 0, S2MPS11_IRQ_PWRONR_MASK),
+ REGMAP_IRQ_REG(S2MPU02_IRQ_JIGONBF, 0, S2MPS11_IRQ_JIGONBF_MASK),
+ REGMAP_IRQ_REG(S2MPU02_IRQ_JIGONBR, 0, S2MPS11_IRQ_JIGONBR_MASK),
+ REGMAP_IRQ_REG(S2MPU02_IRQ_ACOKBF, 0, S2MPS11_IRQ_ACOKBF_MASK),
+ REGMAP_IRQ_REG(S2MPU02_IRQ_ACOKBR, 0, S2MPS11_IRQ_ACOKBR_MASK),
+ REGMAP_IRQ_REG(S2MPU02_IRQ_PWRON1S, 0, S2MPS11_IRQ_PWRON1S_MASK),
+ REGMAP_IRQ_REG(S2MPU02_IRQ_MRB, 0, S2MPS11_IRQ_MRB_MASK),
+
+ REGMAP_IRQ_REG(S2MPU02_IRQ_RTC60S, 1, S2MPS11_IRQ_RTC60S_MASK),
+ REGMAP_IRQ_REG(S2MPU02_IRQ_RTCA1, 1, S2MPS11_IRQ_RTCA1_MASK),
+ REGMAP_IRQ_REG(S2MPU02_IRQ_RTCA0, 1, S2MPS11_IRQ_RTCA0_MASK),
+ REGMAP_IRQ_REG(S2MPU02_IRQ_SMPL, 1, S2MPS11_IRQ_SMPL_MASK),
+ REGMAP_IRQ_REG(S2MPU02_IRQ_RTC1S, 1, S2MPS11_IRQ_RTC1S_MASK),
+ REGMAP_IRQ_REG(S2MPU02_IRQ_WTSR, 1, S2MPS11_IRQ_WTSR_MASK),
+
+ REGMAP_IRQ_REG(S2MPU02_IRQ_INT120C, 2, S2MPS11_IRQ_INT120C_MASK),
+ REGMAP_IRQ_REG(S2MPU02_IRQ_INT140C, 2, S2MPS11_IRQ_INT140C_MASK),
+ REGMAP_IRQ_REG(S2MPU02_IRQ_TSD, 2, S2MPS14_IRQ_TSD_MASK),
};
=20
static const struct regmap_irq s2mpu05_irqs[] =3D {
@@ -303,74 +159,25 @@ static const struct regmap_irq s2mpu05_irqs[] =3D {
};
=20
static const struct regmap_irq s5m8767_irqs[] =3D {
- [S5M8767_IRQ_PWRR] =3D {
- .reg_offset =3D 0,
- .mask =3D S5M8767_IRQ_PWRR_MASK,
- },
- [S5M8767_IRQ_PWRF] =3D {
- .reg_offset =3D 0,
- .mask =3D S5M8767_IRQ_PWRF_MASK,
- },
- [S5M8767_IRQ_PWR1S] =3D {
- .reg_offset =3D 0,
- .mask =3D S5M8767_IRQ_PWR1S_MASK,
- },
- [S5M8767_IRQ_JIGR] =3D {
- .reg_offset =3D 0,
- .mask =3D S5M8767_IRQ_JIGR_MASK,
- },
- [S5M8767_IRQ_JIGF] =3D {
- .reg_offset =3D 0,
- .mask =3D S5M8767_IRQ_JIGF_MASK,
- },
- [S5M8767_IRQ_LOWBAT2] =3D {
- .reg_offset =3D 0,
- .mask =3D S5M8767_IRQ_LOWBAT2_MASK,
- },
- [S5M8767_IRQ_LOWBAT1] =3D {
- .reg_offset =3D 0,
- .mask =3D S5M8767_IRQ_LOWBAT1_MASK,
- },
- [S5M8767_IRQ_MRB] =3D {
- .reg_offset =3D 1,
- .mask =3D S5M8767_IRQ_MRB_MASK,
- },
- [S5M8767_IRQ_DVSOK2] =3D {
- .reg_offset =3D 1,
- .mask =3D S5M8767_IRQ_DVSOK2_MASK,
- },
- [S5M8767_IRQ_DVSOK3] =3D {
- .reg_offset =3D 1,
- .mask =3D S5M8767_IRQ_DVSOK3_MASK,
- },
- [S5M8767_IRQ_DVSOK4] =3D {
- .reg_offset =3D 1,
- .mask =3D S5M8767_IRQ_DVSOK4_MASK,
- },
- [S5M8767_IRQ_RTC60S] =3D {
- .reg_offset =3D 2,
- .mask =3D S5M8767_IRQ_RTC60S_MASK,
- },
- [S5M8767_IRQ_RTCA1] =3D {
- .reg_offset =3D 2,
- .mask =3D S5M8767_IRQ_RTCA1_MASK,
- },
- [S5M8767_IRQ_RTCA2] =3D {
- .reg_offset =3D 2,
- .mask =3D S5M8767_IRQ_RTCA2_MASK,
- },
- [S5M8767_IRQ_SMPL] =3D {
- .reg_offset =3D 2,
- .mask =3D S5M8767_IRQ_SMPL_MASK,
- },
- [S5M8767_IRQ_RTC1S] =3D {
- .reg_offset =3D 2,
- .mask =3D S5M8767_IRQ_RTC1S_MASK,
- },
- [S5M8767_IRQ_WTSR] =3D {
- .reg_offset =3D 2,
- .mask =3D S5M8767_IRQ_WTSR_MASK,
- },
+ REGMAP_IRQ_REG(S5M8767_IRQ_PWRR, 0, S5M8767_IRQ_PWRR_MASK),
+ REGMAP_IRQ_REG(S5M8767_IRQ_PWRF, 0, S5M8767_IRQ_PWRF_MASK),
+ REGMAP_IRQ_REG(S5M8767_IRQ_PWR1S, 0, S5M8767_IRQ_PWR1S_MASK),
+ REGMAP_IRQ_REG(S5M8767_IRQ_JIGR, 0, S5M8767_IRQ_JIGR_MASK),
+ REGMAP_IRQ_REG(S5M8767_IRQ_JIGF, 0, S5M8767_IRQ_JIGF_MASK),
+ REGMAP_IRQ_REG(S5M8767_IRQ_LOWBAT2, 0, S5M8767_IRQ_LOWBAT2_MASK),
+ REGMAP_IRQ_REG(S5M8767_IRQ_LOWBAT1, 0, S5M8767_IRQ_LOWBAT1_MASK),
+
+ REGMAP_IRQ_REG(S5M8767_IRQ_MRB, 1, S5M8767_IRQ_MRB_MASK),
+ REGMAP_IRQ_REG(S5M8767_IRQ_DVSOK2, 1, S5M8767_IRQ_DVSOK2_MASK),
+ REGMAP_IRQ_REG(S5M8767_IRQ_DVSOK3, 1, S5M8767_IRQ_DVSOK3_MASK),
+ REGMAP_IRQ_REG(S5M8767_IRQ_DVSOK4, 1, S5M8767_IRQ_DVSOK4_MASK),
+
+ REGMAP_IRQ_REG(S5M8767_IRQ_RTC60S, 2, S5M8767_IRQ_RTC60S_MASK),
+ REGMAP_IRQ_REG(S5M8767_IRQ_RTCA1, 2, S5M8767_IRQ_RTCA1_MASK),
+ REGMAP_IRQ_REG(S5M8767_IRQ_RTCA2, 2, S5M8767_IRQ_RTCA2_MASK),
+ REGMAP_IRQ_REG(S5M8767_IRQ_SMPL, 2, S5M8767_IRQ_SMPL_MASK),
+ REGMAP_IRQ_REG(S5M8767_IRQ_RTC1S, 2, S5M8767_IRQ_RTC1S_MASK),
+ REGMAP_IRQ_REG(S5M8767_IRQ_WTSR, 2, S5M8767_IRQ_WTSR_MASK),
};
=20
static const struct regmap_irq_chip s2mpg10_irq_chip =3D {
--=20
2.49.0.472.ge94155a9ec-goog