Skip to contentSkip to conversation

ARM: shmobile: Use interrupt macros in DT files

PATCH Superseded Laurent Pinchart 3 participants 21 messages Nov 9, 2013 – Nov 21, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover ARM: shmobile: Use interrupt macros in DT files

Hello,

This patch series replaces all numerical IRQ types by the corresponding IRQ_TYPE_* macros in device tree sources. It starts by switching from /include/ to #include (1/7), replacing numerical types by macros in SoC DT files (2/7) and board DT files (3/7), and fixing several boards that use a defined IRQ type instead of IRQ_TYPE_NONE.

The changes have been tested on the armadillo and marzen boards.

Laurent Pinchart (7):
ARM: shmobile: Use #include in device tree sources
ARM: shmobile: Use interrupt macros in SoC DT files
ARM: shmobile: Use interrupt macros in board DT files
ARM: shmobile: marzen-reference: Use falling edge IRQ for LAN9221
ARM: shmobile: bockw-reference: Use falling edge IRQ for LAN9221
ARM: shmobile: kzm9g-reference: Use falling edge IRQ for LAN9221
ARM: shmobile: armadillo-reference: Use low level IRQ for ST1231

 arch/arm/boot/dts/r7s72100-genmai.dts              |   2 +-
 arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts    |   2 +-
 arch/arm/boot/dts/r8a73a4-ape6evm.dts              |   5 +-
 arch/arm/boot/dts/r8a73a4.dtsi                     | 108 ++++++++++++-----
 .../boot/dts/r8a7740-armadillo800eva-reference.dts |   5 +-
 arch/arm/boot/dts/r8a7740-armadillo800eva.dts      |   2 +-
 arch/arm/boot/dts/r8a7740.dtsi                     | 106 ++++++++---------
 arch/arm/boot/dts/r8a7778-bockw-reference.dts      |   5 +-
 arch/arm/boot/dts/r8a7778-bockw.dts                |   2 +-
 arch/arm/boot/dts/r8a7778.dtsi                     |  44 +++----
 arch/arm/boot/dts/r8a7779-marzen-reference.dts     |   5 +-
 arch/arm/boot/dts/r8a7779-marzen.dts               |   2 +-
 arch/arm/boot/dts/r8a7779.dtsi                     |  42 +++----
 arch/arm/boot/dts/r8a7790-lager-reference.dts      |   2 +-
 arch/arm/boot/dts/r8a7790-lager.dts                |   2 +-
 arch/arm/boot/dts/r8a7790.dtsi                     |  58 +++++-----
 arch/arm/boot/dts/r8a7791-koelsch-reference.dts    |   2 +-
 arch/arm/boot/dts/r8a7791-koelsch.dts              |   2 +-
 arch/arm/boot/dts/r8a7791.dtsi                     |  49 ++++----
 arch/arm/boot/dts/sh7372-mackerel.dts              |   2 +-
 arch/arm/boot/dts/sh73a0-kzm9g-reference.dts       |   5 +-
 arch/arm/boot/dts/sh73a0-kzm9g.dts                 |   2 +-
 arch/arm/boot/dts/sh73a0.dtsi                      | 128 +++++++++++----------
 23 files changed, 325 insertions(+), 257 deletions(-)
Signature · 3 lines
Regards,

Laurent Pinchart
#1 lore raw

PATCH 1/7 ARM: shmobile: Use #include in device tree sources

In order to allow usage of the preprocessor in the SoC device tree sources, switch from /include/ to #include.

---
 arch/arm/boot/dts/r7s72100-genmai.dts                   | 2 +-
 arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts         | 2 +-
 arch/arm/boot/dts/r8a73a4-ape6evm.dts                   | 2 +-
 arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts | 2 +-
 arch/arm/boot/dts/r8a7740-armadillo800eva.dts           | 2 +-
 arch/arm/boot/dts/r8a7778-bockw-reference.dts           | 2 +-
 arch/arm/boot/dts/r8a7778-bockw.dts                     | 2 +-
 arch/arm/boot/dts/r8a7779-marzen-reference.dts          | 2 +-
 arch/arm/boot/dts/r8a7779-marzen.dts                    | 2 +-
 arch/arm/boot/dts/r8a7790-lager-reference.dts           | 2 +-
 arch/arm/boot/dts/r8a7790-lager.dts                     | 2 +-
 arch/arm/boot/dts/r8a7791-koelsch-reference.dts         | 2 +-
 arch/arm/boot/dts/r8a7791-koelsch.dts                   | 2 +-
 arch/arm/boot/dts/sh7372-mackerel.dts                   | 2 +-
 arch/arm/boot/dts/sh73a0-kzm9g-reference.dts            | 2 +-
 arch/arm/boot/dts/sh73a0-kzm9g.dts                      | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)
arch/arm/boot/dts/r7s72100-genmai.dts +1 -1
index 1fb20f2..b1deaf7 100644
@@ -9,7 +9,7 @@
  */
 
 /dts-v1/;
