Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/arm/boot/dts/at91sam9260.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			pioB: gpio@fffff600 {
@@ -113,6 +114,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			pioC: gpio@fffff800 {
@@ -122,6 +124,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			dbgu: serial@fffff200 {

arch/arm/boot/dts/at91sam9263.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			pioB: gpio@fffff400 {
@@ -104,6 +105,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			pioC: gpio@fffff600 {
@@ -113,6 +115,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			pioD: gpio@fffff800 {
@@ -122,6 +125,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			pioE: gpio@fffffa00 {
@@ -131,6 +135,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			dbgu: serial@ffffee00 {

arch/arm/boot/dts/at91sam9g45.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			pioB: gpio@fffff400 {
@@ -122,6 +123,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			pioC: gpio@fffff600 {
@@ -131,6 +133,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			pioD: gpio@fffff800 {
@@ -140,6 +143,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			pioE: gpio@fffffa00 {
@@ -149,6 +153,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			dbgu: serial@ffffee00 {

arch/arm/boot/dts/at91sam9n12.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			pioB: gpio@fffff600 {
@@ -116,6 +117,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			pioC: gpio@fffff800 {
@@ -125,6 +127,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			pioD: gpio@fffffa00 {
@@ -134,6 +137,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			dbgu: serial@fffff200 {

arch/arm/boot/dts/at91sam9x5.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			pioB: gpio@fffff600 {
@@ -124,6 +125,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			pioC: gpio@fffff800 {
@@ -133,6 +135,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			pioD: gpio@fffffa00 {
@@ -142,6 +145,7 @@ 
				#gpio-cells = <2>;

				gpio-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

			};



			dbgu: serial@fffff200 {