Commit 652f5b5e authored by Olof Johansson's avatar Olof Johansson

Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes

From Nicolas Ferre:

Modify AT91 device tree files for making the GPIO interrupts work.

* tag 'at91-fixes' of git://github.com/at91linux/linux-at91:
  ARM: at91: fix missing #interrupt-cells on gpio-controller
parents 0921dcea 51ac51a6
...@@ -104,6 +104,7 @@ pioA: gpio@fffff400 { ...@@ -104,6 +104,7 @@ pioA: gpio@fffff400 {
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>;
}; };
pioB: gpio@fffff600 { pioB: gpio@fffff600 {
...@@ -113,6 +114,7 @@ pioB: gpio@fffff600 { ...@@ -113,6 +114,7 @@ pioB: gpio@fffff600 {
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>;
}; };
pioC: gpio@fffff800 { pioC: gpio@fffff800 {
...@@ -122,6 +124,7 @@ pioC: gpio@fffff800 { ...@@ -122,6 +124,7 @@ pioC: gpio@fffff800 {
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>;
}; };
dbgu: serial@fffff200 { dbgu: serial@fffff200 {
......
...@@ -95,6 +95,7 @@ pioA: gpio@fffff200 { ...@@ -95,6 +95,7 @@ pioA: gpio@fffff200 {
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>;
}; };
pioB: gpio@fffff400 { pioB: gpio@fffff400 {
...@@ -104,6 +105,7 @@ pioB: gpio@fffff400 { ...@@ -104,6 +105,7 @@ pioB: gpio@fffff400 {
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>;
}; };
pioC: gpio@fffff600 { pioC: gpio@fffff600 {
...@@ -113,6 +115,7 @@ pioC: gpio@fffff600 { ...@@ -113,6 +115,7 @@ pioC: gpio@fffff600 {
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>;
}; };
pioD: gpio@fffff800 { pioD: gpio@fffff800 {
...@@ -122,6 +125,7 @@ pioD: gpio@fffff800 { ...@@ -122,6 +125,7 @@ pioD: gpio@fffff800 {
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>;
}; };
pioE: gpio@fffffa00 { pioE: gpio@fffffa00 {
...@@ -131,6 +135,7 @@ pioE: gpio@fffffa00 { ...@@ -131,6 +135,7 @@ pioE: gpio@fffffa00 {
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>;
}; };
dbgu: serial@ffffee00 { dbgu: serial@ffffee00 {
......
...@@ -113,6 +113,7 @@ pioA: gpio@fffff200 { ...@@ -113,6 +113,7 @@ pioA: gpio@fffff200 {
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>;
}; };
pioB: gpio@fffff400 { pioB: gpio@fffff400 {
...@@ -122,6 +123,7 @@ pioB: gpio@fffff400 { ...@@ -122,6 +123,7 @@ pioB: gpio@fffff400 {
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>;
}; };
pioC: gpio@fffff600 { pioC: gpio@fffff600 {
...@@ -131,6 +133,7 @@ pioC: gpio@fffff600 { ...@@ -131,6 +133,7 @@ pioC: gpio@fffff600 {
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>;
}; };
pioD: gpio@fffff800 { pioD: gpio@fffff800 {
...@@ -140,6 +143,7 @@ pioD: gpio@fffff800 { ...@@ -140,6 +143,7 @@ pioD: gpio@fffff800 {
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>;
}; };
pioE: gpio@fffffa00 { pioE: gpio@fffffa00 {
...@@ -149,6 +153,7 @@ pioE: gpio@fffffa00 { ...@@ -149,6 +153,7 @@ pioE: gpio@fffffa00 {
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>;
}; };
dbgu: serial@ffffee00 { dbgu: serial@ffffee00 {
......
...@@ -107,6 +107,7 @@ pioA: gpio@fffff400 { ...@@ -107,6 +107,7 @@ pioA: gpio@fffff400 {
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>;
}; };
pioB: gpio@fffff600 { pioB: gpio@fffff600 {
...@@ -116,6 +117,7 @@ pioB: gpio@fffff600 { ...@@ -116,6 +117,7 @@ pioB: gpio@fffff600 {
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>;
}; };
pioC: gpio@fffff800 { pioC: gpio@fffff800 {
...@@ -125,6 +127,7 @@ pioC: gpio@fffff800 { ...@@ -125,6 +127,7 @@ pioC: gpio@fffff800 {
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>;
}; };
pioD: gpio@fffffa00 { pioD: gpio@fffffa00 {
...@@ -134,6 +137,7 @@ pioD: gpio@fffffa00 { ...@@ -134,6 +137,7 @@ pioD: gpio@fffffa00 {
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>;
}; };
dbgu: serial@fffff200 { dbgu: serial@fffff200 {
......
...@@ -115,6 +115,7 @@ pioA: gpio@fffff400 { ...@@ -115,6 +115,7 @@ pioA: gpio@fffff400 {
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>;
}; };
pioB: gpio@fffff600 { pioB: gpio@fffff600 {
...@@ -124,6 +125,7 @@ pioB: gpio@fffff600 { ...@@ -124,6 +125,7 @@ pioB: gpio@fffff600 {
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>;
}; };
pioC: gpio@fffff800 { pioC: gpio@fffff800 {
...@@ -133,6 +135,7 @@ pioC: gpio@fffff800 { ...@@ -133,6 +135,7 @@ pioC: gpio@fffff800 {
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>;
}; };
pioD: gpio@fffffa00 { pioD: gpio@fffffa00 {
...@@ -142,6 +145,7 @@ pioD: gpio@fffffa00 { ...@@ -142,6 +145,7 @@ pioD: gpio@fffffa00 {
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>;
}; };
dbgu: serial@fffff200 { dbgu: serial@fffff200 {
......
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