-/include/ "r7s72100.dtsi"
+#include "r7s72100.dtsi"
 
 / {
 	model = "Genmai";
arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts +1 -1
index 25dbc1c..338f0cb 100644
@@ -9,7 +9,7 @@
  */
 
 /dts-v1/;
-/include/ "r8a73a4.dtsi"
+#include "r8a73a4.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 
 / {
arch/arm/boot/dts/r8a73a4-ape6evm.dts +1 -1
index 91436b5..7db8d79 100644
@@ -9,7 +9,7 @@
  */
 
 /dts-v1/;
-/include/ "r8a73a4.dtsi"
+#include "r8a73a4.dtsi"
 
 / {
 	model = "APE6EVM";
arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts +1 -1
index 6a54219..c7c5bcb 100644
@@ -9,7 +9,7 @@
  */
 
 /dts-v1/;
-/include/ "r8a7740.dtsi"
+#include "r8a7740.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/pwm/pwm.h>
 
arch/arm/boot/dts/r8a7740-armadillo800eva.dts +1 -1
index 426cd9c..a06a11e 100644
@@ -9,7 +9,7 @@
  */
 
 /dts-v1/;
-/include/ "r8a7740.dtsi"
+#include "r8a7740.dtsi"
 
 / {
 	model = "armadillo 800 eva";
arch/arm/boot/dts/r8a7778-bockw-reference.dts +1 -1
index 9c8bd37..e7751ee 100644
@@ -15,7 +15,7 @@
  */
 
 /dts-v1/;
-/include/ "r8a7778.dtsi"
+#include "r8a7778.dtsi"
 
 / {
 	model = "bockw";
arch/arm/boot/dts/r8a7778-bockw.dts +1 -1
index 12bbebc..46a884d 100644
@@ -15,7 +15,7 @@
  */
 
 /dts-v1/;
-/include/ "r8a7778.dtsi"
+#include "r8a7778.dtsi"
 
 / {
 	model = "bockw";
arch/arm/boot/dts/r8a7779-marzen-reference.dts +1 -1
index ce3fe9e..08b9ee37 100644
@@ -10,7 +10,7 @@
  */
 
 /dts-v1/;
-/include/ "r8a7779.dtsi"
+#include "r8a7779.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 
 / {
arch/arm/boot/dts/r8a7779-marzen.dts +1 -1
index f3f7f79..a7af2c2 100644
@@ -10,7 +10,7 @@
  */
 
 /dts-v1/;
-/include/ "r8a7779.dtsi"
+#include "r8a7779.dtsi"
 
 / {
 	model = "marzen";
arch/arm/boot/dts/r8a7790-lager-reference.dts +1 -1
index ec82674..cce7dbf 100644
@@ -9,7 +9,7 @@
  */
 
 /dts-v1/;
-/include/ "r8a7790.dtsi"
+#include "r8a7790.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 
 / {
arch/arm/boot/dts/r8a7790-lager.dts +1 -1
index 203bd08..8799dfb 100644
@@ -9,7 +9,7 @@
  */
 
 /dts-v1/;
-/include/ "r8a7790.dtsi"
+#include "r8a7790.dtsi"
 
 / {
 	model = "Lager";
arch/arm/boot/dts/r8a7791-koelsch-reference.dts +1 -1
index b8a374a..1a0f082 100644
@@ -10,7 +10,7 @@
  */
 
 /dts-v1/;
-/include/ "r8a7791.dtsi"
+#include "r8a7791.dtsi"
 
 / {
 	model = "Koelsch";
arch/arm/boot/dts/r8a7791-koelsch.dts +1 -1
index 1ce5250..c4e8b3a 100644
@@ -10,7 +10,7 @@
  */
 
 /dts-v1/;
-/include/ "r8a7791.dtsi"
+#include "r8a7791.dtsi"
 
 / {
 	model = "Koelsch";
arch/arm/boot/dts/sh7372-mackerel.dts +1 -1
index 8acf51e..a759a27 100644
@@ -9,7 +9,7 @@
  */
 
 /dts-v1/;
-/include/ "sh7372.dtsi"
+#include "sh7372.dtsi"
 
 / {
 	model = "Mackerel (AP4 EVM 2nd)";
arch/arm/boot/dts/sh73a0-kzm9g-reference.dts +1 -1
index df75aea..d5a6d74 100644
@@ -12,7 +12,7 @@
  */
 
 /dts-v1/;
-/include/ "sh73a0.dtsi"
+#include "sh73a0.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 
 / {
arch/arm/boot/dts/sh73a0-kzm9g.dts +1 -1
index 0f1ca77..27c5f42 100644
@@ -9,7 +9,7 @@
  */
 
 /dts-v1/;
-/include/ "sh73a0.dtsi"
+#include "sh73a0.dtsi"
 
 / {
 	model = "KZM-A9-GT";
Signature · 1 line
1.8.1.5
#2 lore raw

PATCH 2/7 ARM: shmobile: Use interrupt macros in SoC DT files

In reply to Laurent Pinchart
---
 arch/arm/boot/dts/r8a73a4.dtsi | 108 ++++++++++++++++++++++++----------
 arch/arm/boot/dts/r8a7740.dtsi | 106 +++++++++++++++++-----------------
 arch/arm/boot/dts/r8a7778.dtsi |  44 +++++++-------
 arch/arm/boot/dts/r8a7779.dtsi |  42 +++++++-------
 arch/arm/boot/dts/r8a7790.dtsi |  58 ++++++++++---------
 arch/arm/boot/dts/r8a7791.dtsi |  49 ++++++++--------
 arch/arm/boot/dts/sh73a0.dtsi  | 128 +++++++++++++++++++++--------------------
 7 files changed, 299 insertions(+), 236 deletions(-)
arch/arm/boot/dts/r8a73a4.dtsi +77 -31
index e079c99..b4a6c3b 100644
@@ -9,6 +9,9 @@
  * kind, whether express or implied.
  */
 
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+
 / {
 	compatible = "renesas,r8a73a4";
 	interrupt-parent = <&gic>;
@@ -36,15 +39,15 @@
 			<0 0xf1002000 0 0x1000>,
 			<0 0xf1004000 0 0x2000>,
 			<0 0xf1006000 0 0x2000>;
-		interrupts = <1 9 0xf04>;
+		interrupts = <1 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
 	};
 
 	timer {
 		compatible = "arm,armv7-timer";
-		interrupts = <1 13 0xf08>,
-				<1 14 0xf08>,
-				<1 11 0xf08>,
-				<1 10 0xf08>;
+		interrupts = <1 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+			     <1 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+			     <1 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+			     <1 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
 	};
 
 	irqc0: interrupt-controller at e61c0000 {
@@ -53,14 +56,38 @@
 		interrupt-controller;
 		reg = <0 0xe61c0000 0 0x200>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 0 4>, <0 1 4>, <0 2 4>,	<0 3 4>,
-				<0 4 4>, <0 5 4>, <0 6 4>, <0 7 4>,
-				<0 8 4>, <0 9 4>, <0 10 4>, <0 11 4>,
-				<0 12 4>, <0 13 4>, <0 14 4>, <0 15 4>,
-				<0 16 4>, <0 17 4>, <0 18 4>, <0 19 4>,
-				<0 20 4>, <0 21 4>, <0 22 4>, <0 23 4>,
-				<0 24 4>, <0 25 4>, <0 26 4>, <0 27 4>,
-				<0 28 4>, <0 29 4>, <0 30 4>, <0 31 4>;
+		interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 1 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 2 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 3 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 4 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 5 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 6 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 7 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 8 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 9 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 10 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 11 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 12 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 13 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 14 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 15 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 16 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 17 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 18 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 19 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 20 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 21 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 22 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 23 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 24 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 25 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 26 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 27 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 28 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 29 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 30 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 31 IRQ_TYPE_LEVEL_HIGH>;
 	};
 
 	irqc1: interrupt-controller at e61c0200 {
@@ -69,13 +96,32 @@
 		interrupt-controller;
 		reg = <0 0xe61c0200 0 0x200>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 32 4>, <0 33 4>, <0 34 4>, <0 35 4>,
-				<0 36 4>, <0 37 4>, <0 38 4>, <0 39 4>,
-				<0 40 4>, <0 41 4>, <0 42 4>, <0 43 4>,
-				<0 44 4>, <0 45 4>, <0 46 4>, <0 47 4>,
-				<0 48 4>, <0 49 4>, <0 50 4>, <0 51 4>,
-				<0 52 4>, <0 53 4>, <0 54 4>, <0 55 4>,
-				<0 56 4>, <0 57 4>;
+		interrupts = <0 32 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 33 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 34 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 35 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 36 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 37 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 38 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 39 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 40 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 41 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 42 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 43 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 44 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 45 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 46 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 47 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 48 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 49 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 50 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 51 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 52 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 53 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 54 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 55 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 56 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 57 IRQ_TYPE_LEVEL_HIGH>;
 	};
 
 	dmac: dma-multiplexer at 0 {
@@ -126,7 +172,7 @@
 		reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>,
 			 <0 0xe61f0200 0 0x38>, <0 0xe61f0300 0 0x38>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 69 4>;
+		interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>;
 	};
 
 	i2c0: i2c at e6500000 {
@@ -175,7 +221,7 @@
 		compatible = "renesas,rmobile-iic";
 		reg = <0 0xe6540000 0 0x428>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 178 0x4>;
+		interrupts = <0 178 IRQ_TYPE_LEVEL_HIGH>;
 		status = "disabled";
 	};
 
@@ -185,7 +231,7 @@
 		compatible = "renesas,rmobile-iic";
 		reg = <0 0xe60b0000 0 0x428>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 179 0x4>;
+		interrupts = <0 179 IRQ_TYPE_LEVEL_HIGH>;
 		status = "disabled";
 	};
 
@@ -195,7 +241,7 @@
 		compatible = "renesas,rmobile-iic";
 		reg = <0 0xe6550000 0 0x428>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 184 0x4>;
+		interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>;
 		status = "disabled";
 	};
 
@@ -205,7 +251,7 @@
 		compatible = "renesas,rmobile-iic";
 		reg = <0 0xe6560000 0 0x428>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 185 0x4>;
+		interrupts = <0 185 IRQ_TYPE_LEVEL_HIGH>;
 		status = "disabled";
 	};
 
@@ -215,7 +261,7 @@
 		compatible = "renesas,rmobile-iic";
 		reg = <0 0xe6570000 0 0x428>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 173 0x4>;
+		interrupts = <0 173 IRQ_TYPE_LEVEL_HIGH>;
 		status = "disabled";
 	};
 
@@ -223,7 +269,7 @@
 		compatible = "renesas,sh-mmcif";
 		reg = <0 0xee200000 0 0x80>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 169 0x4>;
+		interrupts = <0 169 IRQ_TYPE_LEVEL_HIGH>;
 		reg-io-width = <4>;
 		status = "disabled";
 	};
@@ -232,7 +278,7 @@
 		compatible = "renesas,sh-mmcif";
 		reg = <0 0xee220000 0 0x80>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 170 0x4>;
+		interrupts = <0 170 IRQ_TYPE_LEVEL_HIGH>;
 		reg-io-width = <4>;
 		status = "disabled";
 	};
@@ -248,7 +294,7 @@
 		compatible = "renesas,sdhi-r8a73a4";
 		reg = <0 0xee100000 0 0x100>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 165 4>;
+		interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>;
 		cap-sd-highspeed;
 		status = "disabled";
 	};
@@ -257,7 +303,7 @@
 		compatible = "renesas,sdhi-r8a73a4";
 		reg = <0 0xee120000 0 0x100>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 166 4>;
+		interrupts = <0 166 IRQ_TYPE_LEVEL_HIGH>;
 		cap-sd-highspeed;
 		status = "disabled";
 	};
@@ -266,7 +312,7 @@
 		compatible = "renesas,sdhi-r8a73a4";
 		reg = <0 0xee140000 0 0x100>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 167 4>;
+		interrupts = <0 167 IRQ_TYPE_LEVEL_HIGH>;
 		cap-sd-highspeed;
 		status = "disabled";
 	};
arch/arm/boot/dts/r8a7740.dtsi +54 -52

178 lines not on this page · raw message

arch/arm/boot/dts/r8a7778.dtsi +23 -21

158 lines not on this page · raw message

arch/arm/boot/dts/r8a7779.dtsi +22 -20

150 lines not on this page · raw message

arch/arm/boot/dts/r8a7790.dtsi +32 -26

182 lines not on this page · raw message

arch/arm/boot/dts/r8a7791.dtsi +26 -23

121 lines not on this page · raw message

arch/arm/boot/dts/sh73a0.dtsi +65 -63

218 lines not on this page · raw message

Signature · 1 line
1.8.1.5
#3 lore raw

PATCH 2/7 ARM: shmobile: Use interrupt macros in SoC DT files

Quoted 10 lines · Laurent Pinchart
---
 arch/arm/boot/dts/r8a73a4.dtsi | 108 ++++++++++++++++++++++++----------
 arch/arm/boot/dts/r8a7740.dtsi | 106 +++++++++++++++++-----------------
 arch/arm/boot/dts/r8a7778.dtsi |  44 +++++++-------
 arch/arm/boot/dts/r8a7779.dtsi |  42 +++++++-------
 arch/arm/boot/dts/r8a7790.dtsi |  58 ++++++++++---------
 arch/arm/boot/dts/r8a7791.dtsi |  49 ++++++++--------
 arch/arm/boot/dts/sh73a0.dtsi  | 128 +++++++++++++++++++++--------------------
 7 files changed, 299 insertions(+), 236 deletions(-)

There was some fuzz when applying the arch/arm/boot/dts/r8a7778.dtsi hunks of this patch. The result that I have queued up is as follows. Please double-check it.

From: Laurent Pinchart <[email protected]>

[PATCH] ARM: shmobile: Use interrupt macros in SoC DT files

---
 arch/arm/boot/dts/r8a73a4.dtsi | 108 ++++++++++++++++++++++++----------
 arch/arm/boot/dts/r8a7740.dtsi | 106 +++++++++++++++++-----------------
 arch/arm/boot/dts/r8a7778.dtsi |  44 +++++++-------
 arch/arm/boot/dts/r8a7779.dtsi |  42 +++++++-------
 arch/arm/boot/dts/r8a7790.dtsi |  58 ++++++++++---------
 arch/arm/boot/dts/r8a7791.dtsi |  49 ++++++++--------
 arch/arm/boot/dts/sh73a0.dtsi  | 128 +++++++++++++++++++++--------------------
 7 files changed, 299 insertions(+), 236 deletions(-)
arch/arm/boot/dts/r8a73a4.dtsi +77 -31
index e079c99..b4a6c3b 100644
@@ -9,6 +9,9 @@
  * kind, whether express or implied.
  */
 
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+
 / {
 	compatible = "renesas,r8a73a4";
 	interrupt-parent = <&gic>;
@@ -36,15 +39,15 @@
 			<0 0xf1002000 0 0x1000>,
 			<0 0xf1004000 0 0x2000>,
 			<0 0xf1006000 0 0x2000>;
-		interrupts = <1 9 0xf04>;
+		interrupts = <1 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
 	};
 
 	timer {
 		compatible = "arm,armv7-timer";
-		interrupts = <1 13 0xf08>,
-				<1 14 0xf08>,
-				<1 11 0xf08>,
-				<1 10 0xf08>;
+		interrupts = <1 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+			     <1 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+			     <1 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+			     <1 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
 	};
 
 	irqc0: interrupt-controller at e61c0000 {
@@ -53,14 +56,38 @@
 		interrupt-controller;
 		reg = <0 0xe61c0000 0 0x200>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 0 4>, <0 1 4>, <0 2 4>,	<0 3 4>,
-				<0 4 4>, <0 5 4>, <0 6 4>, <0 7 4>,
-				<0 8 4>, <0 9 4>, <0 10 4>, <0 11 4>,
-				<0 12 4>, <0 13 4>, <0 14 4>, <0 15 4>,
-				<0 16 4>, <0 17 4>, <0 18 4>, <0 19 4>,
-				<0 20 4>, <0 21 4>, <0 22 4>, <0 23 4>,
-				<0 24 4>, <0 25 4>, <0 26 4>, <0 27 4>,
-				<0 28 4>, <0 29 4>, <0 30 4>, <0 31 4>;
+		interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 1 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 2 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 3 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 4 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 5 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 6 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 7 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 8 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 9 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 10 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 11 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 12 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 13 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 14 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 15 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 16 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 17 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 18 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 19 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 20 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 21 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 22 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 23 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 24 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 25 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 26 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 27 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 28 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 29 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 30 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 31 IRQ_TYPE_LEVEL_HIGH>;
 	};
 
 	irqc1: interrupt-controller at e61c0200 {
@@ -69,13 +96,32 @@
 		interrupt-controller;
 		reg = <0 0xe61c0200 0 0x200>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 32 4>, <0 33 4>, <0 34 4>, <0 35 4>,
-				<0 36 4>, <0 37 4>, <0 38 4>, <0 39 4>,
-				<0 40 4>, <0 41 4>, <0 42 4>, <0 43 4>,
-				<0 44 4>, <0 45 4>, <0 46 4>, <0 47 4>,
-				<0 48 4>, <0 49 4>, <0 50 4>, <0 51 4>,
-				<0 52 4>, <0 53 4>, <0 54 4>, <0 55 4>,
-				<0 56 4>, <0 57 4>;
+		interrupts = <0 32 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 33 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 34 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 35 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 36 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 37 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 38 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 39 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 40 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 41 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 42 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 43 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 44 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 45 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 46 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 47 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 48 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 49 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 50 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 51 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 52 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 53 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 54 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 55 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 56 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 57 IRQ_TYPE_LEVEL_HIGH>;
 	};
 
 	dmac: dma-multiplexer at 0 {
@@ -126,7 +172,7 @@
 		reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>,
 			 <0 0xe61f0200 0 0x38>, <0 0xe61f0300 0 0x38>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 69 4>;
+		interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>;
 	};
 
 	i2c0: i2c at e6500000 {
@@ -175,7 +221,7 @@
 		compatible = "renesas,rmobile-iic";
 		reg = <0 0xe6540000 0 0x428>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 178 0x4>;
+		interrupts = <0 178 IRQ_TYPE_LEVEL_HIGH>;
 		status = "disabled";
 	};
 
@@ -185,7 +231,7 @@
 		compatible = "renesas,rmobile-iic";
 		reg = <0 0xe60b0000 0 0x428>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 179 0x4>;
+		interrupts = <0 179 IRQ_TYPE_LEVEL_HIGH>;
 		status = "disabled";
 	};
 
@@ -195,7 +241,7 @@
 		compatible = "renesas,rmobile-iic";
 		reg = <0 0xe6550000 0 0x428>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 184 0x4>;
+		interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>;
 		status = "disabled";
 	};
 
@@ -205,7 +251,7 @@
 		compatible = "renesas,rmobile-iic";
 		reg = <0 0xe6560000 0 0x428>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 185 0x4>;
+		interrupts = <0 185 IRQ_TYPE_LEVEL_HIGH>;
 		status = "disabled";
 	};
 
@@ -215,7 +261,7 @@
 		compatible = "renesas,rmobile-iic";
 		reg = <0 0xe6570000 0 0x428>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 173 0x4>;
+		interrupts = <0 173 IRQ_TYPE_LEVEL_HIGH>;
 		status = "disabled";
 	};
 
@@ -223,7 +269,7 @@
 		compatible = "renesas,sh-mmcif";
 		reg = <0 0xee200000 0 0x80>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 169 0x4>;
+		interrupts = <0 169 IRQ_TYPE_LEVEL_HIGH>;
 		reg-io-width = <4>;
 		status = "disabled";
 	};
@@ -232,7 +278,7 @@
 		compatible = "renesas,sh-mmcif";
 		reg = <0 0xee220000 0 0x80>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 170 0x4>;
+		interrupts = <0 170 IRQ_TYPE_LEVEL_HIGH>;
 		reg-io-width = <4>;
 		status = "disabled";
 	};
