From: lee.jones@linaro.org (Lee Jones)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 5/6] ARM: ux500: Match-up compatible stings with associated MFD cell
Date: Mon, 6 Aug 2012 11:46:41 +0100 [thread overview]
Message-ID: <1344250002-6011-6-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1344250002-6011-1-git-send-email-lee.jones@linaro.org>
Until now, we've either taken the IRQs listed in the MFD cell defined
in the AB8500 driver, or the ones in Device Tree when we probed each
AB8500 MFD device independently. However, now we make a logical choice
based on whether we're running Device Tree or not. For this to happen
we need the compatible stings in the AB8500 MFD cell and the DT to
match-up. We do that here.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
arch/arm/boot/dts/dbx5x0.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi
index 83229f7..0282353 100644
--- a/arch/arm/boot/dts/dbx5x0.dtsi
+++ b/arch/arm/boot/dts/dbx5x0.dtsi
@@ -355,7 +355,7 @@
};
ab8500-ponkey {
- compatible = "stericsson,ab8500-ponkey";
+ compatible = "stericsson,ab8500-poweron-key";
interrupts = <6 0x4
7 0x4>;
interrupt-names = "ONKEY_DBF", "ONKEY_DBR";
--
1.7.9.5
next prev parent reply other threads:[~2012-08-06 10:46 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-06 10:46 [PATCH 0/6] Device Tree IRQ related enablement patches Lee Jones
2012-08-06 10:46 ` [PATCH 1/6] ARM: ux500: Identify the PRCMU as an interrupt controller Lee Jones
2012-08-06 10:46 ` [PATCH 2/6] mfd: Provide the PRCMU with its own IRQ domain Lee Jones
2012-08-06 11:50 ` Arnd Bergmann
2012-08-06 10:46 ` [PATCH 3/6] ARM: ux500: Force AB8500 to use the GIC as its interrupt controller Lee Jones
2012-08-06 10:46 ` [PATCH 4/6] mfd: Use interrupt-parent as IRQ controller if specified in DT Lee Jones
2012-08-06 15:54 ` Mark Brown
2012-08-06 17:21 ` Lee Jones
2012-08-06 10:46 ` Lee Jones [this message]
2012-08-06 10:46 ` [PATCH 6/6] Input: ab8500-ponkey: Make the distinction between DT and non-DT boots Lee Jones
2012-08-06 11:17 ` Linus Walleij
2012-08-06 12:36 ` Lee Jones
2012-08-06 16:00 ` Mark Brown
2012-08-06 17:22 ` Lee Jones
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=1344250002-6011-6-git-send-email-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).