All of lore.kernel.org
 help / color / mirror / Atom feed
From: Lee Jones <lee.jones@linaro.org>
To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Cc: linus.walleij@stericsson.com, arnd@arndb.de,
	grant.likely@secretlab.ca, Lee Jones <lee.jones@linaro.org>
Subject: [PATCH 12/14] ARM: ux500: Correctly reference IRQs supplied by the AB8500 from Device Tree
Date: Mon, 11 Jun 2012 16:25:05 +0100	[thread overview]
Message-ID: <1339428307-3850-13-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1339428307-3850-1-git-send-email-lee.jones@linaro.org>

The AB8500 driver has now been provided with IRQ domain support. This
means we can request IRQs from any of it's uses via Device Tree. This
patch advertises the AB8500 as an Interrupt Controller and provides the
correct calls in the format the driver expects.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/boot/dts/db8500.dtsi |   24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/arch/arm/boot/dts/db8500.dtsi b/arch/arm/boot/dts/db8500.dtsi
index 01f9a9d..55a36ae 100644
--- a/arch/arm/boot/dts/db8500.dtsi
+++ b/arch/arm/boot/dts/db8500.dtsi
@@ -312,24 +312,26 @@
 				compatible = "stericsson,ab8500";
 				reg = <5>; /* mailbox 5 is i2c */
 				interrupts = <0 40 0x4>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
 
 				ab8500-gpadc {
 					compatible = "stericsson,ab8500-gpadc";
-					interrupts = <0 32 0x4
-						      0 39 0x4>;
+					interrupts = <32 0x4
+						      39 0x4>;
 					interrupt-names = "HW_CONV_END", "SW_CONV_END";
 					vddadc-supply = <&ab8500_ldo_tvout_reg>;
 				};
 
 				ab8500-usb {
 					compatible = "stericsson,ab8500-usb";
-					interrupts = < 0 90 0x4
-						       0 96 0x4
-						       0 14 0x4
-						       0 15 0x4
-						       0 79 0x4
-						       0 74 0x4
-						       0 75 0x4>;
+					interrupts = < 90 0x4
+						       96 0x4
+						       14 0x4
+						       15 0x4
+						       79 0x4
+						       74 0x4
+						       75 0x4>;
 					interrupt-names = "ID_WAKEUP_R",
 							  "ID_WAKEUP_F",
 							  "VBUS_DET_F",
@@ -344,8 +346,8 @@
 
 				ab8500-ponkey {
 					compatible = "stericsson,ab8500-ponkey";
-					interrupts = <0 6 0x4
-						      0 7 0x4>;
+					interrupts = <6 0x4
+						      7 0x4>;
 					interrupt-names = "ONKEY_DBF", "ONKEY_DBR";
 				};
 
-- 
1.7.9.5


WARNING: multiple messages have this Message-ID (diff)
From: lee.jones@linaro.org (Lee Jones)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 12/14] ARM: ux500: Correctly reference IRQs supplied by the AB8500 from Device Tree
Date: Mon, 11 Jun 2012 16:25:05 +0100	[thread overview]
Message-ID: <1339428307-3850-13-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1339428307-3850-1-git-send-email-lee.jones@linaro.org>