@@ -248,7 +294,7 @@
 		compatible = "renesas,sdhi-r8a73a4";
 		reg = <0 0xee100000 0 0x100>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 165 4>;
+		interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>;
 		cap-sd-highspeed;
 		status = "disabled";
 	};
@@ -257,7 +303,7 @@
 		compatible = "renesas,sdhi-r8a73a4";
 		reg = <0 0xee120000 0 0x100>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 166 4>;
+		interrupts = <0 166 IRQ_TYPE_LEVEL_HIGH>;
 		cap-sd-highspeed;
 		status = "disabled";
 	};
@@ -266,7 +312,7 @@
 		compatible = "renesas,sdhi-r8a73a4";
 		reg = <0 0xee140000 0 0x100>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 167 4>;
+		interrupts = <0 167 IRQ_TYPE_LEVEL_HIGH>;
 		cap-sd-highspeed;
 		status = "disabled";
 	};
arch/arm/boot/dts/r8a7740.dtsi +54 -52

178 lines not on this page · raw message

arch/arm/boot/dts/r8a7778.dtsi +23 -21

158 lines not on this page · raw message

arch/arm/boot/dts/r8a7779.dtsi +22 -20

150 lines not on this page · raw message

arch/arm/boot/dts/r8a7790.dtsi +32 -26

