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

Commit e4541ff2 authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD
Browse files

at91: regroup gpio and pinctrl under the same ranges 



Fix also the reg size as we have 512 bytes bank not 256 bytes per gpio/mux
controller

Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
parent c18486e1

arch/arm/boot/dts/at91sam9260.dtsi

+33 −26
Original line number Original line Diff line number Diff line
@@ -98,9 +98,15 @@ 
				interrupts = <26 4 0 27 4 0 28 4 0>;

				interrupts = <26 4 0 27 4 0 28 4 0>;

			};

			};





			pinctrl@fffff400 {

				#address-cells = <1>;

				#size-cells = <1>;

				compatible = "atmel,at91rm9200-pinctrl", "simple-bus";

				ranges = <0xfffff400 0xfffff400 0x600>;



				pioA: gpio@fffff400 {

				pioA: gpio@fffff400 {

					compatible = "atmel,at91rm9200-gpio";

					compatible = "atmel,at91rm9200-gpio";

				reg = <0xfffff400 0x100>;

					reg = <0xfffff400 0x200>;

					interrupts = <2 4 1>;

					interrupts = <2 4 1>;

					#gpio-cells = <2>;

					#gpio-cells = <2>;

					gpio-controller;

					gpio-controller;
@@ -110,7 +116,7 @@ 




				pioB: gpio@fffff600 {

				pioB: gpio@fffff600 {

					compatible = "atmel,at91rm9200-gpio";

					compatible = "atmel,at91rm9200-gpio";

				reg = <0xfffff600 0x100>;

					reg = <0xfffff600 0x200>;

					interrupts = <3 4 1>;

					interrupts = <3 4 1>;

					#gpio-cells = <2>;

					#gpio-cells = <2>;

					gpio-controller;

					gpio-controller;
@@ -120,13 +126,14 @@ 




				pioC: gpio@fffff800 {

				pioC: gpio@fffff800 {

					compatible = "atmel,at91rm9200-gpio";

					compatible = "atmel,at91rm9200-gpio";

				reg = <0xfffff800 0x100>;

					reg = <0xfffff800 0x200>;

					interrupts = <4 4 1>;

					interrupts = <4 4 1>;

					#gpio-cells = <2>;

					#gpio-cells = <2>;

					gpio-controller;

					gpio-controller;

					interrupt-controller;

					interrupt-controller;

					#interrupt-cells = <2>;

					#interrupt-cells = <2>;

				};

				};

			};





			dbgu: serial@fffff200 {

			dbgu: serial@fffff200 {

				compatible = "atmel,at91sam9260-usart";

				compatible = "atmel,at91sam9260-usart";

arch/arm/boot/dts/at91sam9263.dtsi

+54 −48
Original line number Original line Diff line number Diff line
@@ -89,9 +89,15 @@ 
				reg = <0xfffffd10 0x10>;

				reg = <0xfffffd10 0x10>;

			};

			};





			pinctrl@fffff200 {

				#address-cells = <1>;

				#size-cells = <1>;

				compatible = "atmel,at91rm9200-pinctrl", "simple-bus";

				ranges = <0xfffff200 0xfffff200 0xa00>;



				pioA: gpio@fffff200 {

				pioA: gpio@fffff200 {

					compatible = "atmel,at91rm9200-gpio";

					compatible = "atmel,at91rm9200-gpio";

				reg = <0xfffff200 0x100>;

					reg = <0xfffff200 0x200>;

					interrupts = <2 4 1>;

					interrupts = <2 4 1>;

					#gpio-cells = <2>;

					#gpio-cells = <2>;

					gpio-controller;

					gpio-controller;
@@ -101,7 +107,7 @@ 




				pioB: gpio@fffff400 {

				pioB: gpio@fffff400 {

					compatible = "atmel,at91rm9200-gpio";

					compatible = "atmel,at91rm9200-gpio";

				reg = <0xfffff400 0x100>;

					reg = <0xfffff400 0x200>;

					interrupts = <3 4 1>;

					interrupts = <3 4 1>;

					#gpio-cells = <2>;

					#gpio-cells = <2>;

					gpio-controller;

					gpio-controller;
@@ -111,7 +117,7 @@ 




				pioC: gpio@fffff600 {

				pioC: gpio@fffff600 {

					compatible = "atmel,at91rm9200-gpio";

					compatible = "atmel,at91rm9200-gpio";

				reg = <0xfffff600 0x100>;

					reg = <0xfffff600 0x200>;

					interrupts = <4 4 1>;

					interrupts = <4 4 1>;

					#gpio-cells = <2>;

					#gpio-cells = <2>;

					gpio-controller;

					gpio-controller;
@@ -121,7 +127,7 @@ 




				pioD: gpio@fffff800 {

				pioD: gpio@fffff800 {

					compatible = "atmel,at91rm9200-gpio";

					compatible = "atmel,at91rm9200-gpio";

				reg = <0xfffff800 0x100>;

					reg = <0xfffff800 0x200>;

					interrupts = <4 4 1>;

					interrupts = <4 4 1>;

					#gpio-cells = <2>;

					#gpio-cells = <2>;

					gpio-controller;

					gpio-controller;
@@ -131,7 +137,7 @@ 




				pioE: gpio@fffffa00 {

				pioE: gpio@fffffa00 {

					compatible = "atmel,at91rm9200-gpio";

					compatible = "atmel,at91rm9200-gpio";

				reg = <0xfffffa00 0x100>;

					reg = <0xfffffa00 0x200>;

					interrupts = <4 4 1>;

					interrupts = <4 4 1>;

					#gpio-cells = <2>;

					#gpio-cells = <2>;

					gpio-controller;

					gpio-controller;

arch/arm/boot/dts/at91sam9g45.dtsi

+51 −44
Original line number Original line Diff line number Diff line
@@ -108,9 +108,15 @@ 
				interrupts = <21 4 0>;

				interrupts = <21 4 0>;

			};

			};





			pinctrl@fffff200 {

				#address-cells = <1>;

				#size-cells = <1>;

				compatible = "atmel,at91rm9200-pinctrl", "simple-bus";

				ranges = <0xfffff200 0xfffff200 0xa00>;



				pioA: gpio@fffff200 {

				pioA: gpio@fffff200 {

					compatible = "atmel,at91rm9200-gpio";

					compatible = "atmel,at91rm9200-gpio";

				reg = <0xfffff200 0x100>;

					reg = <0xfffff200 0x200>;

					interrupts = <2 4 1>;

					interrupts = <2 4 1>;

					#gpio-cells = <2>;

					#gpio-cells = <2>;

					gpio-controller;

					gpio-controller;
@@ -120,7 +126,7 @@ 




				pioB: gpio@fffff400 {

				pioB: gpio@fffff400 {

					compatible = "atmel,at91rm9200-gpio";

					compatible = "atmel,at91rm9200-gpio";

				reg = <0xfffff400 0x100>;

					reg = <0xfffff400 0x200>;

					interrupts = <3 4 1>;

					interrupts = <3 4 1>;

					#gpio-cells = <2>;

					#gpio-cells = <2>;

					gpio-controller;

					gpio-controller;
@@ -130,7 +136,7 @@ 




				pioC: gpio@fffff600 {

				pioC: gpio@fffff600 {

					compatible = "atmel,at91rm9200-gpio";

					compatible = "atmel,at91rm9200-gpio";

				reg = <0xfffff600 0x100>;

					reg = <0xfffff600 0x200>;

					interrupts = <4 4 1>;

					interrupts = <4 4 1>;

					#gpio-cells = <2>;

					#gpio-cells = <2>;

					gpio-controller;

					gpio-controller;
@@ -140,7 +146,7 @@ 




				pioD: gpio@fffff800 {

				pioD: gpio@fffff800 {

					compatible = "atmel,at91rm9200-gpio";

					compatible = "atmel,at91rm9200-gpio";

				reg = <0xfffff800 0x100>;

					reg = <0xfffff800 0x200>;

					interrupts = <5 4 1>;

					interrupts = <5 4 1>;

					#gpio-cells = <2>;

					#gpio-cells = <2>;

					gpio-controller;

					gpio-controller;
@@ -150,13 +156,14 @@ 




				pioE: gpio@fffffa00 {

				pioE: gpio@fffffa00 {

					compatible = "atmel,at91rm9200-gpio";

					compatible = "atmel,at91rm9200-gpio";

				reg = <0xfffffa00 0x100>;

					reg = <0xfffffa00 0x200>;

					interrupts = <5 4 1>;

					interrupts = <5 4 1>;

					#gpio-cells = <2>;

					#gpio-cells = <2>;

					gpio-controller;

					gpio-controller;

					interrupt-controller;

					interrupt-controller;

					#interrupt-cells = <2>;

					#interrupt-cells = <2>;

				};

				};

			};





			dbgu: serial@ffffee00 {

			dbgu: serial@ffffee00 {

				compatible = "atmel,at91sam9260-usart";

				compatible = "atmel,at91sam9260-usart";

arch/arm/boot/dts/at91sam9n12.dtsi

+45 −38
Original line number Original line Diff line number Diff line
@@ -102,9 +102,15 @@ 
				interrupts = <20 4 0>;

				interrupts = <20 4 0>;

			};

			};





			pinctrl@fffff400 {

				#address-cells = <1>;

				#size-cells = <1>;

				compatible = "atmel,at91rm9200-pinctrl", "simple-bus";

				ranges = <0xfffff400 0xfffff400 0x800>;



				pioA: gpio@fffff400 {

				pioA: gpio@fffff400 {

					compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";

					compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";

				reg = <0xfffff400 0x100>;

					reg = <0xfffff400 0x200>;

					interrupts = <2 4 1>;

					interrupts = <2 4 1>;

					#gpio-cells = <2>;

					#gpio-cells = <2>;

					gpio-controller;

					gpio-controller;
@@ -114,7 +120,7 @@ 




				pioB: gpio@fffff600 {

				pioB: gpio@fffff600 {

					compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";

					compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";

				reg = <0xfffff600 0x100>;

					reg = <0xfffff600 0x200>;

					interrupts = <2 4 1>;

					interrupts = <2 4 1>;

					#gpio-cells = <2>;

					#gpio-cells = <2>;

					gpio-controller;

					gpio-controller;
@@ -124,7 +130,7 @@ 




				pioC: gpio@fffff800 {

				pioC: gpio@fffff800 {

					compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";

					compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";

				reg = <0xfffff800 0x100>;

					reg = <0xfffff800 0x200>;

					interrupts = <3 4 1>;

					interrupts = <3 4 1>;

					#gpio-cells = <2>;

					#gpio-cells = <2>;

					gpio-controller;

					gpio-controller;
@@ -134,13 +140,14 @@ 




				pioD: gpio@fffffa00 {

				pioD: gpio@fffffa00 {

					compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";

					compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";

				reg = <0xfffffa00 0x100>;

					reg = <0xfffffa00 0x200>;

					interrupts = <3 4 1>;

					interrupts = <3 4 1>;

					#gpio-cells = <2>;

					#gpio-cells = <2>;

					gpio-controller;

					gpio-controller;

					interrupt-controller;

					interrupt-controller;

					#interrupt-cells = <2>;

					#interrupt-cells = <2>;

				};

				};

			};





			dbgu: serial@fffff200 {

			dbgu: serial@fffff200 {

				compatible = "atmel,at91sam9260-usart";

				compatible = "atmel,at91sam9260-usart";

arch/arm/boot/dts/at91sam9x5.dtsi

+42 −35
Original line number Original line Diff line number Diff line
@@ -111,9 +111,15 @@ 
				interrupts = <21 4 0>;

				interrupts = <21 4 0>;

			};

			};





			pinctrl@fffff200 {

				#address-cells = <1>;

				#size-cells = <1>;

				compatible = "atmel,at91rm9200-pinctrl", "simple-bus";

				ranges = <0xfffff400 0xfffff400 0x800>;



				pioA: gpio@fffff400 {

				pioA: gpio@fffff400 {

					compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";

					compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";

				reg = <0xfffff400 0x100>;

					reg = <0xfffff400 0x200>;

					interrupts = <2 4 1>;

					interrupts = <2 4 1>;

					#gpio-cells = <2>;

					#gpio-cells = <2>;

					gpio-controller;

					gpio-controller;
@@ -123,7 +129,7 @@ 




				pioB: gpio@fffff600 {

				pioB: gpio@fffff600 {

					compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";

					compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";

				reg = <0xfffff600 0x100>;

					reg = <0xfffff600 0x200>;

					interrupts = <2 4 1>;

					interrupts = <2 4 1>;

					#gpio-cells = <2>;

					#gpio-cells = <2>;

					gpio-controller;

					gpio-controller;
@@ -133,7 +139,7 @@ 




				pioC: gpio@fffff800 {

				pioC: gpio@fffff800 {

					compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";

					compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";

				reg = <0xfffff800 0x100>;

					reg = <0xfffff800 0x200>;

					interrupts = <3 4 1>;

					interrupts = <3 4 1>;

					#gpio-cells = <2>;

					#gpio-cells = <2>;

					gpio-controller;

					gpio-controller;
@@ -143,13 +149,14 @@ 




				pioD: gpio@fffffa00 {

				pioD: gpio@fffffa00 {

					compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";

					compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";

				reg = <0xfffffa00 0x100>;

					reg = <0xfffffa00 0x200>;

					interrupts = <3 4 1>;

					interrupts = <3 4 1>;

					#gpio-cells = <2>;

					#gpio-cells = <2>;

					gpio-controller;

					gpio-controller;

					interrupt-controller;

					interrupt-controller;

					#interrupt-cells = <2>;

					#interrupt-cells = <2>;

				};

				};

			};





			dbgu: serial@fffff200 {

			dbgu: serial@fffff200 {

				compatible = "atmel,at91sam9260-usart";

				compatible = "atmel,at91sam9260-usart";