All of lore.kernel.org
 help / color / mirror / Atom feed
From: Krzysztof Kozlowski <k.kozlowski@samsung.com>
To: Sangbeom Kim <sbkim73@samsung.com>,
	Samuel Ortiz <sameo@linux.intel.com>,
	Lee Jones <lee.jones@linaro.org>,
	linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org
Cc: Kyungmin Park <kyungmin.park@samsung.com>,
	Marek Szyprowski <m.szyprowski@samsung.com>,
	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
	Krzysztof Kozlowski <k.kozlowski@samsung.com>
Subject: [PATCH 05/14] mfd: sec: Use consistent S2MPS11 RTC alarm interrupt indexes
Date: Tue, 11 Feb 2014 14:03:48 +0100	[thread overview]
Message-ID: <1392123837-5517-6-git-send-email-k.kozlowski@samsung.com> (raw)
In-Reply-To: <1392123837-5517-1-git-send-email-k.kozlowski@samsung.com>

The S2MPS11 RTC has two alarms: alarm0 and alarm1 (corresponding
interrupts are named similarly). Use consistent names for interrupts to
limit possible errors.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
---
 drivers/mfd/sec-irq.c           |    8 ++++----
 include/linux/mfd/samsung/irq.h |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/mfd/sec-irq.c b/drivers/mfd/sec-irq.c
index 4de494f51d40..e403c293b437 100644
--- a/drivers/mfd/sec-irq.c
+++ b/drivers/mfd/sec-irq.c
@@ -59,13 +59,13 @@ static const struct regmap_irq s2mps11_irqs[] = {
 		.reg_offset = 1,
 		.mask = S2MPS11_IRQ_RTC60S_MASK,
 	},
-	[S2MPS11_IRQ_RTCA1] = {
+	[S2MPS11_IRQ_RTCA0] = {
 		.reg_offset = 1,
-		.mask = S2MPS11_IRQ_RTCA1_MASK,
+		.mask = S2MPS11_IRQ_RTCA0_MASK,
 	},
-	[S2MPS11_IRQ_RTCA2] = {
+	[S2MPS11_IRQ_RTCA1] = {
 		.reg_offset = 1,
-		.mask = S2MPS11_IRQ_RTCA2_MASK,
+		.mask = S2MPS11_IRQ_RTCA1_MASK,
 	},
 	[S2MPS11_IRQ_SMPL] = {
 		.reg_offset = 1,
diff --git a/include/linux/mfd/samsung/irq.h b/include/linux/mfd/samsung/irq.h
index d43b4f9e7fb2..abe1a6aae3b7 100644
--- a/include/linux/mfd/samsung/irq.h
+++ b/include/linux/mfd/samsung/irq.h
@@ -24,8 +24,8 @@ enum s2mps11_irq {
 	S2MPS11_IRQ_MRB,
 
 	S2MPS11_IRQ_RTC60S,
+	S2MPS11_IRQ_RTCA0,
 	S2MPS11_IRQ_RTCA1,
-	S2MPS11_IRQ_RTCA2,
 	S2MPS11_IRQ_SMPL,
 	S2MPS11_IRQ_RTC1S,
 	S2MPS11_IRQ_WTSR,
@@ -47,7 +47,7 @@ enum s2mps11_irq {
 
 #define S2MPS11_IRQ_RTC60S_MASK		(1 << 0)
 #define S2MPS11_IRQ_RTCA1_MASK		(1 << 1)
-#define S2MPS11_IRQ_RTCA2_MASK		(1 << 2)
+#define S2MPS11_IRQ_RTCA0_MASK		(1 << 2)
 #define S2MPS11_IRQ_SMPL_MASK		(1 << 3)
 #define S2MPS11_IRQ_RTC1S_MASK		(1 << 4)
 #define S2MPS11_IRQ_WTSR_MASK		(1 << 5)
-- 
1.7.9.5


  parent reply	other threads:[~2014-02-11 13:08 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-11 13:03 [PATCH 00/14] mfd/regulator/rtc: sec: Add support for S2MPS14 Krzysztof Kozlowski
2014-02-11 13:03 ` [PATCH 01/14] mfd: sec: Add maximum RTC register for regmap config Krzysztof Kozlowski
2014-02-12  8:48   ` Lee Jones
2014-02-12  8:58     ` Krzysztof Kozlowski
2014-02-11 13:03 ` [PATCH 02/14] mfd: sec: Select different RTC regmaps for devices Krzysztof Kozlowski
2014-02-12  8:59   ` Lee Jones
2014-02-11 13:03 ` [PATCH 03/14] mfd/rtc: sec/sec: Rename SEC* symbols to S5M Krzysztof Kozlowski
2014-02-12  9:04   ` Lee Jones
2014-02-11 13:03 ` [PATCH 04/14] rtc: s5m: Remove undocumented time init on first boot Krzysztof Kozlowski
2014-02-11 13:03 ` Krzysztof Kozlowski [this message]
2014-02-12  9:07   ` [PATCH 05/14] mfd: sec: Use consistent S2MPS11 RTC alarm interrupt indexes Lee Jones
2014-02-12  9:31     ` Krzysztof Kozlowski
2014-02-12 10:02       ` Lee Jones
2014-02-12 12:06         ` Krzysztof Kozlowski
2014-02-12 15:48           ` Lee Jones
2014-02-11 13:03 ` [PATCH 06/14] regulator: s2mps11: Constify regulator_desc array Krzysztof Kozlowski
2014-02-11 13:03 ` [PATCH 07/14] regulator: s2mps11: Choose number of supported regulators during probe Krzysztof Kozlowski
2014-02-12 10:01   ` Yadwinder Singh Brar
2014-02-12 15:00     ` Krzysztof Kozlowski
2014-02-11 13:03 ` [PATCH 08/14] mfd: sec: Add support for S2MPS14 Krzysztof Kozlowski
2014-02-12  9:17   ` Lee Jones
2014-02-12 10:03     ` Krzysztof Kozlowski
2014-02-12 15:46       ` Lee Jones
2014-02-11 13:03 ` [PATCH 09/14] regulator: s2mps11: Add support for S2MPS14 regulators Krzysztof Kozlowski
2014-02-11 13:03 ` [PATCH 10/14] Documentation: mfd: s2mps11: Document support for S2MPS14 Krzysztof Kozlowski
2014-02-11 13:03 ` [PATCH 11/14] regulator: s2mps11: Add opmode for S2MPS14 regulators Krzysztof Kozlowski
2014-02-12  9:21   ` Lee Jones
2014-02-12 10:05     ` Krzysztof Kozlowski
2014-02-11 13:03 ` [PATCH 12/14] Documentation: mfd/regulator: s2mps11: Document the "op_mode" bindings Krzysztof Kozlowski
2014-02-11 13:03 ` [PATCH 13/14] rtc: s5m: Support different register layout Krzysztof Kozlowski
2014-02-11 13:03 ` [PATCH 14/14] rtc: s5m: Add support for S2MPS14 RTC Krzysztof Kozlowski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1392123837-5517-6-git-send-email-k.kozlowski@samsung.com \
    --to=k.kozlowski@samsung.com \
    --cc=b.zolnierkie@samsung.com \
    --cc=kyungmin.park@samsung.com \
    --cc=lee.jones@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-samsung-soc@vger.kernel.org \
    --cc=m.szyprowski@samsung.com \
    --cc=sameo@linux.intel.com \
    --cc=sbkim73@samsung.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.