Skip to content

L
linux
Commit 5489d5db authored by Alexandre TORGUE's avatar Alexandre TORGUE
Browse files
Options

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: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarAlexandre TORGUE <alexandre.torgue@st.com>
parent 7bffbd2d
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 0 deletions
arch/arm/boot/dts/stm32f429.dtsi
View file @ 5489d5db
...@@ -578,6 +578,8 @@ pinctrl: pin-controller { ...@@ -578,6 +578,8 @@ pinctrl: pin-controller {
gpioa: gpio@40020000 { gpioa: gpio@40020000 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x0 0x400>; reg = <0x0 0x400>;
clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOA)>; clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOA)>;
st,bank-name = "GPIOA"; st,bank-name = "GPIOA";
...@@ -586,6 +588,8 @@ gpioa: gpio@40020000 { ...@@ -586,6 +588,8 @@ gpioa: gpio@40020000 {
gpiob: gpio@40020400 { gpiob: gpio@40020400 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x400 0x400>; reg = <0x400 0x400>;
clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOB)>; clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOB)>;
st,bank-name = "GPIOB"; st,bank-name = "GPIOB";
...@@ -594,6 +598,8 @@ gpiob: gpio@40020400 { ...@@ -594,6 +598,8 @@ gpiob: gpio@40020400 {
gpioc: gpio@40020800 { gpioc: gpio@40020800 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x800 0x400>; reg = <0x800 0x400>;
clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOC)>; clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOC)>;
st,bank-name = "GPIOC"; st,bank-name = "GPIOC";
...@@ -602,6 +608,8 @@ gpioc: gpio@40020800 { ...@@ -602,6 +608,8 @@ gpioc: gpio@40020800 {
gpiod: gpio@40020c00 { gpiod: gpio@40020c00 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0xc00 0x400>; reg = <0xc00 0x400>;
clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOD)>; clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOD)>;
st,bank-name = "GPIOD"; st,bank-name = "GPIOD";
...@@ -610,6 +618,8 @@ gpiod: gpio@40020c00 { ...@@ -610,6 +618,8 @@ gpiod: gpio@40020c00 {
gpioe: gpio@40021000 { gpioe: gpio@40021000 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x1000 0x400>; reg = <0x1000 0x400>;
clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOE)>; clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOE)>;
st,bank-name = "GPIOE"; st,bank-name = "GPIOE";
...@@ -618,6 +628,8 @@ gpioe: gpio@40021000 { ...@@ -618,6 +628,8 @@ gpioe: gpio@40021000 {
gpiof: gpio@40021400 { gpiof: gpio@40021400 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x1400 0x400>; reg = <0x1400 0x400>;
clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOF)>; clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOF)>;
st,bank-name = "GPIOF"; st,bank-name = "GPIOF";
...@@ -626,6 +638,8 @@ gpiof: gpio@40021400 { ...@@ -626,6 +638,8 @@ gpiof: gpio@40021400 {
gpiog: gpio@40021800 { gpiog: gpio@40021800 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x1800 0x400>; reg = <0x1800 0x400>;
clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOG)>; clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOG)>;
st,bank-name = "GPIOG"; st,bank-name = "GPIOG";
...@@ -634,6 +648,8 @@ gpiog: gpio@40021800 { ...@@ -634,6 +648,8 @@ gpiog: gpio@40021800 {
gpioh: gpio@40021c00 { gpioh: gpio@40021c00 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x1c00 0x400>; reg = <0x1c00 0x400>;
clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOH)>; clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOH)>;
st,bank-name = "GPIOH"; st,bank-name = "GPIOH";
...@@ -642,6 +658,8 @@ gpioh: gpio@40021c00 { ...@@ -642,6 +658,8 @@ gpioh: gpio@40021c00 {
gpioi: gpio@40022000 { gpioi: gpio@40022000 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x2000 0x400>; reg = <0x2000 0x400>;
clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOI)>; clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOI)>;
st,bank-name = "GPIOI"; st,bank-name = "GPIOI";
...@@ -650,6 +668,8 @@ gpioi: gpio@40022000 { ...@@ -650,6 +668,8 @@ gpioi: gpio@40022000 {
gpioj: gpio@40022400 { gpioj: gpio@40022400 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x2400 0x400>; reg = <0x2400 0x400>;
clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOJ)>; clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOJ)>;
st,bank-name = "GPIOJ"; st,bank-name = "GPIOJ";
...@@ -658,6 +678,8 @@ gpioj: gpio@40022400 { ...@@ -658,6 +678,8 @@ gpioj: gpio@40022400 {
gpiok: gpio@40022800 { gpiok: gpio@40022800 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x2800 0x400>; reg = <0x2800 0x400>;
clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOK)>; clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOK)>;
st,bank-name = "GPIOK"; st,bank-name = "GPIOK";
......
arch/arm/boot/dts/stm32f746.dtsi
View file @ 5489d5db
...@@ -229,6 +229,8 @@ pin-controller { ...@@ -229,6 +229,8 @@ pin-controller {
gpioa: gpio@40020000 { gpioa: gpio@40020000 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x0 0x400>; reg = <0x0 0x400>;
clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOA)>; clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOA)>;
st,bank-name = "GPIOA"; st,bank-name = "GPIOA";
...@@ -237,6 +239,8 @@ gpioa: gpio@40020000 { ...@@ -237,6 +239,8 @@ gpioa: gpio@40020000 {
gpiob: gpio@40020400 { gpiob: gpio@40020400 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x400 0x400>; reg = <0x400 0x400>;
clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOB)>; clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOB)>;
st,bank-name = "GPIOB"; st,bank-name = "GPIOB";
...@@ -245,6 +249,8 @@ gpiob: gpio@40020400 { ...@@ -245,6 +249,8 @@ gpiob: gpio@40020400 {
gpioc: gpio@40020800 { gpioc: gpio@40020800 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x800 0x400>; reg = <0x800 0x400>;
clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOC)>; clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOC)>;
st,bank-name = "GPIOC"; st,bank-name = "GPIOC";
...@@ -253,6 +259,8 @@ gpioc: gpio@40020800 { ...@@ -253,6 +259,8 @@ gpioc: gpio@40020800 {
gpiod: gpio@40020c00 { gpiod: gpio@40020c00 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0xc00 0x400>; reg = <0xc00 0x400>;
clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOD)>; clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOD)>;
st,bank-name = "GPIOD"; st,bank-name = "GPIOD";
...@@ -261,6 +269,8 @@ gpiod: gpio@40020c00 { ...@@ -261,6 +269,8 @@ gpiod: gpio@40020c00 {
gpioe: gpio@40021000 { gpioe: gpio@40021000 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x1000 0x400>; reg = <0x1000 0x400>;
clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOE)>; clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOE)>;
st,bank-name = "GPIOE"; st,bank-name = "GPIOE";
...@@ -269,6 +279,8 @@ gpioe: gpio@40021000 { ...@@ -269,6 +279,8 @@ gpioe: gpio@40021000 {
gpiof: gpio@40021400 { gpiof: gpio@40021400 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x1400 0x400>; reg = <0x1400 0x400>;
clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOF)>; clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOF)>;
st,bank-name = "GPIOF"; st,bank-name = "GPIOF";
...@@ -277,6 +289,8 @@ gpiof: gpio@40021400 { ...@@ -277,6 +289,8 @@ gpiof: gpio@40021400 {
gpiog: gpio@40021800 { gpiog: gpio@40021800 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x1800 0x400>; reg = <0x1800 0x400>;
clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOG)>; clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOG)>;
st,bank-name = "GPIOG"; st,bank-name = "GPIOG";
...@@ -285,6 +299,8 @@ gpiog: gpio@40021800 { ...@@ -285,6 +299,8 @@ gpiog: gpio@40021800 {
gpioh: gpio@40021c00 { gpioh: gpio@40021c00 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x1c00 0x400>; reg = <0x1c00 0x400>;
clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOH)>; clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOH)>;
st,bank-name = "GPIOH"; st,bank-name = "GPIOH";
...@@ -293,6 +309,8 @@ gpioh: gpio@40021c00 { ...@@ -293,6 +309,8 @@ gpioh: gpio@40021c00 {
gpioi: gpio@40022000 { gpioi: gpio@40022000 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x2000 0x400>; reg = <0x2000 0x400>;
clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOI)>; clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOI)>;
st,bank-name = "GPIOI"; st,bank-name = "GPIOI";
...@@ -301,6 +319,8 @@ gpioi: gpio@40022000 { ...@@ -301,6 +319,8 @@ gpioi: gpio@40022000 {
gpioj: gpio@40022400 { gpioj: gpio@40022400 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x2400 0x400>; reg = <0x2400 0x400>;
clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOJ)>; clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOJ)>;
st,bank-name = "GPIOJ"; st,bank-name = "GPIOJ";
...@@ -309,6 +329,8 @@ gpioj: gpio@40022400 { ...@@ -309,6 +329,8 @@ gpioj: gpio@40022400 {
gpiok: gpio@40022800 { gpiok: gpio@40022800 {
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x2800 0x400>; reg = <0x2800 0x400>;
clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOK)>; clocks = <&rcc 0 STM32F7_AHB1_CLOCK(GPIOK)>;
st,bank-name = "GPIOK"; st,bank-name = "GPIOK";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7