182 lines not on this page · raw message

arch/arm/boot/dts/r8a7791.dtsi +26 -23

121 lines not on this page · raw message

arch/arm/boot/dts/sh73a0.dtsi +65 -63

218 lines not on this page · raw message

Signature · 1 line
1.8.4
#4 lore raw

PATCH 2/7 ARM: shmobile: Use interrupt macros in SoC DT files

Hi Simon,

Quoted 14 lines · On Tuesday 19 November 2013 10:38:52 Simon Horman wrote:
Quoted 4 lines · Laurent Pinchart

Signed-off-by: Laurent Pinchart
<[email protected]>
---

Quoted 8 lines
 arch/arm/boot/dts/r8a73a4.dtsi | 108 ++++++++++++++++++++++++----------
 arch/arm/boot/dts/r8a7740.dtsi | 106 +++++++++++++++++-----------------
 arch/arm/boot/dts/r8a7778.dtsi |  44 +++++++-------
 arch/arm/boot/dts/r8a7779.dtsi |  42 +++++++-------
 arch/arm/boot/dts/r8a7790.dtsi |  58 ++++++++++---------
 arch/arm/boot/dts/r8a7791.dtsi |  49 ++++++++--------
 arch/arm/boot/dts/sh73a0.dtsi  | 128 +++++++++++++++++++-----------------
 7 files changed, 299 insertions(+), 236 deletions(-)
Quoted 3 lines

There was some fuzz when applying the arch/arm/boot/dts/r8a7778.dtsi hunks of this patch. The result that I have queued up is as follows. Please double-check it.

I'll resend the patch. Which branch should I base it on ?

Signature · 3 lines
Regards,

Laurent Pinchart
#5 lore raw

PATCH 2/7 ARM: shmobile: Use interrupt macros in SoC DT files

Quoted 17 lines · Laurent Pinchart

Hi Simon,

Quoted 14 lines · On Tuesday 19 November 2013 10:38:52 Simon Horman wrote:
Quoted 12 lines · Laurent Pinchart

Signed-off-by: Laurent Pinchart
<[email protected]>
---

 arch/arm/boot/dts/r8a73a4.dtsi | 108 ++++++++++++++++++++++++----------
 arch/arm/boot/dts/r8a7740.dtsi | 106 +++++++++++++++++-----------------
 arch/arm/boot/dts/r8a7778.dtsi |  44 +++++++-------
 arch/arm/boot/dts/r8a7779.dtsi |  42 +++++++-------
 arch/arm/boot/dts/r8a7790.dtsi |  58 ++++++++++---------
 arch/arm/boot/dts/r8a7791.dtsi |  49 ++++++++--------
 arch/arm/boot/dts/sh73a0.dtsi  | 128 +++++++++++++++++++-----------------
 7 files changed, 299 insertions(+), 236 deletions(-)
Quoted 5 lines
Quoted 3 lines

There was some fuzz when applying the arch/arm/boot/dts/r8a7778.dtsi hunks of this patch. The result that I have queued up is as follows. Please double-check it.

I'll resend the patch. Which branch should I base it on ?

dt3.

#6 lore raw

PATCH v2 2/7 ARM: shmobile: Use interrupt macros in SoC DT files

In reply to Laurent Pinchart
---
 arch/arm/boot/dts/r8a73a4.dtsi | 108 ++++++++++++++++++++++++----------
 arch/arm/boot/dts/r8a7740.dtsi | 106 +++++++++++++++++-----------------
 arch/arm/boot/dts/r8a7778.dtsi |  44 +++++++-------
 arch/arm/boot/dts/r8a7779.dtsi |  42 +++++++-------
 arch/arm/boot/dts/r8a7790.dtsi |  50 +++++++++-------
 arch/arm/boot/dts/r8a7791.dtsi |  49 ++++++++--------
 arch/arm/boot/dts/sh73a0.dtsi  | 128 +++++++++++++++++++++--------------------
 7 files changed, 295 insertions(+), 232 deletions(-)

Rebased on top of Simon's dt3 branch.

