diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-09-19 16:53:01 -0400 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2012-09-22 10:51:40 -0400 |
commit | 397d59f3b59e32236a0b74803d636c061d537aef (patch) | |
tree | 1d0cbfcbe4971075be289297fdcd3784c2256a5e /arch/arm/boot/dts | |
parent | 93a59cf3d345d84e2edf43ec37301d09c5003934 (diff) |
arm: mvebu: add DT information for GPIO banks on Armada 370 and XP
The gpioX aliases are needed so that the driver can use
of_alias_get_id() to get a 0-based number of the GPIO bank, which we
then use to compute the base GPIO of the bank being probed. This is
similar to what gpio-mxs.c is doing.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Gregory Clement <gregory.clement@free-electrons.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/boot/dts')
-rw-r--r-- | arch/arm/boot/dts/armada-370.dtsi | 39 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-xp-mv78230.dtsi | 29 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-xp-mv78260.dtsi | 42 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-xp-mv78460.dtsi | 42 |
4 files changed, 152 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi index 2bfb904a8248..2069151afe01 100644 --- a/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/armada-370.dtsi | |||
@@ -21,6 +21,12 @@ | |||
21 | model = "Marvell Armada 370 family SoC"; | 21 | model = "Marvell Armada 370 family SoC"; |
22 | compatible = "marvell,armada370", "marvell,armada-370-xp"; | 22 | compatible = "marvell,armada370", "marvell,armada-370-xp"; |
23 | 23 | ||
24 | aliases { | ||
25 | gpio0 = &gpio0; | ||
26 | gpio1 = &gpio1; | ||
27 | gpio2 = &gpio2; | ||
28 | }; | ||
29 | |||
24 | mpic: interrupt-controller@d0020000 { | 30 | mpic: interrupt-controller@d0020000 { |
25 | reg = <0xd0020a00 0x1d0>, | 31 | reg = <0xd0020a00 0x1d0>, |
26 | <0xd0021870 0x58>; | 32 | <0xd0021870 0x58>; |
@@ -35,6 +41,39 @@ | |||
35 | pinctrl { | 41 | pinctrl { |
36 | compatible = "marvell,mv88f6710-pinctrl"; | 42 | compatible = "marvell,mv88f6710-pinctrl"; |
37 | reg = <0xd0018000 0x38>; | 43 | reg = <0xd0018000 0x38>; |
44 | }; | ||
45 | |||
46 | gpio0: gpio@d0018100 { | ||
47 | compatible = "marvell,orion-gpio"; | ||
48 | reg = <0xd0018100 0x40>; | ||
49 | ngpios = <32>; | ||
50 | gpio-controller; | ||
51 | #gpio-cells = <2>; | ||
52 | interrupt-controller; | ||
53 | #interrupts-cells = <2>; | ||
54 | interrupts = <82>, <83>, <84>, <85>; | ||
55 | }; | ||
56 | |||
57 | gpio1: gpio@d0018140 { | ||
58 | compatible = "marvell,orion-gpio"; | ||
59 | reg = <0xd0018140 0x40>; | ||
60 | ngpios = <32>; | ||
61 | gpio-controller; | ||
62 | #gpio-cells = <2>; | ||
63 | interrupt-controller; | ||
64 | #interrupts-cells = <2>; | ||
65 | interrupts = <87>, <88>, <89>, <90>; | ||
66 | }; | ||
67 | |||
68 | gpio2: gpio@d0018180 { | ||
69 | compatible = "marvell,orion-gpio"; | ||
70 | reg = <0xd0018180 0x40>; | ||
71 | ngpios = <2>; | ||
72 | gpio-controller; | ||
73 | #gpio-cells = <2>; | ||
74 | interrupt-controller; | ||
75 | #interrupts-cells = <2>; | ||
76 | interrupts = <91>; | ||
38 | }; | 77 | }; |
39 | }; | 78 | }; |
40 | }; | 79 | }; |
diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi index 38ede3d68419..ea355192be6f 100644 --- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi | |||
@@ -19,10 +19,39 @@ | |||
19 | model = "Marvell Armada XP MV78230 SoC"; | 19 | model = "Marvell Armada XP MV78230 SoC"; |
20 | compatible = "marvell,armadaxp-mv78230", "marvell,armadaxp", "marvell,armada-370-xp"; | 20 | compatible = "marvell,armadaxp-mv78230", "marvell,armadaxp", "marvell,armada-370-xp"; |
21 | 21 | ||
22 | aliases { | ||
23 | gpio0 = &gpio0; | ||
24 | gpio1 = &gpio1; | ||
25 | }; | ||
26 | |||
22 | soc { | 27 | soc { |
23 | pinctrl { | 28 | pinctrl { |
24 | compatible = "marvell,mv78230-pinctrl"; | 29 | compatible = "marvell,mv78230-pinctrl"; |
25 | reg = <0xd0018000 0x38>; | 30 | reg = <0xd0018000 0x38>; |
26 | }; | 31 | }; |
32 | |||
33 | gpio0: gpio@d0018100 { | ||
34 | compatible = "marvell,armadaxp-gpio"; | ||
35 | reg = <0xd0018100 0x40>, | ||
36 | <0xd0018800 0x30>; | ||
37 | ngpios = <32>; | ||
38 | gpio-controller; | ||
39 | #gpio-cells = <2>; | ||
40 | interrupt-controller; | ||
41 | #interrupts-cells = <2>; | ||
42 | interrupts = <16>, <17>, <18>, <19>; | ||
43 | }; | ||
44 | |||
45 | gpio1: gpio@d0018140 { | ||
46 | compatible = "marvell,armadaxp-gpio"; | ||
47 | reg = <0xd0018140 0x40>, | ||
48 | <0xd0018840 0x30>; | ||
49 | ngpios = <17>; | ||
50 | gpio-controller; | ||
51 | #gpio-cells = <2>; | ||
52 | interrupt-controller; | ||
53 | #interrupts-cells = <2>; | ||
54 | interrupts = <20>, <21>, <22>; | ||
55 | }; | ||
27 | }; | 56 | }; |
28 | }; | 57 | }; |
diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi index b2eafcd2fe1b..2057863f3dfa 100644 --- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi | |||
@@ -19,10 +19,52 @@ | |||
19 | model = "Marvell Armada XP MV78260 SoC"; | 19 | model = "Marvell Armada XP MV78260 SoC"; |
20 | compatible = "marvell,armadaxp-mv78260", "marvell,armadaxp", "marvell,armada-370-xp"; | 20 | compatible = "marvell,armadaxp-mv78260", "marvell,armadaxp", "marvell,armada-370-xp"; |
21 | 21 | ||
22 | aliases { | ||
23 | gpio0 = &gpio0; | ||
24 | gpio1 = &gpio1; | ||
25 | gpio2 = &gpio2; | ||
26 | }; | ||
27 | |||
22 | soc { | 28 | soc { |
23 | pinctrl { | 29 | pinctrl { |
24 | compatible = "marvell,mv78260-pinctrl"; | 30 | compatible = "marvell,mv78260-pinctrl"; |
25 | reg = <0xd0018000 0x38>; | 31 | reg = <0xd0018000 0x38>; |
26 | }; | 32 | }; |
33 | |||
34 | gpio0: gpio@d0018100 { | ||
35 | compatible = "marvell,armadaxp-gpio"; | ||
36 | reg = <0xd0018100 0x40>, | ||
37 | <0xd0018800 0x30>; | ||
38 | ngpios = <32>; | ||
39 | gpio-controller; | ||
40 | #gpio-cells = <2>; | ||
41 | interrupt-controller; | ||
42 | #interrupts-cells = <2>; | ||
43 | interrupts = <16>, <17>, <18>, <19>; | ||
44 | }; | ||
45 | |||
46 | gpio1: gpio@d0018140 { | ||
47 | compatible = "marvell,armadaxp-gpio"; | ||
48 | reg = <0xd0018140 0x40>, | ||
49 | <0xd0018840 0x30>; | ||
50 | ngpios = <32>; | ||
51 | gpio-controller; | ||
52 | #gpio-cells = <2>; | ||
53 | interrupt-controller; | ||
54 | #interrupts-cells = <2>; | ||
55 | interrupts = <20>, <21>, <22>, <23>; | ||
56 | }; | ||
57 | |||
58 | gpio2: gpio@d0018180 { | ||
59 | compatible = "marvell,armadaxp-gpio"; | ||
60 | reg = <0xd0018180 0x40>, | ||
61 | <0xd0018870 0x30>; | ||
62 | ngpios = <3>; | ||
63 | gpio-controller; | ||
64 | #gpio-cells = <2>; | ||
65 | interrupt-controller; | ||
66 | #interrupts-cells = <2>; | ||
67 | interrupts = <24>; | ||
68 | }; | ||
27 | }; | 69 | }; |
28 | }; | 70 | }; |
diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi index cf8624d3784c..ffac98373792 100644 --- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi | |||
@@ -19,10 +19,52 @@ | |||
19 | model = "Marvell Armada XP MV78460 SoC"; | 19 | model = "Marvell Armada XP MV78460 SoC"; |
20 | compatible = "marvell,armadaxp-mv78460", "marvell,armadaxp", "marvell,armada-370-xp"; | 20 | compatible = "marvell,armadaxp-mv78460", "marvell,armadaxp", "marvell,armada-370-xp"; |
21 | 21 | ||
22 | aliases { | ||
23 | gpio0 = &gpio0; | ||
24 | gpio1 = &gpio1; | ||
25 | gpio2 = &gpio2; | ||
26 | }; | ||
27 | |||
22 | soc { | 28 | soc { |
23 | pinctrl { | 29 | pinctrl { |
24 | compatible = "marvell,mv78460-pinctrl"; | 30 | compatible = "marvell,mv78460-pinctrl"; |
25 | reg = <0xd0018000 0x38>; | 31 | reg = <0xd0018000 0x38>; |
26 | }; | 32 | }; |
33 | |||
34 | gpio0: gpio@d0018100 { | ||
35 | compatible = "marvell,armadaxp-gpio"; | ||
36 | reg = <0xd0018100 0x40>, | ||
37 | <0xd0018800 0x30>; | ||
38 | ngpios = <32>; | ||
39 | gpio-controller; | ||
40 | #gpio-cells = <2>; | ||
41 | interrupt-controller; | ||
42 | #interrupts-cells = <2>; | ||
43 | interrupts = <16>, <17>, <18>, <19>; | ||
44 | }; | ||
45 | |||
46 | gpio1: gpio@d0018140 { | ||
47 | compatible = "marvell,armadaxp-gpio"; | ||
48 | reg = <0xd0018140 0x40>, | ||
49 | <0xd0018840 0x30>; | ||
50 | ngpios = <32>; | ||
51 | gpio-controller; | ||
52 | #gpio-cells = <2>; | ||
53 | interrupt-controller; | ||
54 | #interrupts-cells = <2>; | ||
55 | interrupts = <20>, <21>, <22>, <23>; | ||
56 | }; | ||
57 | |||
58 | gpio2: gpio@d0018180 { | ||
59 | compatible = "marvell,armadaxp-gpio"; | ||
60 | reg = <0xd0018180 0x40>, | ||
61 | <0xd0018870 0x30>; | ||
62 | ngpios = <3>; | ||
63 | gpio-controller; | ||
64 | #gpio-cells = <2>; | ||
65 | interrupt-controller; | ||
66 | #interrupts-cells = <2>; | ||
67 | interrupts = <24>; | ||
68 | }; | ||
27 | }; | 69 | }; |
28 | }; | 70 | }; |