The AB8500 driver has now been provided with IRQ domain support. This
means we can request IRQs from any of it's uses via Device Tree. This
patch advertises the AB8500 as an Interrupt Controller and provides the
correct calls in the format the driver expects.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/boot/dts/db8500.dtsi |   24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/arch/arm/boot/dts/db8500.dtsi b/arch/arm/boot/dts/db8500.dtsi
index 01f9a9d..55a36ae 100644
--- a/arch/arm/boot/dts/db8500.dtsi
+++ b/arch/arm/boot/dts/db8500.dtsi
@@ -312,24 +312,26 @@
 				compatible = "stericsson,ab8500";
 				reg = <5>; /* mailbox 5 is i2c */
 				interrupts = <0 40 0x4>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
 
 				ab8500-gpadc {
 					compatible = "stericsson,ab8500-gpadc";
-					interrupts = <0 32 0x4
-						      0 39 0x4>;
+					interrupts = <32 0x4
+						      39 0x4>;
 					interrupt-names = "HW_CONV_END", "SW_CONV_END";
 					vddadc-supply = <&ab8500_ldo_tvout_reg>;
 				};
 
 				ab8500-usb {
 					compatible = "stericsson,ab8500-usb";
-					interrupts = < 0 90 0x4
-						       0 96 0x4
-						       0 14 0x4
-						       0 15 0x4
-						       0 79 0x4
-						       0 74 0x4
-						       0 75 0x4>;
+					interrupts = < 90 0x4
+						       96 0x4
+						       14 0x4
+						       15 0x4
+						       79 0x4
+						       74 0x4
+						       75 0x4>;
 					interrupt-names = "ID_WAKEUP_R",
 							  "ID_WAKEUP_F",
 							  "VBUS_DET_F",
@@ -344,8 +346,8 @@
 
 				ab8500-ponkey {
 					compatible = "stericsson,ab8500-ponkey";
-					interrupts = <0 6 0x4
-						      0 7 0x4>;
+					interrupts = <6 0x4
+						      7 0x4>;
 					interrupt-names = "ONKEY_DBF", "ONKEY_DBR";
 				};
 
-- 
1.7.9.5

  parent reply	other threads:[~2012-06-11 15:25 UTC|newest]

Thread overview: 234+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-11 15:24 [PATCH 00/14] Final (large) batch of Snowball Device Tree Enablement Lee Jones
2012-06-11 15:24 ` Lee Jones
2012-06-11 15:24 ` [PATCH 01/14] rtc: ab8500-rtc: IRQF_ONESHOT when requesting a threaded IRQ Lee Jones
2012-06-11 15:24   ` Lee Jones
2012-06-11 15:31   ` Arnd Bergmann
2012-06-11 15:31     ` Arnd Bergmann
2012-06-11 15:37     ` Lee Jones
2012-06-11 15:37       ` Lee Jones
2012-06-11 15:51       ` Greg Kroah-Hartman
2012-06-11 15:51         ` Greg Kroah-Hartman
2012-06-11 16:01         ` Lee Jones
2012-06-11 16:01           ` Lee Jones
2012-06-11 20:54           ` [rtc-linux] " Linus Walleij
2012-06-11 20:54             ` Linus Walleij
2012-06-12  8:57     ` Lee Jones
2012-06-12  8:57       ` Lee Jones
2012-06-13 22:25       ` Andrew Morton
2012-06-13 22:25         ` Andrew Morton
2012-06-14  7:14         ` Lee Jones
2012-06-14  7:14           ` Lee Jones
2012-06-14  7:30           ` Andrew Morton
2012-06-14  7:30             ` Andrew Morton
2012-06-14  8:02             ` Lee Jones
2012-06-14  8:02               ` Lee Jones
2012-06-11 15:24 ` [PATCH 02/14] rtc: Ensure correct probing of the AB8500 RTC when Device Tree is enabled Lee Jones
2012-06-11 15:24   ` Lee Jones
2012-06-11 20:56   ` [rtc-linux] " Linus Walleij
2012-06-11 20:56     ` Linus Walleij
2012-07-02 15:23   ` Lee Jones
2012-07-02 15:23     ` Lee Jones
2012-06-11 15:24 ` [PATCH 03/14] mfd: ab8500-gpadc: Enable IRQF_ONESHOT when requesting a threaded IRQ Lee Jones
2012-06-11 15:24   ` Lee Jones
2012-06-11 20:54   ` Linus Walleij
2012-06-11 20:54     ` Linus Walleij
2012-06-12  8:58   ` Lee Jones
2012-06-12  8:58     ` Lee Jones
2012-06-11 15:24 ` [PATCH 04/14] mfd: Remove redundant Kconfig entry Lee Jones
2012-06-11 15:24   ` Lee Jones
2012-06-11 20:57   ` Linus Walleij
2012-06-11 20:57     ` Linus Walleij
2012-06-11 15:24 ` [PATCH 05/14] mfd: Enable DT probing of the DB8500 PRCMU Lee Jones
2012-06-11 15:24   ` Lee Jones
2012-06-11 20:58   ` Linus Walleij
2012-06-11 20:58     ` Linus Walleij
2012-06-29 14:47   ` Samuel Ortiz
2012-06-29 14:47     ` Samuel Ortiz
2012-06-11 15:24 ` [PATCH 06/14] mfd: Initialise the DB8500 PRCMU driver at core_initcall time Lee Jones
2012-06-11 15:24   ` Lee Jones
2012-06-11 21:01   ` Linus Walleij
2012-06-11 21:01     ` Linus Walleij
2012-06-12  8:11     ` Lee Jones
2012-06-12  8:11       ` Lee Jones
2012-06-12  8:35     ` Lee Jones
2012-06-12  8:35       ` Lee Jones
2012-06-12 12:59       ` Arnd Bergmann
2012-06-12 12:59         ` Arnd Bergmann
2012-06-12 13:23         ` Lee Jones
2012-06-12 13:23           ` Lee Jones
2012-06-12 14:49           ` Arnd Bergmann
2012-06-12 14:49             ` Arnd Bergmann
2012-06-12 15:39             ` Lee Jones
2012-06-12 15:39               ` Lee Jones
2012-06-18  8:32             ` Lee Jones
2012-06-18  8:32               ` Lee Jones
2012-06-29 14:48   ` Samuel Ortiz
2012-06-29 14:48     ` Samuel Ortiz
2012-06-11 15:25 ` [PATCH 07/14] mfd: Initialise the AB8500 " Lee Jones
2012-06-11 15:25   ` Lee Jones
2012-06-11 21:03   ` Linus Walleij
2012-06-11 21:03     ` Linus Walleij
2012-06-12  8:13     ` Lee Jones
2012-06-12  8:13       ` Lee Jones
2012-06-12  8:37     ` Lee Jones
2012-06-12  8:37       ` Lee Jones
2012-06-29 14:51   ` Samuel Ortiz
2012-06-29 14:51     ` Samuel Ortiz
2012-06-11 15:25 ` [PATCH 08/14] mfd: Add IRQ domain support for the AB8500 Lee Jones
2012-06-11 15:25   ` Lee Jones
2012-06-11 21:33   ` Linus Walleij
2012-06-11 21:33     ` Linus Walleij
2012-06-12  8:01     ` Lee Jones
2012-06-12  8:01       ` Lee Jones
2012-06-14 18:32   ` Mark Brown
2012-06-14 18:32     ` Mark Brown
2012-06-15 12:49     ` Lee Jones
2012-06-15 12:49       ` Lee Jones
2012-06-18  9:02     ` Lee Jones
2012-06-18  9:02       ` Lee Jones
2012-06-18  9:32       ` Mark Brown
2012-06-18  9:32         ` Mark Brown
2012-06-18 10:20       ` Russell King - ARM Linux
2012-06-18 10:20         ` Russell King - ARM Linux
2012-06-18 18:56         ` Mark Brown
2012-06-18 18:56           ` Mark Brown
2012-06-20 13:00           ` Lee Jones
2012-06-20 13:00             ` Lee Jones
2012-06-21  7:37             ` Linus Walleij
2012-06-21  7:37               ` Linus Walleij
2012-06-26  9:04               ` Lee Jones
2012-06-26  9:04                 ` Lee Jones
2012-06-20  9:12         ` Linus Walleij
2012-06-20  9:12           ` Linus Walleij
2012-06-11 15:25 ` [PATCH 09/14] i2c: Add Device Tree support to the Nomadik I2C driver Lee Jones
2012-06-11 15:25   ` Lee Jones
2012-06-11 19:05   ` Wolfram Sang
2012-06-11 19:05     ` Wolfram Sang
2012-06-12  7:23     ` Lee Jones
2012-06-12  7:23       ` Lee Jones
2012-06-12  8:52     ` Lee Jones
2012-06-12  8:52       ` Lee Jones
2012-06-12  8:52       ` Lee Jones
2012-06-12  8:57       ` Wolfram Sang
2012-06-12  8:57         ` Wolfram Sang
2012-06-12  8:57         ` Wolfram Sang
2012-06-11 20:37   ` Linus Walleij
2012-06-11 20:37     ` Linus Walleij
2012-06-11 20:37     ` Linus Walleij
2012-06-12  7:34     ` Lee Jones
2012-06-12  7:34       ` Lee Jones
2012-06-12  7:34       ` Lee Jones
2012-06-13  5:40       ` Linus Walleij
2012-06-13  5:40         ` Linus Walleij
2012-06-13  5:40         ` Linus Walleij
2012-06-13  7:01         ` Lee Jones
2012-06-13  7:01           ` Lee Jones
2012-06-13  7:01           ` Lee Jones
2012-06-13  8:12           ` Linus Walleij
2012-06-13  8:12             ` Linus Walleij
2012-06-13 12:28             ` Lee Jones
2012-06-13 12:28               ` Lee Jones
2012-06-13 12:28               ` Lee Jones
2012-06-14 18:36               ` Mark Brown
2012-06-14 18:36                 ` Mark Brown
2012-06-14 18:36                 ` Mark Brown
2012-06-14 18:46                 ` Mark Brown
2012-06-14 18:46                   ` Mark Brown
2012-06-14 18:46                   ` Mark Brown
2012-06-14 18:59                   ` Lee Jones
2012-06-14 18:59                     ` Lee Jones
2012-06-14 18:57                 ` Lee Jones
2012-06-14 18:57                   ` Lee Jones
2012-06-14 18:57                   ` Lee Jones
2012-06-15  9:32                   ` Mark Brown
2012-06-15  9:32                     ` Mark Brown
2012-06-15  9:32                     ` Mark Brown
2012-06-15 10:00                     ` Lee Jones
2012-06-15 10:00                       ` Lee Jones
2012-06-15 10:32                   ` Russell King - ARM Linux
2012-06-15 10:32                     ` Russell King - ARM Linux
2012-06-15 11:43                     ` Lee Jones
2012-06-15 11:43                       ` Lee Jones
2012-06-15 11:43                       ` Lee Jones
2012-06-13 16:07     ` [PATCH 1/3] " Lee Jones
2012-06-13 16:07       ` Lee Jones
2012-06-13 16:07       ` Lee Jones
2012-06-14 17:12       ` Linus Walleij
2012-06-14 17:12         ` Linus Walleij
2012-06-14 17:12         ` Linus Walleij
2012-06-15  9:02         ` Lee Jones
2012-06-15  9:02           ` Lee Jones
2012-06-15  9:02           ` Lee Jones
     [not found]           ` <CAE2-_9rRYxjU9QQgtBv9ReMY5x+oRiJG1cDQahYHanjDrwVUYA@mail.gmail.com>
2012-06-15 11:50             ` Fwd: " Srinidhi Kasagar
2012-06-15 11:50               ` Srinidhi Kasagar
2012-06-15 11:50               ` Srinidhi Kasagar
2012-06-15 12:45               ` Lee Jones
2012-06-15 12:45                 ` Lee Jones
2012-06-15 12:45                 ` Lee Jones
2012-06-15 13:05                 ` Srinidhi Kasagar
2012-06-15 13:05                   ` Srinidhi Kasagar
2012-06-15 13:05                   ` Srinidhi Kasagar
2012-06-15 13:18                   ` Lee Jones
2012-06-15 13:18                     ` Lee Jones
2012-06-15 13:18                     ` Lee Jones
2012-06-15 13:37                     ` Srinidhi Kasagar
2012-06-15 13:37                       ` Srinidhi Kasagar
2012-06-15 13:37                       ` Srinidhi Kasagar
2012-06-15 13:58                       ` Lee Jones
2012-06-15 13:58                         ` Lee Jones
2012-06-15 13:58                         ` Lee Jones
2012-06-17 17:43                     ` Linus Walleij
2012-06-17 17:43                       ` Linus Walleij
2012-06-17 17:43                       ` Linus Walleij
2012-06-18  7:18                       ` Lee Jones
2012-06-18  7:18                         ` Lee Jones
2012-06-18  7:18                         ` Lee Jones
2012-06-18  7:58                         ` Srinidhi Kasagar
2012-06-18  7:58                           ` Srinidhi Kasagar
2012-06-18  7:58                           ` Srinidhi Kasagar
2012-06-18  8:41                           ` Lee Jones
2012-06-18  8:41                             ` Lee Jones
2012-06-18  8:41                             ` Lee Jones
2012-06-13 16:08     ` [PATCH 2/3] ARM: ux500: Add i2c configurations to the Device Tree for DB8500 based devices Lee Jones
2012-06-13 16:08       ` Lee Jones
2012-06-14 17:13       ` Linus Walleij
2012-06-14 17:13         ` Linus Walleij
2012-06-14 17:13         ` Linus Walleij
2012-06-18 11:29       ` Linus Walleij
2012-06-18 11:29         ` Linus Walleij
2012-06-18 11:29         ` Linus Walleij
2012-06-18 11:37         ` Lee Jones
2012-06-18 11:37           ` Lee Jones
2012-06-18 11:37           ` Lee Jones
2012-06-13 16:08     ` [PATCH 3/3] Documentation: Device Tree binding information for i2c-nomadik driver Lee Jones
2012-06-13 16:08       ` Lee Jones
2012-06-13 16:08       ` Lee Jones
2012-06-14 17:13       ` Linus Walleij
2012-06-14 17:13         ` Linus Walleij
2012-06-14 17:13         ` Linus Walleij
2012-06-11 15:25 ` [PATCH 10/14] Input: Add Device Tree support to the ab8500-ponkey driver Lee Jones
2012-06-11 15:25   ` Lee Jones
2012-06-11 15:25 ` [PATCH 11/14] usb: otg: Enable probing of the ab8500 during a Device Tree boot Lee Jones
2012-06-11 15:25   ` Lee Jones
2012-06-11 21:39   ` Linus Walleij
2012-06-11 21:39     ` Linus Walleij
2012-07-02 15:24   ` Lee Jones
2012-07-02 15:24     ` Lee Jones
2012-06-11 15:25 ` Lee Jones [this message]
2012-06-11 15:25   ` [PATCH 12/14] ARM: ux500: Correctly reference IRQs supplied by the AB8500 from Device Tree Lee Jones
2012-06-11 21:41   ` Linus Walleij
2012-06-11 21:41     ` Linus Walleij
2012-06-11 15:25 ` [PATCH 13/14] ARM: ux500: Enable the AB8500 RTC for all DT:ed DB8500 based devices Lee Jones
2012-06-11 15:25   ` Lee Jones
2012-06-11 21:42   ` Linus Walleij
2012-06-11 21:42     ` Linus Walleij
2012-06-11 15:25 ` [PATCH 14/14] ARM: ux500: Move rtc-pl031 registration to Device Tree when enabled Lee Jones
2012-06-11 15:25   ` Lee Jones
2012-06-11 21:43   ` Linus Walleij
2012-06-11 21:43     ` Linus Walleij
2012-06-12  8:03     ` Lee Jones
2012-06-12  8:03       ` Lee Jones
2012-06-12 14:32       ` Linus Walleij
2012-06-12 14:32         ` Linus Walleij
2012-06-12 14:44         ` Lee Jones
2012-06-12 14:44           ` 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=1339428307-3850-13-git-send-email-lee.jones@linaro.org \
    --to=lee.jones@linaro.org \
    --cc=arnd@arndb.de \
    --cc=grant.likely@secretlab.ca \
    --cc=linus.walleij@stericsson.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.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 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.