arch/arm/boot/dts/r8a73a4.dtsi +77 -31
index e079c99..b4a6c3b 100644
@@ -9,6 +9,9 @@
  * kind, whether express or implied.
  */
 
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+
 / {
 	compatible = "renesas,r8a73a4";
 	interrupt-parent = <&gic>;
@@ -36,15 +39,15 @@
 			<0 0xf1002000 0 0x1000>,
 			<0 0xf1004000 0 0x2000>,
 			<0 0xf1006000 0 0x2000>;
-		interrupts = <1 9 0xf04>;
+		interrupts = <1 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
 	};
 
 	timer {
 		compatible = "arm,armv7-timer";
-		interrupts = <1 13 0xf08>,
-				<1 14 0xf08>,
-				<1 11 0xf08>,
-				<1 10 0xf08>;
+		interrupts = <1 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+			     <1 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+			     <1 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+			     <1 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
 	};
 
 	irqc0: interrupt-controller at e61c0000 {
@@ -53,14 +56,38 @@
 		interrupt-controller;
 		reg = <0 0xe61c0000 0 0x200>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 0 4>, <0 1 4>, <0 2 4>,	<0 3 4>,
-				<0 4 4>, <0 5 4>, <0 6 4>, <0 7 4>,
-				<0 8 4>, <0 9 4>, <0 10 4>, <0 11 4>,
-				<0 12 4>, <0 13 4>, <0 14 4>, <0 15 4>,
-				<0 16 4>, <0 17 4>, <0 18 4>, <0 19 4>,
-				<0 20 4>, <0 21 4>, <0 22 4>, <0 23 4>,
-				<0 24 4>, <0 25 4>, <0 26 4>, <0 27 4>,
-				<0 28 4>, <0 29 4>, <0 30 4>, <0 31 4>;
+		interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 1 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 2 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 3 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 4 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 5 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 6 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 7 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 8 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 9 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 10 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 11 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 12 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 13 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 14 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 15 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 16 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 17 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 18 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 19 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 20 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 21 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 22 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 23 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 24 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 25 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 26 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 27 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 28 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 29 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 30 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 31 IRQ_TYPE_LEVEL_HIGH>;
 	};
 
 	irqc1: interrupt-controller at e61c0200 {
@@ -69,13 +96,32 @@
 		interrupt-controller;
 		reg = <0 0xe61c0200 0 0x200>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 32 4>, <0 33 4>, <0 34 4>, <0 35 4>,
-				<0 36 4>, <0 37 4>, <0 38 4>, <0 39 4>,
-				<0 40 4>, <0 41 4>, <0 42 4>, <0 43 4>,
-				<0 44 4>, <0 45 4>, <0 46 4>, <0 47 4>,
-				<0 48 4>, <0 49 4>, <0 50 4>, <0 51 4>,
-				<0 52 4>, <0 53 4>, <0 54 4>, <0 55 4>,
-				<0 56 4>, <0 57 4>;
+		interrupts = <0 32 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 33 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 34 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 35 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 36 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 37 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 38 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 39 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 40 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 41 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 42 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 43 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 44 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 45 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 46 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 47 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 48 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 49 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 50 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 51 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 52 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 53 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 54 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 55 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 56 IRQ_TYPE_LEVEL_HIGH>,
+			     <0 57 IRQ_TYPE_LEVEL_HIGH>;
 	};
 
 	dmac: dma-multiplexer at 0 {
@@ -126,7 +172,7 @@
 		reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>,
 			 <0 0xe61f0200 0 0x38>, <0 0xe61f0300 0 0x38>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 69 4>;
+		interrupts = <0 69 IRQ_TYPE_LEVEL_HIGH>;
 	};
 
 	i2c0: i2c at e6500000 {
@@ -175,7 +221,7 @@
 		compatible = "renesas,rmobile-iic";
 		reg = <0 0xe6540000 0 0x428>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 178 0x4>;
+		interrupts = <0 178 IRQ_TYPE_LEVEL_HIGH>;
 		status = "disabled";
 	};
 
@@ -185,7 +231,7 @@
 		compatible = "renesas,rmobile-iic";
 		reg = <0 0xe60b0000 0 0x428>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 179 0x4>;
+		interrupts = <0 179 IRQ_TYPE_LEVEL_HIGH>;
 		status = "disabled";
 	};
 
@@ -195,7 +241,7 @@
 		compatible = "renesas,rmobile-iic";
 		reg = <0 0xe6550000 0 0x428>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 184 0x4>;
+		interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>;
 		status = "disabled";
 	};
 
@@ -205,7 +251,7 @@
 		compatible = "renesas,rmobile-iic";
 		reg = <0 0xe6560000 0 0x428>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 185 0x4>;
+		interrupts = <0 185 IRQ_TYPE_LEVEL_HIGH>;
 		status = "disabled";
 	};
 
@@ -215,7 +261,7 @@
 		compatible = "renesas,rmobile-iic";
 		reg = <0 0xe6570000 0 0x428>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 173 0x4>;
+		interrupts = <0 173 IRQ_TYPE_LEVEL_HIGH>;
 		status = "disabled";
 	};
 
@@ -223,7 +269,7 @@
 		compatible = "renesas,sh-mmcif";
 		reg = <0 0xee200000 0 0x80>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 169 0x4>;
+		interrupts = <0 169 IRQ_TYPE_LEVEL_HIGH>;
 		reg-io-width = <4>;
 		status = "disabled";
 	};
@@ -232,7 +278,7 @@
 		compatible = "renesas,sh-mmcif";
 		reg = <0 0xee220000 0 0x80>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 170 0x4>;
+		interrupts = <0 170 IRQ_TYPE_LEVEL_HIGH>;
 		reg-io-width = <4>;
 		status = "disabled";
 	};
@@ -248,7 +294,7 @@
 		compatible = "renesas,sdhi-r8a73a4";
 		reg = <0 0xee100000 0 0x100>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 165 4>;
+		interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>;
 		cap-sd-highspeed;
 		status = "disabled";
 	};
@@ -257,7 +303,7 @@
 		compatible = "renesas,sdhi-r8a73a4";
 		reg = <0 0xee120000 0 0x100>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 166 4>;
+		interrupts = <0 166 IRQ_TYPE_LEVEL_HIGH>;
 		cap-sd-highspeed;
 		status = "disabled";
 	};
@@ -266,7 +312,7 @@
 		compatible = "renesas,sdhi-r8a73a4";
 		reg = <0 0xee140000 0 0x100>;
 		interrupt-parent = <&gic>;
-		interrupts = <0 167 4>;
+		interrupts = <0 167 IRQ_TYPE_LEVEL_HIGH>;
 		cap-sd-highspeed;
 		status = "disabled";
 	};
arch/arm/boot/dts/r8a7740.dtsi +54 -52

178 lines not on this page · raw message

arch/arm/boot/dts/r8a7778.dtsi +23 -21

158 lines not on this page · raw message

arch/arm/boot/dts/r8a7779.dtsi +22 -20

150 lines not on this page · raw message

arch/arm/boot/dts/r8a7790.dtsi +28 -22

170 lines not on this page · raw message

arch/arm/boot/dts/r8a7791.dtsi +26 -23

121 lines not on this page · raw message

arch/arm/boot/dts/sh73a0.dtsi +65 -63

218 lines not on this page · raw message

Signature · 1 line
1.8.3.2
#7 lore raw

PATCH v2 2/7 ARM: shmobile: Use interrupt macros in SoC DT files

Quoted 11 lines · Laurent Pinchart
---
 arch/arm/boot/dts/r8a73a4.dtsi | 108 ++++++++++++++++++++++++----------
 arch/arm/boot/dts/r8a7740.dtsi | 106 +++++++++++++++++-----------------
 arch/arm/boot/dts/r8a7778.dtsi |  44 +++++++-------
 arch/arm/boot/dts/r8a7779.dtsi |  42 +++++++-------
 arch/arm/boot/dts/r8a7790.dtsi |  50 +++++++++-------
 arch/arm/boot/dts/r8a7791.dtsi |  49 ++++++++--------
 arch/arm/boot/dts/sh73a0.dtsi  | 128 +++++++++++++++++++++--------------------
 7 files changed, 295 insertions(+), 232 deletions(-)
Quoted 1 line

Rebased on top of Simon's dt3 branch.

Thanks, this one applied cleanly.
I have queued it up in place of v1.

#8 lore raw

PATCH 3/7 ARM: shmobile: Use interrupt macros in board DT files

In reply to Laurent Pinchart
---
 arch/arm/boot/dts/r8a73a4-ape6evm.dts                   | 3 ++-
 arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts | 3 ++-
 arch/arm/boot/dts/r8a7778-bockw-reference.dts           | 3 ++-
 arch/arm/boot/dts/r8a7779-marzen-reference.dts          | 3 ++-
 arch/arm/boot/dts/sh73a0-kzm9g-reference.dts            | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)
