Skip to content

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

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
Hide whitespace changes
Inline Side-by-side
Showing with 225 additions and 191 deletions
arch/arm/boot/dts/at91sam9260.dtsi
View file @ e4541ff2
...@@ -98,34 +98,41 @@ tcb1: timer@fffdc000 { ...@@ -98,34 +98,41 @@ tcb1: timer@fffdc000 {
interrupts = <26 4 0 27 4 0 28 4 0>; interrupts = <26 4 0 27 4 0 28 4 0>;
}; };
pioA: gpio@fffff400 { pinctrl@fffff400 {
compatible = "atmel,at91rm9200-gpio"; #address-cells = <1>;
reg = <0xfffff400 0x100>; #size-cells = <1>;
interrupts = <2 4 1>; compatible = "atmel,at91rm9200-pinctrl", "simple-bus";
#gpio-cells = <2>; ranges = <0xfffff400 0xfffff400 0x600>;
gpio-controller;
interrupt-controller; pioA: gpio@fffff400 {
#interrupt-cells = <2>; compatible = "atmel,at91rm9200-gpio";
}; reg = <0xfffff400 0x200>;
interrupts = <2 4 1>;
#gpio-cells = <2>;
gpio-controller;
interrupt-controller;
#interrupt-cells = <2>;
};
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;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
}; };
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 {
......
arch/arm/boot/dts/at91sam9263.dtsi
View file @ e4541ff2
...@@ -89,54 +89,60 @@ shdwc@fffffd10 { ...@@ -89,54 +89,60 @@ shdwc@fffffd10 {
reg = <0xfffffd10 0x10>; reg = <0xfffffd10 0x10>;
}; };
pioA: gpio@fffff200 { pinctrl@fffff200 {
compatible = "atmel,at91rm9200-gpio"; #address-cells = <1>;
reg = <0xfffff200 0x100>; #size-cells = <1>;
interrupts = <2 4 1>; compatible = "atmel,at91rm9200-pinctrl", "simple-bus";
#gpio-cells = <2>; ranges = <0xfffff200 0xfffff200 0xa00>;
gpio-controller;
interrupt-controller; pioA: gpio@fffff200 {
#interrupt-cells = <2>; compatible = "atmel,at91rm9200-gpio";
}; reg = <0xfffff200 0x200>;
interrupts = <2 4 1>;
pioB: gpio@fffff400 { #gpio-cells = <2>;
compatible = "atmel,at91rm9200-gpio"; gpio-controller;
reg = <0xfffff400 0x100>; interrupt-controller;
interrupts = <3 4 1>; #interrupt-cells = <2>;
#gpio-cells = <2>; };
gpio-controller;
interrupt-controller; pioB: gpio@fffff400 {
#interrupt-cells = <2>; compatible = "atmel,at91rm9200-gpio";
}; reg = <0xfffff400 0x200>;
interrupts = <3 4 1>;
pioC: gpio@fffff600 { #gpio-cells = <2>;
compatible = "atmel,at91rm9200-gpio"; gpio-controller;
reg = <0xfffff600 0x100>; interrupt-controller;
interrupts = <4 4 1>; #interrupt-cells = <2>;
#gpio-cells = <2>; };
gpio-controller;
interrupt-controller; pioC: gpio@fffff600 {
#interrupt-cells = <2>; compatible = "atmel,at91rm9200-gpio";
}; reg = <0xfffff600 0x200>;
interrupts = <4 4 1>;
pioD: gpio@fffff800 { #gpio-cells = <2>;
compatible = "atmel,at91rm9200-gpio"; gpio-controller;
reg = <0xfffff800 0x100>; interrupt-controller;
interrupts = <4 4 1>; #interrupt-cells = <2>;
#gpio-cells = <2>; };
gpio-controller;
interrupt-controller; pioD: gpio@fffff800 {
#interrupt-cells = <2>; compatible = "atmel,at91rm9200-gpio";
}; reg = <0xfffff800 0x200>;
interrupts = <4 4 1>;
pioE: gpio@fffffa00 { #gpio-cells = <2>;
compatible = "atmel,at91rm9200-gpio"; gpio-controller;
reg = <0xfffffa00 0x100>; interrupt-controller;
interrupts = <4 4 1>; #interrupt-cells = <2>;
#gpio-cells = <2>; };
gpio-controller;
interrupt-controller; pioE: gpio@fffffa00 {
#interrupt-cells = <2>; compatible = "atmel,at91rm9200-gpio";
reg = <0xfffffa00 0x200>;
interrupts = <4 4 1>;
#gpio-cells = <2>;
gpio-controller;
interrupt-controller;
#interrupt-cells = <2>;
}; };
dbgu: serial@ffffee00 { dbgu: serial@ffffee00 {
......
arch/arm/boot/dts/at91sam9g45.dtsi
View file @ e4541ff2
...@@ -108,54 +108,61 @@ dma: dma-controller@ffffec00 { ...@@ -108,54 +108,61 @@ dma: dma-controller@ffffec00 {
interrupts = <21 4 0>; interrupts = <21 4 0>;
}; };
pioA: gpio@fffff200 { pinctrl@fffff200 {
compatible = "atmel,at91rm9200-gpio"; #address-cells = <1>;
reg = <0xfffff200 0x100>; #size-cells = <1>;
interrupts = <2 4 1>; compatible = "atmel,at91rm9200-pinctrl", "simple-bus";
#gpio-cells = <2>; ranges = <0xfffff200 0xfffff200 0xa00>;
gpio-controller;
interrupt-controller; pioA: gpio@fffff200 {
#interrupt-cells = <2>; compatible = "atmel,at91rm9200-gpio";
}; reg = <0xfffff200 0x200>;
interrupts = <2 4 1>;
#gpio-cells = <2>;
gpio-controller;
interrupt-controller;
#interrupt-cells = <2>;
};
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;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
}; };
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;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
}; };
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;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
}; };
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 {
......
arch/arm/boot/dts/at91sam9n12.dtsi
View file @ e4541ff2
...@@ -102,44 +102,51 @@ dma: dma-controller@ffffec00 { ...@@ -102,44 +102,51 @@ dma: dma-controller@ffffec00 {
interrupts = <20 4 0>; interrupts = <20 4 0>;
}; };
pioA: gpio@fffff400 { pinctrl@fffff400 {
compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; #address-cells = <1>;
reg = <0xfffff400 0x100>; #size-cells = <1>;
interrupts = <2 4 1>; compatible = "atmel,at91rm9200-pinctrl", "simple-bus";
#gpio-cells = <2>; ranges = <0xfffff400 0xfffff400 0x800>;
gpio-controller;
interrupt-controller; pioA: gpio@fffff400 {
#interrupt-cells = <2>; compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
}; reg = <0xfffff400 0x200>;
interrupts = <2 4 1>;
pioB: gpio@fffff600 { #gpio-cells = <2>;
compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; gpio-controller;
reg = <0xfffff600 0x100>; interrupt-controller;
interrupts = <2 4 1>; #interrupt-cells = <2>;
#gpio-cells = <2>; };
gpio-controller;
interrupt-controller; pioB: gpio@fffff600 {
#interrupt-cells = <2>; compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
}; reg = <0xfffff600 0x200>;
interrupts = <2 4 1>;
pioC: gpio@fffff800 { #gpio-cells = <2>;
compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; gpio-controller;
reg = <0xfffff800 0x100>; interrupt-controller;
interrupts = <3 4 1>; #interrupt-cells = <2>;
#gpio-cells = <2>; };
gpio-controller;
interrupt-controller; pioC: gpio@fffff800 {
#interrupt-cells = <2>; compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
}; reg = <0xfffff800 0x200>;
interrupts = <3 4 1>;
pioD: gpio@fffffa00 { #gpio-cells = <2>;
compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; gpio-controller;
reg = <0xfffffa00 0x100>; interrupt-controller;
interrupts = <3 4 1>; #interrupt-cells = <2>;
#gpio-cells = <2>; };
gpio-controller;
interrupt-controller; pioD: gpio@fffffa00 {
#interrupt-cells = <2>; compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
reg = <0xfffffa00 0x200>;
interrupts = <3 4 1>;
#gpio-cells = <2>;
gpio-controller;
interrupt-controller;
#interrupt-cells = <2>;
};
}; };
dbgu: serial@fffff200 { dbgu: serial@fffff200 {
......
arch/arm/boot/dts/at91sam9x5.dtsi
View file @ e4541ff2
...@@ -111,44 +111,51 @@ dma1: dma-controller@ffffee00 { ...@@ -111,44 +111,51 @@ dma1: dma-controller@ffffee00 {
interrupts = <21 4 0>; interrupts = <21 4 0>;
}; };
pioA: gpio@fffff400 { pinctrl@fffff200 {
compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; #address-cells = <1>;
reg = <0xfffff400 0x100>; #size-cells = <1>;
interrupts = <2 4 1>; compatible = "atmel,at91rm9200-pinctrl", "simple-bus";
#gpio-cells = <2>; ranges = <0xfffff400 0xfffff400 0x800>;
gpio-controller;
interrupt-controller; pioA: gpio@fffff400 {
#interrupt-cells = <2>; compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
}; reg = <0xfffff400 0x200>;
interrupts = <2 4 1>;
#gpio-cells = <2>;
gpio-controller;
interrupt-controller;
#interrupt-cells = <2>;
};
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;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
}; };
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;
interrupt-controller; interrupt-controller;
#interrupt-cells = <2>; #interrupt-cells = <2>;
}; };
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 {
......
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