ARM: dts: stm32: Set gpio controller as interrupt controller on F4 and F7

This patch set each gpio controller as a interrupt controller. User who
wants to use gpio as interrupt will have choice to use either "gpiolib"
interface or "common" interrupt interface.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Alexandre TORGUE <alexandre.torgue@st.com>

diff --git a/arch/arm/boot/dts/stm32f429.dtsi b/arch/arm/boot/dts/stm32f429.dtsi
index 936db6b60f9df0c582442d3aedc5e94113f165bc..53f83511c7174ffc4468b59094c341862c14c008 100644 (file)
--- a/arch/arm/boot/dts/stm32f429.dtsi
+++ b/arch/arm/boot/dts/stm32f429.dtsi
@@ -578,6 +578,8 @@ pinctrl: pin-controller {
                        gpioa: gpio@40020000 {
                                gpio-controller;
                                #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
                                reg = <0x0 0x400>;
                                clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOA)>;
                                st,bank-name = "GPIOA";
@@ -586,6 +588,8 @@ gpioa: gpio@40020000 {
                        gpiob: gpio@40020400 {
                                gpio-controller;
                                #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
                                reg = <0x400 0x400>;
                                clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOB)>;
                                st,bank-name = "GPIOB";
@@ -594,6 +598,8 @@ gpiob: gpio@40020400 {
                        gpioc: gpio@40020800 {
                                gpio-controller;
                                #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
                                reg = <0x800 0x400>;
                                clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOC)>;
                                st,bank-name = "GPIOC";
@@ -602,6 +608,8 @@ gpioc: gpio@40020800 {
                        gpiod: gpio@40020c00 {
                                gpio-controller;
                                #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
                                reg = <0xc00 0x400>;
                                clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOD)>;
                                st,bank-name = "GPIOD";
@@ -610,6 +618,8 @@ gpiod: gpio@40020c00 {
                        gpioe: gpio@40021000 {
                                gpio-controller;
                                #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
                                reg = <0x1000 0x400>;
                                clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOE)>;
                                st,bank-name = "GPIOE";
@@ -618,6 +628,8 @@ gpioe: gpio@40021000 {
                        gpiof: gpio@40021400 {
                                gpio-controller;
                                #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
                                reg = <0x1400 0x400>;
                                clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOF)>;
                                st,bank-name = "GPIOF";
@@ -626,6 +638,8 @@ gpiof: gpio@40021400 {
                        gpiog: gpio@40021800 {
                                gpio-controller;
                                #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
                                reg = <0x1800 0x400>;
                                clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOG)>;
                                st,bank-name = "GPIOG";
@@ -634,6 +648,8 @@ gpiog: gpio@40021800 {
                        gpioh: gpio@40021c00 {
                                gpio-controller;
                                #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
                                reg = <0x1c00 0x400>;
                                clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOH)>;
                                st,bank-name = "GPIOH";
@@ -642,6 +658,8 @@ gpioh: gpio@40021c00 {
                        gpioi: gpio@40022000 {
                                gpio-controller;
                                #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
                                reg = <0x2000 0x400>;
                                clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOI)>;
                                st,bank-name = "GPIOI";
@@ -650,6 +668,8 @@ gpioi: gpio@40022000 {
                        gpioj: gpio@40022400 {
                                gpio-controller;
                                #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
                                reg = <0x2400 0x400>;
                                clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOJ)>;
                                st,bank-name = "GPIOJ";
@@ -658,6 +678,8 @@ gpioj: gpio@40022400 {
                        gpiok: gpio@40022800 {
                                gpio-controller;
                                #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
                                reg = <0x2800 0x400>;
                                clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOK)>;
                                st,bank-name = "GPIOK";

diff --git a/arch/arm/boot/dts/stm32f746.dtsi b/arch/arm/boot/dts/stm32f746.dtsi
index 449f727c3476ba30900c8ef481a554f2e987b3cf..d6b1b56f340cb24cb0ecdd1d2aef555ad044dc99 100644 (file)
--- a/arch/arm/boot/dts/stm32f746.dtsi
+++ b/arch/arm/boot/dts/stm32f746.dtsi
@@ -229,6 +229,8 @@ pin-controller {
                        gpioa: gpio@40020000 {
                                gpio-controller;
                                #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
                                reg = <0x0 0x400>;
                                clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOA)>;
                                st,bank-name = "GPIOA";
@@ -237,6 +239,8 @@ gpioa: gpio@40020000 {
                        gpiob: gpio@40020400 {
                                gpio-controller;
                                #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
                                reg = <0x400 0x400>;
                                clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOB)>;
                                st,bank-name = "GPIOB";
@@ -245,6 +249,8 @@ gpiob: gpio@40020400 {
                        gpioc: gpio@40020800 {
                                gpio-controller;
                                #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
                                reg = <0x800 0x400>;
                                clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOC)>;
                                st,bank-name = "GPIOC";
@@ -253,6 +259,8 @@ gpioc: gpio@40020800 {
                        gpiod: gpio@40020c00 {
                                gpio-controller;
                                #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
                                reg = <0xc00 0x400>;
                                clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOD)>;
                                st,bank-name = "GPIOD";
@@ -261,6 +269,8 @@ gpiod: gpio@40020c00 {
                        gpioe: gpio@40021000 {
                                gpio-controller;
                                #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
                                reg = <0x1000 0x400>;
                                clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOE)>;
                                st,bank-name = "GPIOE";
@@ -269,6 +279,8 @@ gpioe: gpio@40021000 {
                        gpiof: gpio@40021400 {
                                gpio-controller;
                                #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
                                reg = <0x1400 0x400>;
                                clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOF)>;
                                st,bank-name = "GPIOF";
@@ -277,6 +289,8 @@ gpiof: gpio@40021400 {
                        gpiog: gpio@40021800 {
                                gpio-controller;
                                #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
                                reg = <0x1800 0x400>;
                                clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOG)>;
                                st,bank-name = "GPIOG";
@@ -285,6 +299,8 @@ gpiog: gpio@40021800 {
                        gpioh: gpio@40021c00 {
                                gpio-controller;
                                #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
                                reg = <0x1c00 0x400>;
                                clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOH)>;
                                st,bank-name = "GPIOH";
@@ -293,6 +309,8 @@ gpioh: gpio@40021c00 {
                        gpioi: gpio@40022000 {
                                gpio-controller;
                                #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
                                reg = <0x2000 0x400>;
                                clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOI)>;
                                st,bank-name = "GPIOI";
@@ -301,6 +319,8 @@ gpioi: gpio@40022000 {
                        gpioj: gpio@40022400 {
                                gpio-controller;
                                #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
                                reg = <0x2400 0x400>;
                                clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOJ)>;
                                st,bank-name = "GPIOJ";
@@ -309,6 +329,8 @@ gpioj: gpio@40022400 {
                        gpiok: gpio@40022800 {
                                gpio-controller;
                                #gpio-cells = <2>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
                                reg = <0x2800 0x400>;
                                clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOK)>;
                                st,bank-name = "GPIOK";