aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2012-07-04 05:20:46 -0400
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2012-10-12 21:09:28 -0400
commite4541ff21284e5f2208473b39b535fcd50318c92 (patch)
tree60fda37347ded71c8e1c2c40f058fbb20ce739a6 /arch/arm/boot
parentc18486e10d5801b832b34708f6d2bd266c704793 (diff)
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: Linus Walleij <linus.walleij@linaro.org> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/at91sam9260.dtsi59
-rw-r--r--arch/arm/boot/dts/at91sam9263.dtsi102
-rw-r--r--arch/arm/boot/dts/at91sam9g45.dtsi95
-rw-r--r--arch/arm/boot/dts/at91sam9n12.dtsi83
-rw-r--r--arch/arm/boot/dts/at91sam9x5.dtsi77
5 files changed, 225 insertions, 191 deletions
diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index d410581a5a85..425da936051d 100644
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -98,34 +98,41 @@
98 interrupts = <26 4 0 27 4 0 28 4 0>; 98 interrupts = <26 4 0 27 4 0 28 4 0>;
99 }; 99 };
100 100
101 pioA: gpio@fffff400 { 101 pinctrl@fffff400 {
102 compatible = "atmel,at91rm9200-gpio"; 102 #address-cells = <1>;
103 reg = <0xfffff400 0x100>; 103 #size-cells = <1>;
104 interrupts = <2 4 1>; 104 compatible = "atmel,at91rm9200-pinctrl", "simple-bus";
105 #gpio-cells = <2>; 105 ranges = <0xfffff400 0xfffff400 0x600>;
106 gpio-controller; 106
107 interrupt-controller; 107 pioA: gpio@fffff400 {
108 #interrupt-cells = <2>; 108 compatible = "atmel,at91rm9200-gpio";
109 }; 109 reg = <0xfffff400 0x200>;
110 interrupts = <2 4 1>;
111 #gpio-cells = <2>;
112 gpio-controller;
113 interrupt-controller;
114 #interrupt-cells = <2>;
115 };
110 116
111 pioB: gpio@fffff600 { 117 pioB: gpio@fffff600 {
112 compatible = "atmel,at91rm9200-gpio"; 118 compatible = "atmel,at91rm9200-gpio";
113 reg = <0xfffff600 0x100>; 119 reg = <0xfffff600 0x200>;
114 interrupts = <3 4 1>; 120 interrupts = <3 4 1>;
115 #gpio-cells = <2>; 121 #gpio-cells = <2>;
116 gpio-controller; 122 gpio-controller;
117 interrupt-controller; 123 interrupt-controller;
118 #interrupt-cells = <2>; 124 #interrupt-cells = <2>;
119 }; 125 };
120 126
121 pioC: gpio@fffff800 { 127 pioC: gpio@fffff800 {
122 compatible = "atmel,at91rm9200-gpio"; 128 compatible = "atmel,at91rm9200-gpio";
123 reg = <0xfffff800 0x100>; 129 reg = <0xfffff800 0x200>;
124 interrupts = <4 4 1>; 130 interrupts = <4 4 1>;
125 #gpio-cells = <2>; 131 #gpio-cells = <2>;
126 gpio-controller; 132 gpio-controller;
127 interrupt-controller; 133 interrupt-controller;
128 #interrupt-cells = <2>; 134 #interrupt-cells = <2>;
135 };
129 }; 136 };
130 137
131 dbgu: serial@fffff200 { 138 dbgu: serial@fffff200 {
diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi
index 3e6e5c1abbf3..5b619c9255bd 100644
--- a/arch/arm/boot/dts/at91sam9263.dtsi
+++ b/arch/arm/boot/dts/at91sam9263.dtsi
@@ -89,54 +89,60 @@
89 reg = <0xfffffd10 0x10>; 89 reg = <0xfffffd10 0x10>;
90 }; 90 };
91 91
92 pioA: gpio@fffff200 { 92 pinctrl@fffff200 {
93 compatible = "atmel,at91rm9200-gpio"; 93 #address-cells = <1>;
94 reg = <0xfffff200 0x100>; 94 #size-cells = <1>;
95 interrupts = <2 4 1>; 95 compatible = "atmel,at91rm9200-pinctrl", "simple-bus";
96 #gpio-cells = <2>; 96 ranges = <0xfffff200 0xfffff200 0xa00>;
97 gpio-controller; 97
98 interrupt-controller; 98 pioA: gpio@fffff200 {
99 #interrupt-cells = <2>; 99 compatible = "atmel,at91rm9200-gpio";
100 }; 100 reg = <0xfffff200 0x200>;
101 101 interrupts = <2 4 1>;
102 pioB: gpio@fffff400 { 102 #gpio-cells = <2>;
103 compatible = "atmel,at91rm9200-gpio"; 103 gpio-controller;
104 reg = <0xfffff400 0x100>; 104 interrupt-controller;
105 interrupts = <3 4 1>; 105 #interrupt-cells = <2>;
106 #gpio-cells = <2>; 106 };
107 gpio-controller; 107
108 interrupt-controller; 108 pioB: gpio@fffff400 {
109 #interrupt-cells = <2>; 109 compatible = "atmel,at91rm9200-gpio";
110 }; 110 reg = <0xfffff400 0x200>;
111 111 interrupts = <3 4 1>;
112 pioC: gpio@fffff600 { 112 #gpio-cells = <2>;
113 compatible = "atmel,at91rm9200-gpio"; 113 gpio-controller;
114 reg = <0xfffff600 0x100>; 114 interrupt-controller;
115 interrupts = <4 4 1>; 115 #interrupt-cells = <2>;
116 #gpio-cells = <2>; 116 };
117 gpio-controller; 117
118 interrupt-controller; 118 pioC: gpio@fffff600 {
119 #interrupt-cells = <2>; 119 compatible = "atmel,at91rm9200-gpio";
120 }; 120 reg = <0xfffff600 0x200>;
121 121 interrupts = <4 4 1>;
122 pioD: gpio@fffff800 { 122 #gpio-cells = <2>;
123 compatible = "atmel,at91rm9200-gpio"; 123 gpio-controller;
124 reg = <0xfffff800 0x100>; 124 interrupt-controller;
125 interrupts = <4 4 1>; 125 #interrupt-cells = <2>;
126 #gpio-cells = <2>; 126 };
127 gpio-controller; 127
128 interrupt-controller; 128 pioD: gpio@fffff800 {
129 #interrupt-cells = <2>; 129 compatible = "atmel,at91rm9200-gpio";
130 }; 130 reg = <0xfffff800 0x200>;
131 131 interrupts = <4 4 1>;
132 pioE: gpio@fffffa00 { 132 #gpio-cells = <2>;
133 compatible = "atmel,at91rm9200-gpio"; 133 gpio-controller;
134 reg = <0xfffffa00 0x100>; 134 interrupt-controller;
135 interrupts = <4 4 1>; 135 #interrupt-cells = <2>;
136 #gpio-cells = <2>; 136 };
137 gpio-controller; 137
138 interrupt-controller; 138 pioE: gpio@fffffa00 {
139 #interrupt-cells = <2>; 139 compatible = "atmel,at91rm9200-gpio";
140 reg = <0xfffffa00 0x200>;
141 interrupts = <4 4 1>;
142 #gpio-cells = <2>;
143 gpio-controller;
144 interrupt-controller;
145 #interrupt-cells = <2>;
140 }; 146 };
141 147
142 dbgu: serial@ffffee00 { 148 dbgu: serial@ffffee00 {
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index 3add030d61f8..f2b0f93c0499 100644
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -108,54 +108,61 @@
108 interrupts = <21 4 0>; 108 interrupts = <21 4 0>;
109 }; 109 };
110 110
111 pioA: gpio@fffff200 { 111 pinctrl@fffff200 {
112 compatible = "atmel,at91rm9200-gpio"; 112 #address-cells = <1>;
113 reg = <0xfffff200 0x100>; 113 #size-cells = <1>;
114 interrupts = <2 4 1>; 114 compatible = "atmel,at91rm9200-pinctrl", "simple-bus";
115 #gpio-cells = <2>; 115 ranges = <0xfffff200 0xfffff200 0xa00>;
116 gpio-controller; 116
117 interrupt-controller; 117 pioA: gpio@fffff200 {
118 #interrupt-cells = <2>; 118 compatible = "atmel,at91rm9200-gpio";
119 }; 119 reg = <0xfffff200 0x200>;
120 interrupts = <2 4 1>;
121 #gpio-cells = <2>;
122 gpio-controller;
123 interrupt-controller;
124 #interrupt-cells = <2>;
125 };
120 126
121 pioB: gpio@fffff400 { 127 pioB: gpio@fffff400 {
122 compatible = "atmel,at91rm9200-gpio"; 128 compatible = "atmel,at91rm9200-gpio";
123 reg = <0xfffff400 0x100>; 129 reg = <0xfffff400 0x200>;
124 interrupts = <3 4 1>; 130 interrupts = <3 4 1>;
125 #gpio-cells = <2>; 131 #gpio-cells = <2>;
126 gpio-controller; 132 gpio-controller;
127 interrupt-controller; 133 interrupt-controller;
128 #interrupt-cells = <2>; 134 #interrupt-cells = <2>;
129 }; 135 };
130 136
131 pioC: gpio@fffff600 { 137 pioC: gpio@fffff600 {
132 compatible = "atmel,at91rm9200-gpio"; 138 compatible = "atmel,at91rm9200-gpio";
133 reg = <0xfffff600 0x100>; 139 reg = <0xfffff600 0x200>;
134 interrupts = <4 4 1>; 140 interrupts = <4 4 1>;
135 #gpio-cells = <2>; 141 #gpio-cells = <2>;
136 gpio-controller; 142 gpio-controller;
137 interrupt-controller; 143 interrupt-controller;
138 #interrupt-cells = <2>; 144 #interrupt-cells = <2>;
139 }; 145 };
140 146
141 pioD: gpio@fffff800 { 147 pioD: gpio@fffff800 {
142 compatible = "atmel,at91rm9200-gpio"; 148 compatible = "atmel,at91rm9200-gpio";
143 reg = <0xfffff800 0x100>; 149 reg = <0xfffff800 0x200>;
144 interrupts = <5 4 1>; 150 interrupts = <5 4 1>;
145 #gpio-cells = <2>; 151 #gpio-cells = <2>;
146 gpio-controller; 152 gpio-controller;
147 interrupt-controller; 153 interrupt-controller;
148 #interrupt-cells = <2>; 154 #interrupt-cells = <2>;
149 }; 155 };
150 156
151 pioE: gpio@fffffa00 { 157 pioE: gpio@fffffa00 {
152 compatible = "atmel,at91rm9200-gpio"; 158 compatible = "atmel,at91rm9200-gpio";
153 reg = <0xfffffa00 0x100>; 159 reg = <0xfffffa00 0x200>;
154 interrupts = <5 4 1>; 160 interrupts = <5 4 1>;
155 #gpio-cells = <2>; 161 #gpio-cells = <2>;
156 gpio-controller; 162 gpio-controller;
157 interrupt-controller; 163 interrupt-controller;
158 #interrupt-cells = <2>; 164 #interrupt-cells = <2>;
165 };
159 }; 166 };
160 167
161 dbgu: serial@ffffee00 { 168 dbgu: serial@ffffee00 {
diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
index 82508d68aa7e..b061c0626025 100644
--- a/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@ -102,44 +102,51 @@
102 interrupts = <20 4 0>; 102 interrupts = <20 4 0>;
103 }; 103 };
104 104
105 pioA: gpio@fffff400 { 105 pinctrl@fffff400 {
106 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; 106 #address-cells = <1>;
107 reg = <0xfffff400 0x100>; 107 #size-cells = <1>;
108 interrupts = <2 4 1>; 108 compatible = "atmel,at91rm9200-pinctrl", "simple-bus";
109 #gpio-cells = <2>; 109 ranges = <0xfffff400 0xfffff400 0x800>;
110 gpio-controller; 110
111 interrupt-controller; 111 pioA: gpio@fffff400 {
112 #interrupt-cells = <2>; 112 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
113 }; 113 reg = <0xfffff400 0x200>;
114 114 interrupts = <2 4 1>;
115 pioB: gpio@fffff600 { 115 #gpio-cells = <2>;
116 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; 116 gpio-controller;
117 reg = <0xfffff600 0x100>; 117 interrupt-controller;
118 interrupts = <2 4 1>; 118 #interrupt-cells = <2>;
119 #gpio-cells = <2>; 119 };
120 gpio-controller; 120
121 interrupt-controller; 121 pioB: gpio@fffff600 {
122 #interrupt-cells = <2>; 122 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
123 }; 123 reg = <0xfffff600 0x200>;
124 124 interrupts = <2 4 1>;
125 pioC: gpio@fffff800 { 125 #gpio-cells = <2>;
126 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; 126 gpio-controller;
127 reg = <0xfffff800 0x100>; 127 interrupt-controller;
128 interrupts = <3 4 1>; 128 #interrupt-cells = <2>;
129 #gpio-cells = <2>; 129 };
130 gpio-controller; 130
131 interrupt-controller; 131 pioC: gpio@fffff800 {
132 #interrupt-cells = <2>; 132 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
133 }; 133 reg = <0xfffff800 0x200>;
134 134 interrupts = <3 4 1>;
135 pioD: gpio@fffffa00 { 135 #gpio-cells = <2>;
136 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; 136 gpio-controller;
137 reg = <0xfffffa00 0x100>; 137 interrupt-controller;
138 interrupts = <3 4 1>; 138 #interrupt-cells = <2>;
139 #gpio-cells = <2>; 139 };
140 gpio-controller; 140
141 interrupt-controller; 141 pioD: gpio@fffffa00 {
142 #interrupt-cells = <2>; 142 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
143 reg = <0xfffffa00 0x200>;
144 interrupts = <3 4 1>;
145 #gpio-cells = <2>;
146 gpio-controller;
147 interrupt-controller;
148 #interrupt-cells = <2>;
149 };
143 }; 150 };
144 151
145 dbgu: serial@fffff200 { 152 dbgu: serial@fffff200 {
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index 03fc136421c5..507a84d2a5d7 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -111,44 +111,51 @@
111 interrupts = <21 4 0>; 111 interrupts = <21 4 0>;
112 }; 112 };
113 113
114 pioA: gpio@fffff400 { 114 pinctrl@fffff200 {
115 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; 115 #address-cells = <1>;
116 reg = <0xfffff400 0x100>; 116 #size-cells = <1>;
117 interrupts = <2 4 1>; 117 compatible = "atmel,at91rm9200-pinctrl", "simple-bus";
118 #gpio-cells = <2>; 118 ranges = <0xfffff400 0xfffff400 0x800>;
119 gpio-controller; 119
120 interrupt-controller; 120 pioA: gpio@fffff400 {
121 #interrupt-cells = <2>; 121 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
122 }; 122 reg = <0xfffff400 0x200>;
123 interrupts = <2 4 1>;
124 #gpio-cells = <2>;
125 gpio-controller;
126 interrupt-controller;
127 #interrupt-cells = <2>;
128 };
123 129
124 pioB: gpio@fffff600 { 130 pioB: gpio@fffff600 {
125 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; 131 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
126 reg = <0xfffff600 0x100>; 132 reg = <0xfffff600 0x200>;
127 interrupts = <2 4 1>; 133 interrupts = <2 4 1>;
128 #gpio-cells = <2>; 134 #gpio-cells = <2>;
129 gpio-controller; 135 gpio-controller;
130 interrupt-controller; 136 interrupt-controller;
131 #interrupt-cells = <2>; 137 #interrupt-cells = <2>;
132 }; 138 };
133 139
134 pioC: gpio@fffff800 { 140 pioC: gpio@fffff800 {
135 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; 141 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
136 reg = <0xfffff800 0x100>; 142 reg = <0xfffff800 0x200>;
137 interrupts = <3 4 1>; 143 interrupts = <3 4 1>;
138 #gpio-cells = <2>; 144 #gpio-cells = <2>;
139 gpio-controller; 145 gpio-controller;
140 interrupt-controller; 146 interrupt-controller;
141 #interrupt-cells = <2>; 147 #interrupt-cells = <2>;
142 }; 148 };
143 149
144 pioD: gpio@fffffa00 { 150 pioD: gpio@fffffa00 {
145 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; 151 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
146 reg = <0xfffffa00 0x100>; 152 reg = <0xfffffa00 0x200>;
147 interrupts = <3 4 1>; 153 interrupts = <3 4 1>;
148 #gpio-cells = <2>; 154 #gpio-cells = <2>;
149 gpio-controller; 155 gpio-controller;
150 interrupt-controller; 156 interrupt-controller;
151 #interrupt-cells = <2>; 157 #interrupt-cells = <2>;
158 };
152 }; 159 };
153 160
154 dbgu: serial@fffff200 { 161 dbgu: serial@fffff200 {
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-06 21:22:30 -0500