arch/arm/boot/dts/r8a73a4-ape6evm.dts +2 -1
index 7db8d79..e84d1a7 100644
@@ -10,6 +10,7 @@
 
 /dts-v1/;
 #include "r8a73a4.dtsi"
+#include <dt-bindings/interrupt-controller/irq.h>
 
 / {
 	model = "APE6EVM";
@@ -40,7 +41,7 @@
 			compatible = "smsc,lan9118", "smsc,lan9115";
 			reg = <0x08000000 0x1000>;
 			interrupt-parent = <&irqc1>;
-			interrupts = <8 0x4>;
+			interrupts = <8 IRQ_TYPE_LEVEL_HIGH>;
 			phy-mode = "mii";
 			reg-io-width = <4>;
 			smsc,irq-active-high;
arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts +2 -1
index c7c5bcb..aef425f 100644
@@ -11,6 +11,7 @@
 /dts-v1/;
 #include "r8a7740.dtsi"
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/pwm/pwm.h>
 
 / {
@@ -94,7 +95,7 @@
 		compatible = "sitronix,st1232";
 		reg = <0x55>;
 		interrupt-parent = <&irqpin1>;
-		interrupts = <2 0>; /* IRQ10: hwirq 2 on irqpin1 */
+		interrupts = <2 IRQ_TYPE_NONE>; /* IRQ10: hwirq 2 on irqpin1 */
 		pinctrl-0 = <&st1232_pins>;
 		pinctrl-names = "default";
 		gpios = <&pfc 166 GPIO_ACTIVE_LOW>;
arch/arm/boot/dts/r8a7778-bockw-reference.dts +2 -1
index e7751ee..f887dc1 100644
@@ -16,6 +16,7 @@
 
 /dts-v1/;
 #include "r8a7778.dtsi"
+#include <dt-bindings/interrupt-controller/irq.h>
 
 / {
 	model = "bockw";
@@ -45,7 +46,7 @@
 
 		phy-mode = "mii";
 		interrupt-parent = <&irqpin>;
-		interrupts = <0 0>; /* IRQ0: hwirq 0 on irqpin */
+		interrupts = <0 IRQ_TYPE_NONE>; /* IRQ0: hwirq 0 on irqpin */
 		reg-io-width = <4>;
 		vddvario-supply = <&fixedregulator3v3>;
 		vdd33a-supply = <&fixedregulator3v3>;
arch/arm/boot/dts/r8a7779-marzen-reference.dts +2 -1
index 08b9ee37..0f5c614 100644
@@ -12,6 +12,7 @@
 /dts-v1/;
 #include "r8a7779.dtsi"
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 
 / {
 	model = "marzen";
@@ -43,7 +44,7 @@
 
 		phy-mode = "mii";
 		interrupt-parent = <&irqpin0>;
-		interrupts = <1 0>; /* IRQ1: hwirq 1 on irqpin0 */
+		interrupts = <1 IRQ_TYPE_NONE>; /* IRQ1: hwirq 1 on irqpin0 */
 		reg-io-width = <4>;
 		vddvario-supply = <&fixedregulator3v3>;
 		vdd33a-supply = <&fixedregulator3v3>;
arch/arm/boot/dts/sh73a0-kzm9g-reference.dts +2 -1
index d5a6d74..605f6c6 100644
@@ -14,6 +14,7 @@
 /dts-v1/;
 #include "sh73a0.dtsi"
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 
 / {
 	model = "KZM-A9-GT";
@@ -82,7 +83,7 @@
 		reg = <0x10000000 0x100>;
 		phy-mode = "mii";
 		interrupt-parent = <&irqpin0>;
-		interrupts = <3 0>;	/* active low */
+		interrupts = <3 IRQ_TYPE_NONE>;	/* active low */
 		reg-io-width = <4>;
 		smsc,irq-push-pull;
 		smsc,save-mac-address;
Signature · 1 line
1.8.1.5
#9 lore raw

PATCH 4/7 ARM: shmobile: marzen-reference: Use falling edge IRQ for LAN9221

In reply to Laurent Pinchart

The device is configured to generate an active-low interrupt signal that is automatically deasserted without requiring any action from the host. Use falling edge trigger as that is the configuration currently used on the board.

---
 arch/arm/boot/dts/r8a7779-marzen-reference.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/r8a7779-marzen-reference.dts +1 -1
index 0f5c614..13fa8be 100644
@@ -44,7 +44,7 @@
 
 		phy-mode = "mii";
 		interrupt-parent = <&irqpin0>;
-		interrupts = <1 IRQ_TYPE_NONE>; /* IRQ1: hwirq 1 on irqpin0 */
+		interrupts = <1 IRQ_TYPE_EDGE_FALLING>;
 		reg-io-width = <4>;
 		vddvario-supply = <&fixedregulator3v3>;
 		vdd33a-supply = <&fixedregulator3v3>;
Signature · 1 line
1.8.1.5
#10 lore raw

PATCH 5/7 ARM: shmobile: bockw-reference: Use falling edge IRQ for LAN9221

In reply to Laurent Pinchart

The device is configured to generate an active-low interrupt signal that is automatically deasserted without requiring any action from the host. Configure the IRQ to trigger on falling edge.

---
 arch/arm/boot/dts/r8a7778-bockw-reference.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/r8a7778-bockw-reference.dts +1 -1
index f887dc1..4e2bcee 100644
@@ -46,7 +46,7 @@
 
 		phy-mode = "mii";
 		interrupt-parent = <&irqpin>;
-		interrupts = <0 IRQ_TYPE_NONE>; /* IRQ0: hwirq 0 on irqpin */
+		interrupts = <0 IRQ_TYPE_EDGE_FALLING>;
 		reg-io-width = <4>;
 		vddvario-supply = <&fixedregulator3v3>;
 		vdd33a-supply = <&fixedregulator3v3>;
Signature · 1 line
1.8.1.5
#11 lore raw

PATCH 6/7 ARM: shmobile: kzm9g-reference: Use falling edge IRQ for LAN9221

In reply to Laurent Pinchart

The device is configured to generate an active-low interrupt signal that is automatically deasserted without requiring any action from the host. Configure the IRQ to trigger on falling edge.

---
 arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/sh73a0-kzm9g-reference.dts +1 -1
index 605f6c6..12fdfaa 100644
@@ -83,7 +83,7 @@
 		reg = <0x10000000 0x100>;
 		phy-mode = "mii";
 		interrupt-parent = <&irqpin0>;
-		interrupts = <3 IRQ_TYPE_NONE>;	/* active low */
+		interrupts = <3 IRQ_TYPE_EDGE_FALLING>;
 		reg-io-width = <4>;
 		smsc,irq-push-pull;
 		smsc,save-mac-address;
Signature · 1 line
1.8.1.5
#12 lore raw

PATCH 7/7 ARM: shmobile: armadillo-reference: Use low level IRQ for ST1231

In reply to Laurent Pinchart

The device is configured to generate an active-low interrupt signal that needs to be acknowledged by the host. Configure the IRQ to trigger on low level.

---
 arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts +1 -1
index aef425f..04e9d49 100644
@@ -95,7 +95,7 @@
 		compatible = "sitronix,st1232";
 		reg = <0x55>;
 		interrupt-parent = <&irqpin1>;
-		interrupts = <2 IRQ_TYPE_NONE>; /* IRQ10: hwirq 2 on irqpin1 */
+		interrupts = <2 IRQ_TYPE_LOW_LEVEL>;
 		pinctrl-0 = <&st1232_pins>;
 		pinctrl-names = "default";
 		gpios = <&pfc 166 GPIO_ACTIVE_LOW>;
Signature · 1 line
1.8.1.5
#13 lore raw

PATCH 7/7 ARM: shmobile: armadillo-reference: Use low level IRQ for ST1231

Quoted 5 lines · Laurent Pinchart

The device is configured to generate an active-low interrupt signal that needs to be acknowledged by the host. Configure the IRQ to trigger on low level.

Thanks, I have queued this up.

#14 lore raw

PATCH 7/7 ARM: shmobile: armadillo-reference: Use low level IRQ for ST1231

In reply to Laurent Pinchart
Quoted 14 lines · Laurent Pinchart

The device is configured to generate an active-low interrupt signal that needs to be acknowledged by the host. Configure the IRQ to trigger on low level.

---
 arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts +0 -0
index aef425f..04e9d49 100644

arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts line 98

Quoted 5 lines
arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts +1 -1
@@ -95,7 +95,7 @@
 		compatible = "sitronix,st1232";
 		reg = <0x55>;
 		interrupt-parent = <&irqpin1>;
-		interrupts = <2 IRQ_TYPE_NONE>; /* IRQ10: hwirq 2 on irqpin1 */
+		interrupts = <2 IRQ_TYPE_LOW_LEVEL>;

I believe this should be IRQ_TYPE_LEVEL_LOW.

I have dequeued this patch for now.

Quoted 11 lines
arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts +0 -0
 		pinctrl-0 = <&st1232_pins>;
 		pinctrl-names = "default";
 		gpios = <&pfc 166 GPIO_ACTIVE_LOW>;
Signature · 6 lines
1.8.1.5

--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#15 lore raw

PATCH 7/7 ARM: shmobile: armadillo-reference: Use low level IRQ for ST1231

Hi Simon,

Quoted 26 lines · On Tuesday 19 November 2013 11:56:29 Simon Horman wrote:
Quoted 17 lines · Laurent Pinchart

The device is configured to generate an active-low interrupt signal that needs to be acknowledged by the host. Configure the IRQ to trigger on low level.

Signed-off-by: Laurent Pinchart
<[email protected]>
---

 arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
(quoted diff) +0 -0

b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts index aef425f..04e9d49 100644

arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts line 98

Quoted 5 lines
arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts +1 -1
@@ -95,7 +95,7 @@
 		compatible = "sitronix,st1232";
 		reg = <0x55>;
 		interrupt-parent = <&irqpin1>;
-		interrupts = <2 IRQ_TYPE_NONE>; /* IRQ10: hwirq 2 on irqpin1 */
+		interrupts = <2 IRQ_TYPE_LOW_LEVEL>;

I believe this should be IRQ_TYPE_LEVEL_LOW.

Quoted 1 line

I have dequeued this patch for now.

My bad, I've tested level low trigger first, then falling edge trigger, and switched back to low level without recompiling the patch. Sorry about that, I'll resend now.

Quoted 3 lines
Quoted 3 lines
arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts +0 -0
 		pinctrl-0 = <&st1232_pins>;
 		pinctrl-names = "default";
 		gpios = <&pfc 166 GPIO_ACTIVE_LOW>;
Signature · 3 lines
Regards,

Laurent Pinchart
#16 lore raw

PATCH v2 7/7 ARM: shmobile: armadillo-reference: Use low level IRQ for ST1231

In reply to Laurent Pinchart

The device is configured to generate an active-low interrupt signal that needs to be acknowledged by the host. Configure the IRQ to trigger on low level.

---
 arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Changes since v1:

- Fixed typo (IRQ_TYPE_LOW_LEVEL -> IRQ_TYPE_LEVEL_LOW)

arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts +1 -1
index aef425f..7b80f19 100644
@@ -95,7 +95,7 @@
 		compatible = "sitronix,st1232";
 		reg = <0x55>;
 		interrupt-parent = <&irqpin1>;
-		interrupts = <2 IRQ_TYPE_NONE>; /* IRQ10: hwirq 2 on irqpin1 */
+		interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
 		pinctrl-0 = <&st1232_pins>;
 		pinctrl-names = "default";
 		gpios = <&pfc 166 GPIO_ACTIVE_LOW>;
Signature · 1 line
1.8.3.2
#17 lore raw

PATCH v2 7/7 ARM: shmobile: armadillo-reference: Use low level IRQ for ST1231

Quoted 4 lines · Laurent Pinchart

The device is configured to generate an active-low interrupt signal that needs to be acknowledged by the host. Configure the IRQ to trigger on low level.

Quoted 8 lines
---
 arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Changes since v1:

- Fixed typo (IRQ_TYPE_LOW_LEVEL -> IRQ_TYPE_LEVEL_LOW)

Thanks, I will queue this up.
Assuming all goes will I plan to push this and other updates today or tomorrow.

Quoted 22 lines
arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts +1 -1
index aef425f..7b80f19 100644
@@ -95,7 +95,7 @@
 		compatible = "sitronix,st1232";
 		reg = <0x55>;
 		interrupt-parent = <&irqpin1>;
-		interrupts = <2 IRQ_TYPE_NONE>; /* IRQ10: hwirq 2 on irqpin1 */
+		interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
 		pinctrl-0 = <&st1232_pins>;
 		pinctrl-names = "default";
 		gpios = <&pfc 166 GPIO_ACTIVE_LOW>;
Signature · 6 lines
1.8.3.2

--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#18 lore raw

cover ARM: shmobile: Use interrupt macros in DT files

In reply to Laurent Pinchart
Quoted 9 lines · Laurent Pinchart

Hello,

This patch series replaces all numerical IRQ types by the corresponding IRQ_TYPE_* macros in device tree sources. It starts by switching from /include/ to #include (1/7), replacing numerical types by macros in SoC DT files (2/7) and board DT files (3/7), and fixing several boards that use a defined IRQ type instead of IRQ_TYPE_NONE.

The changes have been tested on the armadillo and marzen boards.

Hi Laurent,

could you let me know what the status of these patches is.

Quoted 45 lines

Laurent Pinchart (7):
ARM: shmobile: Use #include in device tree sources
ARM: shmobile: Use interrupt macros in SoC DT files
ARM: shmobile: Use interrupt macros in board DT files
ARM: shmobile: marzen-reference: Use falling edge IRQ for LAN9221
ARM: shmobile: bockw-reference: Use falling edge IRQ for LAN9221
ARM: shmobile: kzm9g-reference: Use falling edge IRQ for LAN9221
ARM: shmobile: armadillo-reference: Use low level IRQ for ST1231

 arch/arm/boot/dts/r7s72100-genmai.dts              |   2 +-
 arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts    |   2 +-
 arch/arm/boot/dts/r8a73a4-ape6evm.dts              |   5 +-
 arch/arm/boot/dts/r8a73a4.dtsi                     | 108 ++++++++++++-----
 .../boot/dts/r8a7740-armadillo800eva-reference.dts |   5 +-
 arch/arm/boot/dts/r8a7740-armadillo800eva.dts      |   2 +-
 arch/arm/boot/dts/r8a7740.dtsi                     | 106 ++++++++---------
 arch/arm/boot/dts/r8a7778-bockw-reference.dts      |   5 +-
 arch/arm/boot/dts/r8a7778-bockw.dts                |   2 +-
 arch/arm/boot/dts/r8a7778.dtsi                     |  44 +++----
 arch/arm/boot/dts/r8a7779-marzen-reference.dts     |   5 +-
 arch/arm/boot/dts/r8a7779-marzen.dts               |   2 +-
 arch/arm/boot/dts/r8a7779.dtsi                     |  42 +++----
 arch/arm/boot/dts/r8a7790-lager-reference.dts      |   2 +-
 arch/arm/boot/dts/r8a7790-lager.dts                |   2 +-
 arch/arm/boot/dts/r8a7790.dtsi                     |  58 +++++-----
 arch/arm/boot/dts/r8a7791-koelsch-reference.dts    |   2 +-
 arch/arm/boot/dts/r8a7791-koelsch.dts              |   2 +-
 arch/arm/boot/dts/r8a7791.dtsi                     |  49 ++++----
 arch/arm/boot/dts/sh7372-mackerel.dts              |   2 +-
 arch/arm/boot/dts/sh73a0-kzm9g-reference.dts       |   5 +-
 arch/arm/boot/dts/sh73a0-kzm9g.dts                 |   2 +-
 arch/arm/boot/dts/sh73a0.dtsi                      | 128 +++++++++++----------
 23 files changed, 325 insertions(+), 257 deletions(-)
Signature · 8 lines
Regards,

Laurent Pinchart

--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#19 lore raw

cover ARM: shmobile: Use interrupt macros in DT files

Hi Simon,

Quoted 9 lines · On Monday 18 November 2013 17:42:04 Simon Horman wrote:
Quoted 8 lines · Laurent Pinchart

Hello,

This patch series replaces all numerical IRQ types by the corresponding IRQ_TYPE_* macros in device tree sources. It starts by switching from /include/ to #include (1/7), replacing numerical types by macros in SoC DT files (2/7) and board DT files (3/7), and fixing several boards that use a defined IRQ type instead of IRQ_TYPE_NONE.

Quoted 5 lines
Quoted 1 line

The changes have been tested on the armadillo and marzen boards.

Hi Laurent,

could you let me know what the status of these patches is.

Given the lack of review comments I assume the patches are perfect :-) I'd like to get them applied. Would you like me to split 2/7 and/or 3/7 ? The changes are pretty small, I don't think not splitting them would make backporting much more difficult.

Quoted 33 lines
Quoted 33 lines

Laurent Pinchart (7):
ARM: shmobile: Use #include in device tree sources
ARM: shmobile: Use interrupt macros in SoC DT files
ARM: shmobile: Use interrupt macros in board DT files
ARM: shmobile: marzen-reference: Use falling edge IRQ for LAN9221
ARM: shmobile: bockw-reference: Use falling edge IRQ for LAN9221
ARM: shmobile: kzm9g-reference: Use falling edge IRQ for LAN9221
ARM: shmobile: armadillo-reference: Use low level IRQ for ST1231

 arch/arm/boot/dts/r7s72100-genmai.dts              |   2 +-
 arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts    |   2 +-
 arch/arm/boot/dts/r8a73a4-ape6evm.dts              |   5 +-
 arch/arm/boot/dts/r8a73a4.dtsi                     | 108 +++++++++++-----
 .../boot/dts/r8a7740-armadillo800eva-reference.dts |   5 +-
 arch/arm/boot/dts/r8a7740-armadillo800eva.dts      |   2 +-
 arch/arm/boot/dts/r8a7740.dtsi                     | 106   ++++++--------
 arch/arm/boot/dts/r8a7778-bockw-reference.dts      |   5 +-
 arch/arm/boot/dts/r8a7778-bockw.dts                |   2 +-
 arch/arm/boot/dts/r8a7778.dtsi                     |  44 +++----
 arch/arm/boot/dts/r8a7779-marzen-reference.dts     |   5 +-
 arch/arm/boot/dts/r8a7779-marzen.dts               |   2 +-
 arch/arm/boot/dts/r8a7779.dtsi                     |  42 +++----
 arch/arm/boot/dts/r8a7790-lager-reference.dts      |   2 +-
 arch/arm/boot/dts/r8a7790-lager.dts                |   2 +-
 arch/arm/boot/dts/r8a7790.dtsi                     |  58 +++++-----
 arch/arm/boot/dts/r8a7791-koelsch-reference.dts    |   2 +-
 arch/arm/boot/dts/r8a7791-koelsch.dts              |   2 +-
 arch/arm/boot/dts/r8a7791.dtsi                     |  49 ++++----
 arch/arm/boot/dts/sh7372-mackerel.dts              |   2 +-
 arch/arm/boot/dts/sh73a0-kzm9g-reference.dts       |   5 +-
 arch/arm/boot/dts/sh73a0-kzm9g.dts                 |   2 +-
 arch/arm/boot/dts/sh73a0.dtsi                      | 128  ++++++++-------
 23 files changed, 325 insertions(+), 257 deletions(-)
Signature · 3 lines
Regards,

Laurent Pinchart
#20 lore raw

cover ARM: shmobile: Use interrupt macros in DT files

Quoted 12 lines · Laurent Pinchart

Hi Simon,

Quoted 9 lines · On Monday 18 November 2013 17:42:04 Simon Horman wrote:
Quoted 8 lines · Laurent Pinchart

Hello,

This patch series replaces all numerical IRQ types by the corresponding IRQ_TYPE_* macros in device tree sources. It starts by switching from /include/ to #include (1/7), replacing numerical types by macros in SoC DT files (2/7) and board DT files (3/7), and fixing several boards that use a defined IRQ type instead of IRQ_TYPE_NONE.

Quoted 7 lines
Quoted 5 lines
Quoted 1 line

The changes have been tested on the armadillo and marzen boards.

Hi Laurent,

could you let me know what the status of these patches is.

Given the lack of review comments I assume the patches are perfect :-)

Excellent!

Quoted 4 lines

I'd
like to get them applied. Would you like me to split 2/7 and/or 3/7 ? The changes are pretty small, I don't think not splitting them would make backporting much more difficult.

Thanks, I'll take them as is.

Quoted 44 lines
Quoted 34 lines
Quoted 34 lines

Laurent Pinchart (7):
ARM: shmobile: Use #include in device tree sources
ARM: shmobile: Use interrupt macros in SoC DT files
ARM: shmobile: Use interrupt macros in board DT files
ARM: shmobile: marzen-reference: Use falling edge IRQ for LAN9221
ARM: shmobile: bockw-reference: Use falling edge IRQ for LAN9221
ARM: shmobile: kzm9g-reference: Use falling edge IRQ for LAN9221
ARM: shmobile: armadillo-reference: Use low level IRQ for ST1231

 arch/arm/boot/dts/r7s72100-genmai.dts              |   2 +-
 arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts    |   2 +-
 arch/arm/boot/dts/r8a73a4-ape6evm.dts              |   5 +-
 arch/arm/boot/dts/r8a73a4.dtsi                     | 108 +++++++++++-----
 .../boot/dts/r8a7740-armadillo800eva-reference.dts |   5 +-
 arch/arm/boot/dts/r8a7740-armadillo800eva.dts      |   2 +-
 arch/arm/boot/dts/r8a7740.dtsi                     | 106   ++++++--------
 arch/arm/boot/dts/r8a7778-bockw-reference.dts      |   5 +-
 arch/arm/boot/dts/r8a7778-bockw.dts                |   2 +-
 arch/arm/boot/dts/r8a7778.dtsi                     |  44 +++----
 arch/arm/boot/dts/r8a7779-marzen-reference.dts     |   5 +-
 arch/arm/boot/dts/r8a7779-marzen.dts               |   2 +-
 arch/arm/boot/dts/r8a7779.dtsi                     |  42 +++----
 arch/arm/boot/dts/r8a7790-lager-reference.dts      |   2 +-
 arch/arm/boot/dts/r8a7790-lager.dts                |   2 +-
 arch/arm/boot/dts/r8a7790.dtsi                     |  58 +++++-----
 arch/arm/boot/dts/r8a7791-koelsch-reference.dts    |   2 +-
 arch/arm/boot/dts/r8a7791-koelsch.dts              |   2 +-
 arch/arm/boot/dts/r8a7791.dtsi                     |  49 ++++----
 arch/arm/boot/dts/sh7372-mackerel.dts              |   2 +-
 arch/arm/boot/dts/sh73a0-kzm9g-reference.dts       |   5 +-
 arch/arm/boot/dts/sh73a0-kzm9g.dts                 |   2 +-
 arch/arm/boot/dts/sh73a0.dtsi                      | 128  ++++++++-------
 23 files changed, 325 insertions(+), 257 deletions(-)
Signature · 8 lines
Regards,

Laurent Pinchart

--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html