aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-06-14 21:58:28 -0400
committerOlof Johansson <olof@lixom.net>2013-06-14 21:58:28 -0400
commit1247034ea6515d25a80220915820aa61891a78a1 (patch)
tree4cb5a05462bc5ef4c36ca8ef154673e3a7d22198 /arch
parent38d77ff90a47d198d2fd3ebd766ee84eaa71a0d2 (diff)
parent4a3ae9324ebeb9715369d2bca799bfd7dcff6dd7 (diff)
Merge tag 'at91-drivers' of git://github.com/at91linux/linux-at91 into next/drivers
From Nicolas Ferre: Adding the DT support to USB gadget High-Speed aka usba. * tag 'at91-drivers' of git://github.com/at91linux/linux-at91: USB: gadget: atmel_usba: add DT support USB: gadget: atmel_usba: allow multi instance USB: gadget: atmel_usba: move global struct usba_ep usba_ep to struct usba_udc ARM: at91: udpate defconfigs ARM: at91: dt: switch to standard IRQ flag defines ARM: at91: dt: switch to pinctrl to pre-processor ARM: at91: dt: add pinctrl pre-processor define ARM: at91: dt: switch to standard GPIO flag defines. ARM: at91: dt: use #include for all device trees Signed-off-by: Olof Johansson <olof@lixom.net> Conflicts: arch/arm/boot/dts/at91sam9260.dtsi arch/arm/boot/dts/sama5d3.dtsi
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/aks-cdu.dts12
-rw-r--r--arch/arm/boot/dts/animeo_ip.dts18
-rw-r--r--arch/arm/boot/dts/at91-ariag25.dts6
-rw-r--r--arch/arm/boot/dts/at91rm9200.dtsi207
-rw-r--r--arch/arm/boot/dts/at91rm9200ek.dts10
-rw-r--r--arch/arm/boot/dts/at91sam9260.dtsi215
-rw-r--r--arch/arm/boot/dts/at91sam9263.dtsi203
-rw-r--r--arch/arm/boot/dts/at91sam9263ek.dts24
-rw-r--r--arch/arm/boot/dts/at91sam9g15.dtsi2
-rw-r--r--arch/arm/boot/dts/at91sam9g15ek.dts4
-rw-r--r--arch/arm/boot/dts/at91sam9g20.dtsi2
-rw-r--r--arch/arm/boot/dts/at91sam9g20ek.dts6
-rw-r--r--arch/arm/boot/dts/at91sam9g20ek_2mmc.dts10
-rw-r--r--arch/arm/boot/dts/at91sam9g20ek_common.dtsi28
-rw-r--r--arch/arm/boot/dts/at91sam9g25.dtsi2
-rw-r--r--arch/arm/boot/dts/at91sam9g25ek.dts4
-rw-r--r--arch/arm/boot/dts/at91sam9g35.dtsi2
-rw-r--r--arch/arm/boot/dts/at91sam9g35ek.dts4
-rw-r--r--arch/arm/boot/dts/at91sam9g45.dtsi213
-rw-r--r--arch/arm/boot/dts/at91sam9m10g45ek.dts38
-rw-r--r--arch/arm/boot/dts/at91sam9n12.dtsi141
-rw-r--r--arch/arm/boot/dts/at91sam9n12ek.dts14
-rw-r--r--arch/arm/boot/dts/at91sam9x25.dtsi22
-rw-r--r--arch/arm/boot/dts/at91sam9x25ek.dts4
-rw-r--r--arch/arm/boot/dts/at91sam9x35.dtsi2
-rw-r--r--arch/arm/boot/dts/at91sam9x35ek.dts4
-rw-r--r--arch/arm/boot/dts/at91sam9x5.dtsi279
-rw-r--r--arch/arm/boot/dts/at91sam9x5cm.dtsi8
-rw-r--r--arch/arm/boot/dts/at91sam9x5ek.dtsi14
-rw-r--r--arch/arm/boot/dts/ethernut5.dts6
-rw-r--r--arch/arm/boot/dts/evk-pro3.dts6
-rw-r--r--arch/arm/boot/dts/ge863-pro3.dtsi2
-rw-r--r--arch/arm/boot/dts/kizbox.dts16
-rw-r--r--arch/arm/boot/dts/mpa1600.dts4
-rw-r--r--arch/arm/boot/dts/pm9g45.dts22
-rw-r--r--arch/arm/boot/dts/sama5d3.dtsi520
-rw-r--r--arch/arm/boot/dts/sama5d31ek.dts6
-rw-r--r--arch/arm/boot/dts/sama5d33ek.dts4
-rw-r--r--arch/arm/boot/dts/sama5d34ek.dts6
-rw-r--r--arch/arm/boot/dts/sama5d35ek.dts4
-rw-r--r--arch/arm/boot/dts/sama5d3xcm.dtsi4
-rw-r--r--arch/arm/boot/dts/sama5d3xdm.dtsi2
-rw-r--r--arch/arm/boot/dts/sama5d3xmb.dtsi26
-rw-r--r--arch/arm/boot/dts/tny_a9260.dts4
-rw-r--r--arch/arm/boot/dts/tny_a9263.dts4
-rw-r--r--arch/arm/boot/dts/tny_a9g20.dts4
-rw-r--r--arch/arm/boot/dts/usb_a9260.dts4
-rw-r--r--arch/arm/boot/dts/usb_a9260_common.dtsi6
-rw-r--r--arch/arm/boot/dts/usb_a9263.dts8
-rw-r--r--arch/arm/boot/dts/usb_a9g20-dab-mmx.dtsi22
-rw-r--r--arch/arm/boot/dts/usb_a9g20.dts4
-rw-r--r--arch/arm/configs/at91_dt_defconfig55
-rw-r--r--arch/arm/configs/at91rm9200_defconfig218
-rw-r--r--arch/arm/configs/at91sam9260_9g20_defconfig (renamed from arch/arm/configs/at91sam9g20_defconfig)67
-rw-r--r--arch/arm/configs/at91sam9260_defconfig91
-rw-r--r--arch/arm/configs/at91sam9261_9g10_defconfig (renamed from arch/arm/configs/at91sam9261_defconfig)19
-rw-r--r--arch/arm/configs/at91sam9263_defconfig39
-rw-r--r--arch/arm/configs/at91sam9g45_defconfig94
-rw-r--r--arch/arm/configs/sama5_defconfig35
-rw-r--r--arch/arm/mach-at91/Kconfig.non_dt159
-rw-r--r--arch/arm/mach-at91/Makefile2
-rw-r--r--arch/arm/mach-at91/board-sam9261ek.c28
62 files changed, 1372 insertions, 1617 deletions
diff --git a/arch/arm/boot/dts/aks-cdu.dts b/arch/arm/boot/dts/aks-cdu.dts
index 29b9f15e7599..54cb5cf8604a 100644
--- a/arch/arm/boot/dts/aks-cdu.dts
+++ b/arch/arm/boot/dts/aks-cdu.dts
@@ -9,7 +9,7 @@
9 9
10/dts-v1/; 10/dts-v1/;
11 11
12/include/ "ge863-pro3.dtsi" 12#include "ge863-pro3.dtsi"
13 13
14/ { 14/ {
15 chosen { 15 chosen {
@@ -46,7 +46,7 @@
46 }; 46 };
47 47
48 usb1: gadget@fffa4000 { 48 usb1: gadget@fffa4000 {
49 atmel,vbus-gpio = <&pioC 15 0>; 49 atmel,vbus-gpio = <&pioC 15 GPIO_ACTIVE_HIGH>;
50 status = "okay"; 50 status = "okay";
51 }; 51 };
52 }; 52 };
@@ -90,23 +90,23 @@
90 compatible = "gpio-leds"; 90 compatible = "gpio-leds";
91 91
92 red { 92 red {
93 gpios = <&pioC 10 0>; 93 gpios = <&pioC 10 GPIO_ACTIVE_HIGH>;
94 linux,default-trigger = "none"; 94 linux,default-trigger = "none";
95 }; 95 };
96 96
97 green { 97 green {
98 gpios = <&pioA 5 1>; 98 gpios = <&pioA 5 GPIO_ACTIVE_LOW>;
99 linux,default-trigger = "none"; 99 linux,default-trigger = "none";
100 default-state = "on"; 100 default-state = "on";
101 }; 101 };
102 102
103 yellow { 103 yellow {
104 gpios = <&pioB 20 1>; 104 gpios = <&pioB 20 GPIO_ACTIVE_LOW>;
105 linux,default-trigger = "none"; 105 linux,default-trigger = "none";
106 }; 106 };
107 107
108 blue { 108 blue {
109 gpios = <&pioB 21 1>; 109 gpios = <&pioB 21 GPIO_ACTIVE_LOW>;
110 linux,default-trigger = "none"; 110 linux,default-trigger = "none";
111 }; 111 };
112 }; 112 };
diff --git a/arch/arm/boot/dts/animeo_ip.dts b/arch/arm/boot/dts/animeo_ip.dts
index 5160210f74da..3a1de9eb5111 100644
--- a/arch/arm/boot/dts/animeo_ip.dts
+++ b/arch/arm/boot/dts/animeo_ip.dts
@@ -7,7 +7,7 @@
7 */ 7 */
8 8
9/dts-v1/; 9/dts-v1/;
10/include/ "at91sam9260.dtsi" 10#include "at91sam9260.dtsi"
11 11
12/ { 12/ {
13 model = "Somfy Animeo IP"; 13 model = "Somfy Animeo IP";
@@ -123,7 +123,7 @@
123 123
124 usb0: ohci@00500000 { 124 usb0: ohci@00500000 {
125 num-ports = <2>; 125 num-ports = <2>;
126 atmel,vbus-gpio = <&pioB 15 1>; 126 atmel,vbus-gpio = <&pioB 15 GPIO_ACTIVE_LOW>;
127 status = "okay"; 127 status = "okay";
128 }; 128 };
129 }; 129 };
@@ -133,23 +133,23 @@
133 133
134 power_green { 134 power_green {
135 label = "power_green"; 135 label = "power_green";
136 gpios = <&pioC 17 0>; 136 gpios = <&pioC 17 GPIO_ACTIVE_HIGH>;
137 linux,default-trigger = "heartbeat"; 137 linux,default-trigger = "heartbeat";
138 }; 138 };
139 139
140 power_red { 140 power_red {
141 label = "power_red"; 141 label = "power_red";
142 gpios = <&pioA 2 0>; 142 gpios = <&pioA 2 GPIO_ACTIVE_HIGH>;
143 }; 143 };
144 144
145 tx_green { 145 tx_green {
146 label = "tx_green"; 146 label = "tx_green";
147 gpios = <&pioC 19 0>; 147 gpios = <&pioC 19 GPIO_ACTIVE_HIGH>;
148 }; 148 };
149 149
150 tx_red { 150 tx_red {
151 label = "tx_red"; 151 label = "tx_red";
152 gpios = <&pioC 18 0>; 152 gpios = <&pioC 18 GPIO_ACTIVE_HIGH>;
153 }; 153 };
154 }; 154 };
155 155
@@ -160,21 +160,21 @@
160 160
161 keyswitch_in { 161 keyswitch_in {
162 label = "keyswitch_in"; 162 label = "keyswitch_in";
163 gpios = <&pioB 1 0>; 163 gpios = <&pioB 1 GPIO_ACTIVE_HIGH>;
164 linux,code = <28>; 164 linux,code = <28>;
165 gpio-key,wakeup; 165 gpio-key,wakeup;
166 }; 166 };
167 167
168 error_in { 168 error_in {
169 label = "error_in"; 169 label = "error_in";
170 gpios = <&pioB 2 0>; 170 gpios = <&pioB 2 GPIO_ACTIVE_HIGH>;
171 linux,code = <29>; 171 linux,code = <29>;
172 gpio-key,wakeup; 172 gpio-key,wakeup;
173 }; 173 };
174 174
175 btn { 175 btn {
176 label = "btn"; 176 label = "btn";
177 gpios = <&pioC 23 0>; 177 gpios = <&pioC 23 GPIO_ACTIVE_HIGH>;
178 linux,code = <31>; 178 linux,code = <31>;
179 gpio-key,wakeup; 179 gpio-key,wakeup;
180 }; 180 };
diff --git a/arch/arm/boot/dts/at91-ariag25.dts b/arch/arm/boot/dts/at91-ariag25.dts
index c7aebba4e8e7..5ede7678f298 100644
--- a/arch/arm/boot/dts/at91-ariag25.dts
+++ b/arch/arm/boot/dts/at91-ariag25.dts
@@ -7,7 +7,7 @@
7 * Licensed under GPLv2 or later. 7 * Licensed under GPLv2 or later.
8 */ 8 */
9/dts-v1/; 9/dts-v1/;
10/include/ "at91sam9g25.dtsi" 10#include "at91sam9g25.dtsi"
11 11
12/ { 12/ {
13 model = "Acme Systems Aria G25"; 13 model = "Acme Systems Aria G25";
@@ -156,7 +156,7 @@
156 /* little green LED in middle of Aria G25 module */ 156 /* little green LED in middle of Aria G25 module */
157 aria_led { 157 aria_led {
158 label = "aria_led"; 158 label = "aria_led";
159 gpios = <&pioB 8 0>; /* PB8 */ 159 gpios = <&pioB 8 GPIO_ACTIVE_HIGH>; /* PB8 */
160 linux,default-trigger = "heartbeat"; 160 linux,default-trigger = "heartbeat";
161 }; 161 };
162 162
@@ -164,7 +164,7 @@
164 164
165 onewire@0 { 165 onewire@0 {
166 compatible = "w1-gpio"; 166 compatible = "w1-gpio";
167 gpios = <&pioA 21 1>; 167 gpios = <&pioA 21 GPIO_ACTIVE_LOW>;
168 pinctrl-names = "default"; 168 pinctrl-names = "default";
169 pinctrl-0 = <&pinctrl_w1_0>; 169 pinctrl-0 = <&pinctrl_w1_0>;
170 }; 170 };
diff --git a/arch/arm/boot/dts/at91rm9200.dtsi b/arch/arm/boot/dts/at91rm9200.dtsi
index 5d3ed5aafc69..4aad0d9f5462 100644
--- a/arch/arm/boot/dts/at91rm9200.dtsi
+++ b/arch/arm/boot/dts/at91rm9200.dtsi
@@ -10,7 +10,10 @@
10 * Licensed under GPLv2 or later. 10 * Licensed under GPLv2 or later.
11 */ 11 */
12 12
13/include/ "skeleton.dtsi" 13#include "skeleton.dtsi"
14#include <dt-bindings/pinctrl/at91.h>
15#include <dt-bindings/interrupt-controller/irq.h>
16#include <dt-bindings/gpio/gpio.h>
14 17
15/ { 18/ {
16 model = "Atmel AT91RM9200 family SoC"; 19 model = "Atmel AT91RM9200 family SoC";
@@ -77,25 +80,29 @@
77 st: timer@fffffd00 { 80 st: timer@fffffd00 {
78 compatible = "atmel,at91rm9200-st"; 81 compatible = "atmel,at91rm9200-st";
79 reg = <0xfffffd00 0x100>; 82 reg = <0xfffffd00 0x100>;
80 interrupts = <1 4 7>; 83 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
81 }; 84 };
82 85
83 tcb0: timer@fffa0000 { 86 tcb0: timer@fffa0000 {
84 compatible = "atmel,at91rm9200-tcb"; 87 compatible = "atmel,at91rm9200-tcb";
85 reg = <0xfffa0000 0x100>; 88 reg = <0xfffa0000 0x100>;
86 interrupts = <17 4 0 18 4 0 19 4 0>; 89 interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0
90 18 IRQ_TYPE_LEVEL_HIGH 0
91 19 IRQ_TYPE_LEVEL_HIGH 0>;
87 }; 92 };
88 93
89 tcb1: timer@fffa4000 { 94 tcb1: timer@fffa4000 {
90 compatible = "atmel,at91rm9200-tcb"; 95 compatible = "atmel,at91rm9200-tcb";
91 reg = <0xfffa4000 0x100>; 96 reg = <0xfffa4000 0x100>;
92 interrupts = <20 4 0 21 4 0 22 4 0>; 97 interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0
98 21 IRQ_TYPE_LEVEL_HIGH 0
99 22 IRQ_TYPE_LEVEL_HIGH 0>;
93 }; 100 };
94 101
95 i2c0: i2c@fffb8000 { 102 i2c0: i2c@fffb8000 {
96 compatible = "atmel,at91rm9200-i2c"; 103 compatible = "atmel,at91rm9200-i2c";
97 reg = <0xfffb8000 0x4000>; 104 reg = <0xfffb8000 0x4000>;
98 interrupts = <12 4 6>; 105 interrupts = <12 IRQ_TYPE_LEVEL_HIGH 6>;
99 pinctrl-names = "default"; 106 pinctrl-names = "default";
100 pinctrl-0 = <&pinctrl_twi>; 107 pinctrl-0 = <&pinctrl_twi>;
101 #address-cells = <1>; 108 #address-cells = <1>;
@@ -106,7 +113,7 @@
106 mmc0: mmc@fffb4000 { 113 mmc0: mmc@fffb4000 {
107 compatible = "atmel,hsmci"; 114 compatible = "atmel,hsmci";
108 reg = <0xfffb4000 0x4000>; 115 reg = <0xfffb4000 0x4000>;
109 interrupts = <10 4 0>; 116 interrupts = <10 IRQ_TYPE_LEVEL_HIGH 0>;
110 #address-cells = <1>; 117 #address-cells = <1>;
111 #size-cells = <0>; 118 #size-cells = <0>;
112 status = "disabled"; 119 status = "disabled";
@@ -115,7 +122,7 @@
115 ssc0: ssc@fffd0000 { 122 ssc0: ssc@fffd0000 {
116 compatible = "atmel,at91rm9200-ssc"; 123 compatible = "atmel,at91rm9200-ssc";
117 reg = <0xfffd0000 0x4000>; 124 reg = <0xfffd0000 0x4000>;
118 interrupts = <14 4 5>; 125 interrupts = <14 IRQ_TYPE_LEVEL_HIGH 5>;
119 pinctrl-names = "default"; 126 pinctrl-names = "default";
120 pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>; 127 pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
121 status = "disable"; 128 status = "disable";
@@ -124,7 +131,7 @@
124 ssc1: ssc@fffd4000 { 131 ssc1: ssc@fffd4000 {
125 compatible = "atmel,at91rm9200-ssc"; 132 compatible = "atmel,at91rm9200-ssc";
126 reg = <0xfffd4000 0x4000>; 133 reg = <0xfffd4000 0x4000>;
127 interrupts = <15 4 5>; 134 interrupts = <15 IRQ_TYPE_LEVEL_HIGH 5>;
128 pinctrl-names = "default"; 135 pinctrl-names = "default";
129 pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>; 136 pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>;
130 status = "disable"; 137 status = "disable";
@@ -133,7 +140,7 @@
133 ssc2: ssc@fffd8000 { 140 ssc2: ssc@fffd8000 {
134 compatible = "atmel,at91rm9200-ssc"; 141 compatible = "atmel,at91rm9200-ssc";
135 reg = <0xfffd8000 0x4000>; 142 reg = <0xfffd8000 0x4000>;
136 interrupts = <16 4 5>; 143 interrupts = <16 IRQ_TYPE_LEVEL_HIGH 5>;
137 pinctrl-names = "default"; 144 pinctrl-names = "default";
138 pinctrl-0 = <&pinctrl_ssc2_tx &pinctrl_ssc2_rx>; 145 pinctrl-0 = <&pinctrl_ssc2_tx &pinctrl_ssc2_rx>;
139 status = "disable"; 146 status = "disable";
@@ -142,7 +149,7 @@
142 macb0: ethernet@fffbc000 { 149 macb0: ethernet@fffbc000 {
143 compatible = "cdns,at91rm9200-emac", "cdns,emac"; 150 compatible = "cdns,at91rm9200-emac", "cdns,emac";
144 reg = <0xfffbc000 0x4000>; 151 reg = <0xfffbc000 0x4000>;
145 interrupts = <24 4 3>; 152 interrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>;
146 phy-mode = "rmii"; 153 phy-mode = "rmii";
147 pinctrl-names = "default"; 154 pinctrl-names = "default";
148 pinctrl-0 = <&pinctrl_macb_rmii>; 155 pinctrl-0 = <&pinctrl_macb_rmii>;
@@ -167,234 +174,234 @@
167 dbgu { 174 dbgu {
168 pinctrl_dbgu: dbgu-0 { 175 pinctrl_dbgu: dbgu-0 {
169 atmel,pins = 176 atmel,pins =
170 <0 30 0x1 0x0 /* PA30 periph A */ 177 <AT91_PIOA 30 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA30 periph A */
171 0 31 0x1 0x1>; /* PA31 periph with pullup */ 178 AT91_PIOA 31 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA31 periph with pullup */
172 }; 179 };
173 }; 180 };
174 181
175 uart0 { 182 uart0 {
176 pinctrl_uart0: uart0-0 { 183 pinctrl_uart0: uart0-0 {
177 atmel,pins = 184 atmel,pins =
178 <0 17 0x1 0x0 /* PA17 periph A */ 185 <AT91_PIOA 17 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA17 periph A */
179 0 18 0x1 0x0>; /* PA18 periph A */ 186 AT91_PIOA 18 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA18 periph A */
180 }; 187 };
181 188
182 pinctrl_uart0_rts: uart0_rts-0 { 189 pinctrl_uart0_rts: uart0_rts-0 {
183 atmel,pins = 190 atmel,pins =
184 <0 20 0x1 0x0>; /* PA20 periph A */ 191 <AT91_PIOA 20 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA20 periph A */
185 }; 192 };
186 193
187 pinctrl_uart0_cts: uart0_cts-0 { 194 pinctrl_uart0_cts: uart0_cts-0 {
188 atmel,pins = 195 atmel,pins =
189 <0 21 0x1 0x0>; /* PA21 periph A */ 196 <AT91_PIOA 21 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA21 periph A */
190 }; 197 };
191 }; 198 };
192 199
193 uart1 { 200 uart1 {
194 pinctrl_uart1: uart1-0 { 201 pinctrl_uart1: uart1-0 {
195 atmel,pins = 202 atmel,pins =
196 <1 20 0x1 0x1 /* PB20 periph A with pullup */ 203 <AT91_PIOB 20 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB20 periph A with pullup */
197 1 21 0x1 0x0>; /* PB21 periph A */ 204 AT91_PIOB 21 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB21 periph A */
198 }; 205 };
199 206
200 pinctrl_uart1_rts: uart1_rts-0 { 207 pinctrl_uart1_rts: uart1_rts-0 {
201 atmel,pins = 208 atmel,pins =
202 <1 24 0x1 0x0>; /* PB24 periph A */ 209 <AT91_PIOB 24 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB24 periph A */
203 }; 210 };
204 211
205 pinctrl_uart1_cts: uart1_cts-0 { 212 pinctrl_uart1_cts: uart1_cts-0 {
206 atmel,pins = 213 atmel,pins =
207 <1 26 0x1 0x0>; /* PB26 periph A */ 214 <AT91_PIOB 26 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB26 periph A */
208 }; 215 };
209 216
210 pinctrl_uart1_dtr_dsr: uart1_dtr_dsr-0 { 217 pinctrl_uart1_dtr_dsr: uart1_dtr_dsr-0 {
211 atmel,pins = 218 atmel,pins =
212 <1 19 0x1 0x0 /* PB19 periph A */ 219 <AT91_PIOB 19 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB19 periph A */
213 1 25 0x1 0x0>; /* PB25 periph A */ 220 AT91_PIOB 25 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB25 periph A */
214 }; 221 };
215 222
216 pinctrl_uart1_dcd: uart1_dcd-0 { 223 pinctrl_uart1_dcd: uart1_dcd-0 {
217 atmel,pins = 224 atmel,pins =
218 <1 23 0x1 0x0>; /* PB23 periph A */ 225 <AT91_PIOB 23 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB23 periph A */
219 }; 226 };
220 227
221 pinctrl_uart1_ri: uart1_ri-0 { 228 pinctrl_uart1_ri: uart1_ri-0 {
222 atmel,pins = 229 atmel,pins =
223 <1 18 0x1 0x0>; /* PB18 periph A */ 230 <AT91_PIOB 18 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB18 periph A */
224 }; 231 };
225 }; 232 };
226 233
227 uart2 { 234 uart2 {
228 pinctrl_uart2: uart2-0 { 235 pinctrl_uart2: uart2-0 {
229 atmel,pins = 236 atmel,pins =
230 <0 22 0x1 0x0 /* PA22 periph A */ 237 <AT91_PIOA 22 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA22 periph A */
231 0 23 0x1 0x1>; /* PA23 periph A with pullup */ 238 AT91_PIOA 23 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA23 periph A with pullup */
232 }; 239 };
233 240
234 pinctrl_uart2_rts: uart2_rts-0 { 241 pinctrl_uart2_rts: uart2_rts-0 {
235 atmel,pins = 242 atmel,pins =
236 <0 30 0x2 0x0>; /* PA30 periph B */ 243 <AT91_PIOA 30 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA30 periph B */
237 }; 244 };
238 245
239 pinctrl_uart2_cts: uart2_cts-0 { 246 pinctrl_uart2_cts: uart2_cts-0 {
240 atmel,pins = 247 atmel,pins =
241 <0 31 0x2 0x0>; /* PA31 periph B */ 248 <AT91_PIOA 31 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA31 periph B */
242 }; 249 };
243 }; 250 };
244 251
245 uart3 { 252 uart3 {
246 pinctrl_uart3: uart3-0 { 253 pinctrl_uart3: uart3-0 {
247 atmel,pins = 254 atmel,pins =
248 <0 5 0x2 0x1 /* PA5 periph B with pullup */ 255 <AT91_PIOA 5 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA5 periph B with pullup */
249 0 6 0x2 0x0>; /* PA6 periph B */ 256 AT91_PIOA 6 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA6 periph B */
250 }; 257 };
251 258
252 pinctrl_uart3_rts: uart3_rts-0 { 259 pinctrl_uart3_rts: uart3_rts-0 {
253 atmel,pins = 260 atmel,pins =
254 <1 0 0x2 0x0>; /* PB0 periph B */ 261 <AT91_PIOB 0 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PB0 periph B */
255 }; 262 };
256 263
257 pinctrl_uart3_cts: uart3_cts-0 { 264 pinctrl_uart3_cts: uart3_cts-0 {
258 atmel,pins = 265 atmel,pins =
259 <1 1 0x2 0x0>; /* PB1 periph B */ 266 <AT91_PIOB 1 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PB1 periph B */
260 }; 267 };
261 }; 268 };
262 269
263 nand { 270 nand {
264 pinctrl_nand: nand-0 { 271 pinctrl_nand: nand-0 {
265 atmel,pins = 272 atmel,pins =
266 <2 2 0x0 0x1 /* PC2 gpio RDY pin pull_up */ 273 <AT91_PIOC 2 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP /* PC2 gpio RDY pin pull_up */
267 1 1 0x0 0x1>; /* PB1 gpio CD pin pull_up */ 274 AT91_PIOB 1 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; /* PB1 gpio CD pin pull_up */
268 }; 275 };
269 }; 276 };
270 277
271 macb { 278 macb {
272 pinctrl_macb_rmii: macb_rmii-0 { 279 pinctrl_macb_rmii: macb_rmii-0 {
273 atmel,pins = 280 atmel,pins =
274 <0 7 0x1 0x0 /* PA7 periph A */ 281 <AT91_PIOA 7 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA7 periph A */
275 0 8 0x1 0x0 /* PA8 periph A */ 282 AT91_PIOA 8 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA8 periph A */
276 0 9 0x1 0x0 /* PA9 periph A */ 283 AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA9 periph A */
277 0 10 0x1 0x0 /* PA10 periph A */ 284 AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA10 periph A */
278 0 11 0x1 0x0 /* PA11 periph A */ 285 AT91_PIOA 11 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA11 periph A */
279 0 12 0x1 0x0 /* PA12 periph A */ 286 AT91_PIOA 12 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA12 periph A */
280 0 13 0x1 0x0 /* PA13 periph A */ 287 AT91_PIOA 13 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA13 periph A */
281 0 14 0x1 0x0 /* PA14 periph A */ 288 AT91_PIOA 14 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA14 periph A */
282 0 15 0x1 0x0 /* PA15 periph A */ 289 AT91_PIOA 15 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA15 periph A */
283 0 16 0x1 0x0>; /* PA16 periph A */ 290 AT91_PIOA 16 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA16 periph A */
284 }; 291 };
285 292
286 pinctrl_macb_rmii_mii: macb_rmii_mii-0 { 293 pinctrl_macb_rmii_mii: macb_rmii_mii-0 {
287 atmel,pins = 294 atmel,pins =
288 <1 12 0x2 0x0 /* PB12 periph B */ 295 <AT91_PIOB 12 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB12 periph B */
289 1 13 0x2 0x0 /* PB13 periph B */ 296 AT91_PIOB 13 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB13 periph B */
290 1 14 0x2 0x0 /* PB14 periph B */ 297 AT91_PIOB 14 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB14 periph B */
291 1 15 0x2 0x0 /* PB15 periph B */ 298 AT91_PIOB 15 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB15 periph B */
292 1 16 0x2 0x0 /* PB16 periph B */ 299 AT91_PIOB 16 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB16 periph B */
293 1 17 0x2 0x0 /* PB17 periph B */ 300 AT91_PIOB 17 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB17 periph B */
294 1 18 0x2 0x0 /* PB18 periph B */ 301 AT91_PIOB 18 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB18 periph B */
295 1 19 0x2 0x0>; /* PB19 periph B */ 302 AT91_PIOB 19 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PB19 periph B */
296 }; 303 };
297 }; 304 };
298 305
299 mmc0 { 306 mmc0 {
300 pinctrl_mmc0_clk: mmc0_clk-0 { 307 pinctrl_mmc0_clk: mmc0_clk-0 {
301 atmel,pins = 308 atmel,pins =
302 <0 27 0x1 0x0>; /* PA27 periph A */ 309 <AT91_PIOA 27 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA27 periph A */
303 }; 310 };
304 311
305 pinctrl_mmc0_slot0_cmd_dat0: mmc0_slot0_cmd_dat0-0 { 312 pinctrl_mmc0_slot0_cmd_dat0: mmc0_slot0_cmd_dat0-0 {
306 atmel,pins = 313 atmel,pins =
307 <0 28 0x1 0x1 /* PA28 periph A with pullup */ 314 <AT91_PIOA 28 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA28 periph A with pullup */
308 0 29 0x1 0x1>; /* PA29 periph A with pullup */ 315 AT91_PIOA 29 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA29 periph A with pullup */
309 }; 316 };
310 317
311 pinctrl_mmc0_slot0_dat1_3: mmc0_slot0_dat1_3-0 { 318 pinctrl_mmc0_slot0_dat1_3: mmc0_slot0_dat1_3-0 {
312 atmel,pins = 319 atmel,pins =
313 <1 3 0x2 0x1 /* PB3 periph B with pullup */ 320 <AT91_PIOB 3 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PB3 periph B with pullup */
314 1 4 0x2 0x1 /* PB4 periph B with pullup */ 321 AT91_PIOB 4 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PB4 periph B with pullup */
315 1 5 0x2 0x1>; /* PB5 periph B with pullup */ 322 AT91_PIOB 5 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>; /* PB5 periph B with pullup */
316 }; 323 };
317 324
318 pinctrl_mmc0_slot1_cmd_dat0: mmc0_slot1_cmd_dat0-0 { 325 pinctrl_mmc0_slot1_cmd_dat0: mmc0_slot1_cmd_dat0-0 {
319 atmel,pins = 326 atmel,pins =
320 <0 8 0x2 0x1 /* PA8 periph B with pullup */ 327 <AT91_PIOA 8 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA8 periph B with pullup */
321 0 9 0x2 0x1>; /* PA9 periph B with pullup */ 328 AT91_PIOA 9 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>; /* PA9 periph B with pullup */
322 }; 329 };
323 330
324 pinctrl_mmc0_slot1_dat1_3: mmc0_slot1_dat1_3-0 { 331 pinctrl_mmc0_slot1_dat1_3: mmc0_slot1_dat1_3-0 {
325 atmel,pins = 332 atmel,pins =
326 <0 10 0x2 0x1 /* PA10 periph B with pullup */ 333 <AT91_PIOA 10 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA10 periph B with pullup */
327 0 11 0x2 0x1 /* PA11 periph B with pullup */ 334 AT91_PIOA 11 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA11 periph B with pullup */
328 0 12 0x2 0x1>; /* PA12 periph B with pullup */ 335 AT91_PIOA 12 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>; /* PA12 periph B with pullup */
329 }; 336 };
330 }; 337 };
331 338
332 ssc0 { 339 ssc0 {
333 pinctrl_ssc0_tx: ssc0_tx-0 { 340 pinctrl_ssc0_tx: ssc0_tx-0 {
334 atmel,pins = 341 atmel,pins =
335 <1 0 0x1 0x0 /* PB0 periph A */ 342 <AT91_PIOB 0 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB0 periph A */
336 1 1 0x1 0x0 /* PB1 periph A */ 343 AT91_PIOB 1 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB1 periph A */
337 1 2 0x1 0x0>; /* PB2 periph A */ 344 AT91_PIOB 2 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB2 periph A */
338 }; 345 };
339 346
340 pinctrl_ssc0_rx: ssc0_rx-0 { 347 pinctrl_ssc0_rx: ssc0_rx-0 {
341 atmel,pins = 348 atmel,pins =
342 <1 3 0x1 0x0 /* PB3 periph A */ 349 <AT91_PIOB 3 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB3 periph A */
343 1 4 0x1 0x0 /* PB4 periph A */ 350 AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB4 periph A */
344 1 5 0x1 0x0>; /* PB5 periph A */ 351 AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB5 periph A */
345 }; 352 };
346 }; 353 };
347 354
348 ssc1 { 355 ssc1 {
349 pinctrl_ssc1_tx: ssc1_tx-0 { 356 pinctrl_ssc1_tx: ssc1_tx-0 {
350 atmel,pins = 357 atmel,pins =
351 <1 6 0x1 0x0 /* PB6 periph A */ 358 <AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB6 periph A */
352 1 7 0x1 0x0 /* PB7 periph A */ 359 AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB7 periph A */
353 1 8 0x1 0x0>; /* PB8 periph A */ 360 AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB8 periph A */
354 }; 361 };
355 362
356 pinctrl_ssc1_rx: ssc1_rx-0 { 363 pinctrl_ssc1_rx: ssc1_rx-0 {
357 atmel,pins = 364 atmel,pins =
358 <1 9 0x1 0x0 /* PB9 periph A */ 365 <AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB9 periph A */
359 1 10 0x1 0x0 /* PB10 periph A */ 366 AT91_PIOB 10 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB10 periph A */
360 1 11 0x1 0x0>; /* PB11 periph A */ 367 AT91_PIOB 11 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB11 periph A */
361 }; 368 };
362 }; 369 };
363 370
364 ssc2 { 371 ssc2 {
365 pinctrl_ssc2_tx: ssc2_tx-0 { 372 pinctrl_ssc2_tx: ssc2_tx-0 {
366 atmel,pins = 373 atmel,pins =
367 <1 12 0x1 0x0 /* PB12 periph A */ 374 <AT91_PIOB 12 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB12 periph A */
368 1 13 0x1 0x0 /* PB13 periph A */ 375 AT91_PIOB 13 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB13 periph A */
369 1 14 0x1 0x0>; /* PB14 periph A */ 376 AT91_PIOB 14 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB14 periph A */
370 }; 377 };
371 378
372 pinctrl_ssc2_rx: ssc2_rx-0 { 379 pinctrl_ssc2_rx: ssc2_rx-0 {
373 atmel,pins = 380 atmel,pins =
374 <1 15 0x1 0x0 /* PB15 periph A */ 381 <AT91_PIOB 15 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB15 periph A */
375 1 16 0x1 0x0 /* PB16 periph A */ 382 AT91_PIOB 16 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB16 periph A */
376 1 17 0x1 0x0>; /* PB17 periph A */ 383 AT91_PIOB 17 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB17 periph A */
377 }; 384 };
378 }; 385 };
379 386
380 twi { 387 twi {
381 pinctrl_twi: twi-0 { 388 pinctrl_twi: twi-0 {
382 atmel,pins = 389 atmel,pins =
383 <0 25 0x1 0x2 /* PA25 periph A with multi drive */ 390 <AT91_PIOA 25 AT91_PERIPH_A AT91_PINCTRL_MULTI_DRIVE /* PA25 periph A with multi drive */
384 0 26 0x1 0x2>; /* PA26 periph A with multi drive */ 391 AT91_PIOA 26 AT91_PERIPH_A AT91_PINCTRL_MULTI_DRIVE>; /* PA26 periph A with multi drive */
385 }; 392 };
386 393
387 pinctrl_twi_gpio: twi_gpio-0 { 394 pinctrl_twi_gpio: twi_gpio-0 {
388 atmel,pins = 395 atmel,pins =
389 <0 25 0x0 0x2 /* PA25 GPIO with multi drive */ 396 <AT91_PIOA 25 AT91_PERIPH_GPIO AT91_PINCTRL_MULTI_DRIVE /* PA25 GPIO with multi drive */
390 0 26 0x0 0x2>; /* PA26 GPIO with multi drive */ 397 AT91_PIOA 26 AT91_PERIPH_GPIO AT91_PINCTRL_MULTI_DRIVE>; /* PA26 GPIO with multi drive */
391 }; 398 };
392 }; 399 };
393 400
394 pioA: gpio@fffff400 { 401 pioA: gpio@fffff400 {
395 compatible = "atmel,at91rm9200-gpio"; 402 compatible = "atmel,at91rm9200-gpio";
396 reg = <0xfffff400 0x200>; 403 reg = <0xfffff400 0x200>;
397 interrupts = <2 4 1>; 404 interrupts = <2 IRQ_TYPE_LEVEL_HIGH 1>;
398 #gpio-cells = <2>; 405 #gpio-cells = <2>;
399 gpio-controller; 406 gpio-controller;
400 interrupt-controller; 407 interrupt-controller;
@@ -404,7 +411,7 @@
404 pioB: gpio@fffff600 { 411 pioB: gpio@fffff600 {
405 compatible = "atmel,at91rm9200-gpio"; 412 compatible = "atmel,at91rm9200-gpio";
406 reg = <0xfffff600 0x200>; 413 reg = <0xfffff600 0x200>;
407 interrupts = <3 4 1>; 414 interrupts = <3 IRQ_TYPE_LEVEL_HIGH 1>;
408 #gpio-cells = <2>; 415 #gpio-cells = <2>;
409 gpio-controller; 416 gpio-controller;
410 interrupt-controller; 417 interrupt-controller;
@@ -414,7 +421,7 @@
414 pioC: gpio@fffff800 { 421 pioC: gpio@fffff800 {
415 compatible = "atmel,at91rm9200-gpio"; 422 compatible = "atmel,at91rm9200-gpio";
416 reg = <0xfffff800 0x200>; 423 reg = <0xfffff800 0x200>;
417 interrupts = <4 4 1>; 424 interrupts = <4 IRQ_TYPE_LEVEL_HIGH 1>;
418 #gpio-cells = <2>; 425 #gpio-cells = <2>;
419 gpio-controller; 426 gpio-controller;
420 interrupt-controller; 427 interrupt-controller;
@@ -424,7 +431,7 @@
424 pioD: gpio@fffffa00 { 431 pioD: gpio@fffffa00 {
425 compatible = "atmel,at91rm9200-gpio"; 432 compatible = "atmel,at91rm9200-gpio";
426 reg = <0xfffffa00 0x200>; 433 reg = <0xfffffa00 0x200>;
427 interrupts = <5 4 1>; 434 interrupts = <5 IRQ_TYPE_LEVEL_HIGH 1>;
428 #gpio-cells = <2>; 435 #gpio-cells = <2>;
429 gpio-controller; 436 gpio-controller;
430 interrupt-controller; 437 interrupt-controller;
@@ -435,7 +442,7 @@
435 dbgu: serial@fffff200 { 442 dbgu: serial@fffff200 {
436 compatible = "atmel,at91rm9200-usart"; 443 compatible = "atmel,at91rm9200-usart";
437 reg = <0xfffff200 0x200>; 444 reg = <0xfffff200 0x200>;
438 interrupts = <1 4 7>; 445 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
439 pinctrl-names = "default"; 446 pinctrl-names = "default";
440 pinctrl-0 = <&pinctrl_dbgu>; 447 pinctrl-0 = <&pinctrl_dbgu>;
441 status = "disabled"; 448 status = "disabled";
@@ -444,7 +451,7 @@
444 usart0: serial@fffc0000 { 451 usart0: serial@fffc0000 {
445 compatible = "atmel,at91rm9200-usart"; 452 compatible = "atmel,at91rm9200-usart";
446 reg = <0xfffc0000 0x200>; 453 reg = <0xfffc0000 0x200>;
447 interrupts = <6 4 5>; 454 interrupts = <6 IRQ_TYPE_LEVEL_HIGH 5>;
448 atmel,use-dma-rx; 455 atmel,use-dma-rx;
449 atmel,use-dma-tx; 456 atmel,use-dma-tx;
450 pinctrl-names = "default"; 457 pinctrl-names = "default";
@@ -455,7 +462,7 @@
455 usart1: serial@fffc4000 { 462 usart1: serial@fffc4000 {
456 compatible = "atmel,at91rm9200-usart"; 463 compatible = "atmel,at91rm9200-usart";
457 reg = <0xfffc4000 0x200>; 464 reg = <0xfffc4000 0x200>;
458 interrupts = <7 4 5>; 465 interrupts = <7 IRQ_TYPE_LEVEL_HIGH 5>;
459 atmel,use-dma-rx; 466 atmel,use-dma-rx;
460 atmel,use-dma-tx; 467 atmel,use-dma-tx;
461 pinctrl-names = "default"; 468 pinctrl-names = "default";
@@ -466,7 +473,7 @@
466 usart2: serial@fffc8000 { 473 usart2: serial@fffc8000 {
467 compatible = "atmel,at91rm9200-usart"; 474 compatible = "atmel,at91rm9200-usart";
468 reg = <0xfffc8000 0x200>; 475 reg = <0xfffc8000 0x200>;
469 interrupts = <8 4 5>; 476 interrupts = <8 IRQ_TYPE_LEVEL_HIGH 5>;
470 atmel,use-dma-rx; 477 atmel,use-dma-rx;
471 atmel,use-dma-tx; 478 atmel,use-dma-tx;
472 pinctrl-names = "default"; 479 pinctrl-names = "default";
@@ -477,7 +484,7 @@
477 usart3: serial@fffcc000 { 484 usart3: serial@fffcc000 {
478 compatible = "atmel,at91rm9200-usart"; 485 compatible = "atmel,at91rm9200-usart";
479 reg = <0xfffcc000 0x200>; 486 reg = <0xfffcc000 0x200>;
480 interrupts = <23 4 5>; 487 interrupts = <23 IRQ_TYPE_LEVEL_HIGH 5>;
481 atmel,use-dma-rx; 488 atmel,use-dma-rx;
482 atmel,use-dma-tx; 489 atmel,use-dma-tx;
483 pinctrl-names = "default"; 490 pinctrl-names = "default";
@@ -488,7 +495,7 @@
488 usb1: gadget@fffb0000 { 495 usb1: gadget@fffb0000 {
489 compatible = "atmel,at91rm9200-udc"; 496 compatible = "atmel,at91rm9200-udc";
490 reg = <0xfffb0000 0x4000>; 497 reg = <0xfffb0000 0x4000>;
491 interrupts = <11 4 2>; 498 interrupts = <11 IRQ_TYPE_LEVEL_HIGH 2>;
492 status = "disabled"; 499 status = "disabled";
493 }; 500 };
494 }; 501 };
@@ -503,9 +510,9 @@
503 pinctrl-names = "default"; 510 pinctrl-names = "default";
504 pinctrl-0 = <&pinctrl_nand>; 511 pinctrl-0 = <&pinctrl_nand>;
505 nand-ecc-mode = "soft"; 512 nand-ecc-mode = "soft";
506 gpios = <&pioC 2 0 513 gpios = <&pioC 2 GPIO_ACTIVE_HIGH
507 0 514 0
508 &pioB 1 0 515 &pioB 1 GPIO_ACTIVE_HIGH
509 >; 516 >;
510 status = "disabled"; 517 status = "disabled";
511 }; 518 };
@@ -513,15 +520,15 @@
513 usb0: ohci@00300000 { 520 usb0: ohci@00300000 {
514 compatible = "atmel,at91rm9200-ohci", "usb-ohci"; 521 compatible = "atmel,at91rm9200-ohci", "usb-ohci";
515 reg = <0x00300000 0x100000>; 522 reg = <0x00300000 0x100000>;
516 interrupts = <23 4 2>; 523 interrupts = <23 IRQ_TYPE_LEVEL_HIGH 2>;
517 status = "disabled"; 524 status = "disabled";
518 }; 525 };
519 }; 526 };
520 527
521 i2c@0 { 528 i2c@0 {
522 compatible = "i2c-gpio"; 529 compatible = "i2c-gpio";
523 gpios = <&pioA 25 0 /* sda */ 530 gpios = <&pioA 25 GPIO_ACTIVE_HIGH /* sda */
524 &pioA 26 0 /* scl */ 531 &pioA 26 GPIO_ACTIVE_HIGH /* scl */
525 >; 532 >;
526 i2c-gpio,sda-open-drain; 533 i2c-gpio,sda-open-drain;
527 i2c-gpio,scl-open-drain; 534 i2c-gpio,scl-open-drain;
diff --git a/arch/arm/boot/dts/at91rm9200ek.dts b/arch/arm/boot/dts/at91rm9200ek.dts
index e586d85f8e23..14058125d123 100644
--- a/arch/arm/boot/dts/at91rm9200ek.dts
+++ b/arch/arm/boot/dts/at91rm9200ek.dts
@@ -6,7 +6,7 @@
6 * Licensed under GPLv2 only 6 * Licensed under GPLv2 only
7 */ 7 */
8/dts-v1/; 8/dts-v1/;
9/include/ "at91rm9200.dtsi" 9#include "at91rm9200.dtsi"
10 10
11/ { 11/ {
12 model = "Atmel AT91RM9200 evaluation kit"; 12 model = "Atmel AT91RM9200 evaluation kit";
@@ -50,7 +50,7 @@
50 }; 50 };
51 51
52 usb1: gadget@fffb0000 { 52 usb1: gadget@fffb0000 {
53 atmel,vbus-gpio = <&pioD 4 0>; 53 atmel,vbus-gpio = <&pioD 4 GPIO_ACTIVE_HIGH>;
54 status = "okay"; 54 status = "okay";
55 }; 55 };
56 }; 56 };
@@ -66,19 +66,19 @@
66 66
67 ds2 { 67 ds2 {
68 label = "green"; 68 label = "green";
69 gpios = <&pioB 0 0x1>; 69 gpios = <&pioB 0 GPIO_ACTIVE_LOW>;
70 linux,default-trigger = "mmc0"; 70 linux,default-trigger = "mmc0";
71 }; 71 };
72 72
73 ds4 { 73 ds4 {
74 label = "yellow"; 74 label = "yellow";
75 gpios = <&pioB 1 0x1>; 75 gpios = <&pioB 1 GPIO_ACTIVE_LOW>;
76 linux,default-trigger = "heartbeat"; 76 linux,default-trigger = "heartbeat";
77 }; 77 };
78 78
79 ds6 { 79 ds6 {
80 label = "red"; 80 label = "red";
81 gpios = <&pioB 2 0x1>; 81 gpios = <&pioB 2 GPIO_ACTIVE_LOW>;
82 }; 82 };
83 }; 83 };
84}; 84};
diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index 84c4bef2d726..a776f50f1243 100644
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -8,7 +8,10 @@
8 * Licensed under GPLv2 or later. 8 * Licensed under GPLv2 or later.
9 */ 9 */
10 10
11/include/ "skeleton.dtsi" 11#include "skeleton.dtsi"
12#include <dt-bindings/pinctrl/at91.h>
13#include <dt-bindings/interrupt-controller/irq.h>
14#include <dt-bindings/gpio/gpio.h>
12 15
13/ { 16/ {
14 model = "Atmel AT91SAM9260 family SoC"; 17 model = "Atmel AT91SAM9260 family SoC";
@@ -84,19 +87,23 @@
84 pit: timer@fffffd30 { 87 pit: timer@fffffd30 {
85 compatible = "atmel,at91sam9260-pit"; 88 compatible = "atmel,at91sam9260-pit";
86 reg = <0xfffffd30 0xf>; 89 reg = <0xfffffd30 0xf>;
87 interrupts = <1 4 7>; 90 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
88 }; 91 };
89 92
90 tcb0: timer@fffa0000 { 93 tcb0: timer@fffa0000 {
91 compatible = "atmel,at91rm9200-tcb"; 94 compatible = "atmel,at91rm9200-tcb";
92 reg = <0xfffa0000 0x100>; 95 reg = <0xfffa0000 0x100>;
93 interrupts = <17 4 0 18 4 0 19 4 0>; 96 interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0
97 18 IRQ_TYPE_LEVEL_HIGH 0
98 19 IRQ_TYPE_LEVEL_HIGH 0>;
94 }; 99 };
95 100
96 tcb1: timer@fffdc000 { 101 tcb1: timer@fffdc000 {
97 compatible = "atmel,at91rm9200-tcb"; 102 compatible = "atmel,at91rm9200-tcb";
98 reg = <0xfffdc000 0x100>; 103 reg = <0xfffdc000 0x100>;
99 interrupts = <26 4 0 27 4 0 28 4 0>; 104 interrupts = <26 IRQ_TYPE_LEVEL_HIGH 0
105 27 IRQ_TYPE_LEVEL_HIGH 0
106 28 IRQ_TYPE_LEVEL_HIGH 0>;
100 }; 107 };
101 108
102 pinctrl@fffff400 { 109 pinctrl@fffff400 {
@@ -116,234 +123,234 @@
116 dbgu { 123 dbgu {
117 pinctrl_dbgu: dbgu-0 { 124 pinctrl_dbgu: dbgu-0 {
118 atmel,pins = 125 atmel,pins =
119 <1 14 0x1 0x0 /* PB14 periph A */ 126 <AT91_PIOB 14 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB14 periph A */
120 1 15 0x1 0x1>; /* PB15 periph with pullup */ 127 AT91_PIOB 15 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PB15 periph with pullup */
121 }; 128 };
122 }; 129 };
123 130
124 usart0 { 131 usart0 {
125 pinctrl_usart0: usart0-0 { 132 pinctrl_usart0: usart0-0 {
126 atmel,pins = 133 atmel,pins =
127 <1 4 0x1 0x0 /* PB4 periph A */ 134 <AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB4 periph A */
128 1 5 0x1 0x0>; /* PB5 periph A */ 135 AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB5 periph A */
129 }; 136 };
130 137
131 pinctrl_usart0_rts: usart0_rts-0 { 138 pinctrl_usart0_rts: usart0_rts-0 {
132 atmel,pins = 139 atmel,pins =
133 <1 26 0x1 0x0>; /* PB26 periph A */ 140 <AT91_PIOB 26 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB26 periph A */
134 }; 141 };
135 142
136 pinctrl_usart0_cts: usart0_cts-0 { 143 pinctrl_usart0_cts: usart0_cts-0 {
137 atmel,pins = 144 atmel,pins =
138 <1 27 0x1 0x0>; /* PB27 periph A */ 145 <AT91_PIOB 27 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB27 periph A */
139 }; 146 };
140 147
141 pinctrl_usart0_dtr_dsr: usart0_dtr_dsr-0 { 148 pinctrl_usart0_dtr_dsr: usart0_dtr_dsr-0 {
142 atmel,pins = 149 atmel,pins =
143 <1 24 0x1 0x0 /* PB24 periph A */ 150 <AT91_PIOB 24 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB24 periph A */
144 1 22 0x1 0x0>; /* PB22 periph A */ 151 AT91_PIOB 22 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB22 periph A */
145 }; 152 };
146 153
147 pinctrl_usart0_dcd: usart0_dcd-0 { 154 pinctrl_usart0_dcd: usart0_dcd-0 {
148 atmel,pins = 155 atmel,pins =
149 <1 23 0x1 0x0>; /* PB23 periph A */ 156 <AT91_PIOB 23 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB23 periph A */
150 }; 157 };
151 158
152 pinctrl_usart0_ri: usart0_ri-0 { 159 pinctrl_usart0_ri: usart0_ri-0 {
153 atmel,pins = 160 atmel,pins =
154 <1 25 0x1 0x0>; /* PB25 periph A */ 161 <AT91_PIOB 25 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB25 periph A */
155 }; 162 };
156 }; 163 };
157 164
158 usart1 { 165 usart1 {
159 pinctrl_usart1: usart1-0 { 166 pinctrl_usart1: usart1-0 {
160 atmel,pins = 167 atmel,pins =
161 <1 6 0x1 0x1 /* PB6 periph A with pullup */ 168 <AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB6 periph A with pullup */
162 1 7 0x1 0x0>; /* PB7 periph A */ 169 AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB7 periph A */
163 }; 170 };
164 171
165 pinctrl_usart1_rts: usart1_rts-0 { 172 pinctrl_usart1_rts: usart1_rts-0 {
166 atmel,pins = 173 atmel,pins =
167 <1 28 0x1 0x0>; /* PB28 periph A */ 174 <AT91_PIOB 28 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB28 periph A */
168 }; 175 };
169 176
170 pinctrl_usart1_cts: usart1_cts-0 { 177 pinctrl_usart1_cts: usart1_cts-0 {
171 atmel,pins = 178 atmel,pins =
172 <1 29 0x1 0x0>; /* PB29 periph A */ 179 <AT91_PIOB 29 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB29 periph A */
173 }; 180 };
174 }; 181 };
175 182
176 usart2 { 183 usart2 {
177 pinctrl_usart2: usart2-0 { 184 pinctrl_usart2: usart2-0 {
178 atmel,pins = 185 atmel,pins =
179 <1 8 0x1 0x1 /* PB8 periph A with pullup */ 186 <AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB8 periph A with pullup */
180 1 9 0x1 0x0>; /* PB9 periph A */ 187 AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB9 periph A */
181 }; 188 };
182 189
183 pinctrl_usart2_rts: usart2_rts-0 { 190 pinctrl_usart2_rts: usart2_rts-0 {
184 atmel,pins = 191 atmel,pins =
185 <0 4 0x1 0x0>; /* PA4 periph A */ 192 <AT91_PIOA 4 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA4 periph A */
186 }; 193 };
187 194
188 pinctrl_usart2_cts: usart2_cts-0 { 195 pinctrl_usart2_cts: usart2_cts-0 {
189 atmel,pins = 196 atmel,pins =
190 <0 5 0x1 0x0>; /* PA5 periph A */ 197 <AT91_PIOA 5 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA5 periph A */
191 }; 198 };
192 }; 199 };
193 200
194 usart3 { 201 usart3 {
195 pinctrl_usart3: usart3-0 { 202 pinctrl_usart3: usart3-0 {
196 atmel,pins = 203 atmel,pins =
197 <1 10 0x1 0x1 /* PB10 periph A with pullup */ 204 <AT91_PIOB 10 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB10 periph A with pullup */
198 1 11 0x1 0x0>; /* PB11 periph A */ 205 AT91_PIOB 11 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB11 periph A */
199 }; 206 };
200 207
201 pinctrl_usart3_rts: usart3_rts-0 { 208 pinctrl_usart3_rts: usart3_rts-0 {
202 atmel,pins = 209 atmel,pins =
203 <2 8 0x2 0x0>; /* PC8 periph B */ 210 <AT91_PIOB 8 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC8 periph B */
204 }; 211 };
205 212
206 pinctrl_usart3_cts: usart3_cts-0 { 213 pinctrl_usart3_cts: usart3_cts-0 {
207 atmel,pins = 214 atmel,pins =
208 <2 10 0x2 0x0>; /* PC10 periph B */ 215 <AT91_PIOB 10 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC10 periph B */
209 }; 216 };
210 }; 217 };
211 218
212 uart0 { 219 uart0 {
213 pinctrl_uart0: uart0-0 { 220 pinctrl_uart0: uart0-0 {
214 atmel,pins = 221 atmel,pins =
215 <0 31 0x2 0x1 /* PA31 periph B with pullup */ 222 <AT91_PIOA 31 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA31 periph B with pullup */
216 0 30 0x2 0x0>; /* PA30 periph B */ 223 AT91_PIOA 30 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA30 periph B */
217 }; 224 };
218 }; 225 };
219 226
220 uart1 { 227 uart1 {
221 pinctrl_uart1: uart1-0 { 228 pinctrl_uart1: uart1-0 {
222 atmel,pins = 229 atmel,pins =
223 <1 12 0x1 0x1 /* PB12 periph A with pullup */ 230 <AT91_PIOB 12 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB12 periph A with pullup */
224 1 13 0x1 0x0>; /* PB13 periph A */ 231 AT91_PIOB 13 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB13 periph A */
225 }; 232 };
226 }; 233 };
227 234
228 nand { 235 nand {
229 pinctrl_nand: nand-0 { 236 pinctrl_nand: nand-0 {
230 atmel,pins = 237 atmel,pins =
231 <2 13 0x0 0x1 /* PC13 gpio RDY pin pull_up */ 238 <AT91_PIOC 13 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP /* PC13 gpio RDY pin pull_up */
232 2 14 0x0 0x1>; /* PC14 gpio enable pin pull_up */ 239 AT91_PIOC 14 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; /* PC14 gpio enable pin pull_up */
233 }; 240 };
234 }; 241 };
235 242
236 macb { 243 macb {
237 pinctrl_macb_rmii: macb_rmii-0 { 244 pinctrl_macb_rmii: macb_rmii-0 {
238 atmel,pins = 245 atmel,pins =
239 <0 12 0x1 0x0 /* PA12 periph A */ 246 <AT91_PIOA 12 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA12 periph A */
240 0 13 0x1 0x0 /* PA13 periph A */ 247 AT91_PIOA 13 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA13 periph A */
241 0 14 0x1 0x0 /* PA14 periph A */ 248 AT91_PIOA 14 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA14 periph A */
242 0 15 0x1 0x0 /* PA15 periph A */ 249 AT91_PIOA 15 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA15 periph A */
243 0 16 0x1 0x0 /* PA16 periph A */ 250 AT91_PIOA 16 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA16 periph A */
244 0 17 0x1 0x0 /* PA17 periph A */ 251 AT91_PIOA 17 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA17 periph A */
245 0 18 0x1 0x0 /* PA18 periph A */ 252 AT91_PIOA 18 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA18 periph A */
246 0 19 0x1 0x0 /* PA19 periph A */ 253 AT91_PIOA 19 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA19 periph A */
247 0 20 0x1 0x0 /* PA20 periph A */ 254 AT91_PIOA 20 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA20 periph A */
248 0 21 0x1 0x0>; /* PA21 periph A */ 255 AT91_PIOA 21 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA21 periph A */
249 }; 256 };
250 257
251 pinctrl_macb_rmii_mii: macb_rmii_mii-0 { 258 pinctrl_macb_rmii_mii: macb_rmii_mii-0 {
252 atmel,pins = 259 atmel,pins =
253 <0 22 0x2 0x0 /* PA22 periph B */ 260 <AT91_PIOA 22 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA22 periph B */
254 0 23 0x2 0x0 /* PA23 periph B */ 261 AT91_PIOA 23 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA23 periph B */
255 0 24 0x2 0x0 /* PA24 periph B */ 262 AT91_PIOA 24 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA24 periph B */
256 0 25 0x2 0x0 /* PA25 periph B */ 263 AT91_PIOA 25 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA25 periph B */
257 0 26 0x2 0x0 /* PA26 periph B */ 264 AT91_PIOA 26 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA26 periph B */
258 0 27 0x2 0x0 /* PA27 periph B */ 265 AT91_PIOA 27 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA27 periph B */
259 0 28 0x2 0x0 /* PA28 periph B */ 266 AT91_PIOA 28 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA28 periph B */
260 0 29 0x2 0x0>; /* PA29 periph B */ 267 AT91_PIOA 29 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA29 periph B */
261 }; 268 };
262 269
263 pinctrl_macb_rmii_mii_alt: macb_rmii_mii-1 { 270 pinctrl_macb_rmii_mii_alt: macb_rmii_mii-1 {
264 atmel,pins = 271 atmel,pins =
265 <0 10 0x2 0x0 /* PA10 periph B */ 272 <AT91_PIOA 10 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA10 periph B */
266 0 11 0x2 0x0 /* PA11 periph B */ 273 AT91_PIOA 11 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA11 periph B */
267 0 22 0x2 0x0 /* PA22 periph B */ 274 AT91_PIOA 24 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA24 periph B */
268 0 25 0x2 0x0 /* PA25 periph B */ 275 AT91_PIOA 25 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA25 periph B */
269 0 26 0x2 0x0 /* PA26 periph B */ 276 AT91_PIOA 26 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA26 periph B */
270 0 27 0x2 0x0 /* PA27 periph B */ 277 AT91_PIOA 27 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA27 periph B */
271 0 28 0x2 0x0 /* PA28 periph B */ 278 AT91_PIOA 28 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA28 periph B */
272 0 29 0x2 0x0>; /* PA29 periph B */ 279 AT91_PIOA 29 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA29 periph B */
273 }; 280 };
274 }; 281 };
275 282
276 mmc0 { 283 mmc0 {
277 pinctrl_mmc0_clk: mmc0_clk-0 { 284 pinctrl_mmc0_clk: mmc0_clk-0 {
278 atmel,pins = 285 atmel,pins =
279 <0 8 0x1 0x0>; /* PA8 periph A */ 286 <AT91_PIOA 8 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA8 periph A */
280 }; 287 };
281 288
282 pinctrl_mmc0_slot0_cmd_dat0: mmc0_slot0_cmd_dat0-0 { 289 pinctrl_mmc0_slot0_cmd_dat0: mmc0_slot0_cmd_dat0-0 {
283 atmel,pins = 290 atmel,pins =
284 <0 7 0x1 0x1 /* PA7 periph A with pullup */ 291 <AT91_PIOA 7 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA7 periph A with pullup */
285 0 6 0x1 0x1>; /* PA6 periph A with pullup */ 292 AT91_PIOA 6 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA6 periph A with pullup */
286 }; 293 };
287 294
288 pinctrl_mmc0_slot0_dat1_3: mmc0_slot0_dat1_3-0 { 295 pinctrl_mmc0_slot0_dat1_3: mmc0_slot0_dat1_3-0 {
289 atmel,pins = 296 atmel,pins =
290 <0 9 0x1 0x1 /* PA9 periph A with pullup */ 297 <AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA9 periph A with pullup */
291 0 10 0x1 0x1 /* PA10 periph A with pullup */ 298 AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA10 periph A with pullup */
292 0 11 0x1 0x1>; /* PA11 periph A with pullup */ 299 AT91_PIOA 11 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA11 periph A with pullup */
293 }; 300 };
294 301
295 pinctrl_mmc0_slot1_cmd_dat0: mmc0_slot1_cmd_dat0-0 { 302 pinctrl_mmc0_slot1_cmd_dat0: mmc0_slot1_cmd_dat0-0 {
296 atmel,pins = 303 atmel,pins =
297 <0 1 0x2 0x1 /* PA1 periph B with pullup */ 304 <AT91_PIOA 1 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA1 periph B with pullup */
298 0 0 0x2 0x1>; /* PA0 periph B with pullup */ 305 AT91_PIOA 0 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>; /* PA0 periph B with pullup */
299 }; 306 };
300 307
301 pinctrl_mmc0_slot1_dat1_3: mmc0_slot1_dat1_3-0 { 308 pinctrl_mmc0_slot1_dat1_3: mmc0_slot1_dat1_3-0 {
302 atmel,pins = 309 atmel,pins =
303 <0 5 0x2 0x1 /* PA5 periph B with pullup */ 310 <AT91_PIOA 5 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA5 periph B with pullup */
304 0 4 0x2 0x1 /* PA4 periph B with pullup */ 311 AT91_PIOA 4 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA4 periph B with pullup */
305 0 3 0x2 0x1>; /* PA3 periph B with pullup */ 312 AT91_PIOA 3 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>; /* PA3 periph B with pullup */
306 }; 313 };
307 }; 314 };
308 315
309 ssc0 { 316 ssc0 {
310 pinctrl_ssc0_tx: ssc0_tx-0 { 317 pinctrl_ssc0_tx: ssc0_tx-0 {
311 atmel,pins = 318 atmel,pins =
312 <1 16 0x1 0x0 /* PB16 periph A */ 319 <AT91_PIOB 16 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB16 periph A */
313 1 17 0x1 0x0 /* PB17 periph A */ 320 AT91_PIOB 17 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB17 periph A */
314 1 18 0x1 0x0>; /* PB18 periph A */ 321 AT91_PIOB 18 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB18 periph A */
315 }; 322 };
316 323
317 pinctrl_ssc0_rx: ssc0_rx-0 { 324 pinctrl_ssc0_rx: ssc0_rx-0 {
318 atmel,pins = 325 atmel,pins =
319 <1 19 0x1 0x0 /* PB19 periph A */ 326 <AT91_PIOB 19 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB19 periph A */
320 1 20 0x1 0x0 /* PB20 periph A */ 327 AT91_PIOB 20 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB20 periph A */
321 1 21 0x1 0x0>; /* PB21 periph A */ 328 AT91_PIOB 21 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB21 periph A */
322 }; 329 };
323 }; 330 };
324 331
325 spi0 { 332 spi0 {
326 pinctrl_spi0: spi0-0 { 333 pinctrl_spi0: spi0-0 {
327 atmel,pins = 334 atmel,pins =
328 <0 0 0x1 0x0 /* PA0 periph A SPI0_MISO pin */ 335 <AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA0 periph A SPI0_MISO pin */
329 0 1 0x1 0x0 /* PA1 periph A SPI0_MOSI pin */ 336 AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA1 periph A SPI0_MOSI pin */
330 0 2 0x1 0x0>; /* PA2 periph A SPI0_SPCK pin */ 337 AT91_PIOA 2 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA2 periph A SPI0_SPCK pin */
331 }; 338 };
332 }; 339 };
333 340
334 spi1 { 341 spi1 {
335 pinctrl_spi1: spi1-0 { 342 pinctrl_spi1: spi1-0 {
336 atmel,pins = 343 atmel,pins =
337 <1 0 0x1 0x0 /* PB0 periph A SPI1_MISO pin */ 344 <AT91_PIOB 0 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB0 periph A SPI1_MISO pin */
338 1 1 0x1 0x0 /* PB1 periph A SPI1_MOSI pin */ 345 AT91_PIOB 1 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB1 periph A SPI1_MOSI pin */
339 1 2 0x1 0x0>; /* PB2 periph A SPI1_SPCK pin */ 346 AT91_PIOB 2 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB2 periph A SPI1_SPCK pin */
340 }; 347 };
341 }; 348 };
342 349
343 pioA: gpio@fffff400 { 350 pioA: gpio@fffff400 {
344 compatible = "atmel,at91rm9200-gpio"; 351 compatible = "atmel,at91rm9200-gpio";
345 reg = <0xfffff400 0x200>; 352 reg = <0xfffff400 0x200>;
346 interrupts = <2 4 1>; 353 interrupts = <2 IRQ_TYPE_LEVEL_HIGH 1>;
347 #gpio-cells = <2>; 354 #gpio-cells = <2>;
348 gpio-controller; 355 gpio-controller;
349 interrupt-controller; 356 interrupt-controller;
@@ -353,7 +360,7 @@
353 pioB: gpio@fffff600 { 360 pioB: gpio@fffff600 {
354 compatible = "atmel,at91rm9200-gpio"; 361 compatible = "atmel,at91rm9200-gpio";
355 reg = <0xfffff600 0x200>; 362 reg = <0xfffff600 0x200>;
356 interrupts = <3 4 1>; 363 interrupts = <3 IRQ_TYPE_LEVEL_HIGH 1>;
357 #gpio-cells = <2>; 364 #gpio-cells = <2>;
358 gpio-controller; 365 gpio-controller;
359 interrupt-controller; 366 interrupt-controller;
@@ -363,7 +370,7 @@
363 pioC: gpio@fffff800 { 370 pioC: gpio@fffff800 {
364 compatible = "atmel,at91rm9200-gpio"; 371 compatible = "atmel,at91rm9200-gpio";
365 reg = <0xfffff800 0x200>; 372 reg = <0xfffff800 0x200>;
366 interrupts = <4 4 1>; 373 interrupts = <4 IRQ_TYPE_LEVEL_HIGH 1>;
367 #gpio-cells = <2>; 374 #gpio-cells = <2>;
368 gpio-controller; 375 gpio-controller;
369 interrupt-controller; 376 interrupt-controller;
@@ -374,7 +381,7 @@
374 dbgu: serial@fffff200 { 381 dbgu: serial@fffff200 {
375 compatible = "atmel,at91sam9260-usart"; 382 compatible = "atmel,at91sam9260-usart";
376 reg = <0xfffff200 0x200>; 383 reg = <0xfffff200 0x200>;
377 interrupts = <1 4 7>; 384 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
378 pinctrl-names = "default"; 385 pinctrl-names = "default";
379 pinctrl-0 = <&pinctrl_dbgu>; 386 pinctrl-0 = <&pinctrl_dbgu>;
380 status = "disabled"; 387 status = "disabled";
@@ -383,7 +390,7 @@
383 usart0: serial@fffb0000 { 390 usart0: serial@fffb0000 {
384 compatible = "atmel,at91sam9260-usart"; 391 compatible = "atmel,at91sam9260-usart";
385 reg = <0xfffb0000 0x200>; 392 reg = <0xfffb0000 0x200>;
386 interrupts = <6 4 5>; 393 interrupts = <6 IRQ_TYPE_LEVEL_HIGH 5>;
387 atmel,use-dma-rx; 394 atmel,use-dma-rx;
388 atmel,use-dma-tx; 395 atmel,use-dma-tx;
389 pinctrl-names = "default"; 396 pinctrl-names = "default";
@@ -394,7 +401,7 @@
394 usart1: serial@fffb4000 { 401 usart1: serial@fffb4000 {
395 compatible = "atmel,at91sam9260-usart"; 402 compatible = "atmel,at91sam9260-usart";
396 reg = <0xfffb4000 0x200>; 403 reg = <0xfffb4000 0x200>;
397 interrupts = <7 4 5>; 404 interrupts = <7 IRQ_TYPE_LEVEL_HIGH 5>;
398 atmel,use-dma-rx; 405 atmel,use-dma-rx;
399 atmel,use-dma-tx; 406 atmel,use-dma-tx;
400 pinctrl-names = "default"; 407 pinctrl-names = "default";
@@ -405,7 +412,7 @@
405 usart2: serial@fffb8000 { 412 usart2: serial@fffb8000 {
406 compatible = "atmel,at91sam9260-usart"; 413 compatible = "atmel,at91sam9260-usart";
407 reg = <0xfffb8000 0x200>; 414 reg = <0xfffb8000 0x200>;
408 interrupts = <8 4 5>; 415 interrupts = <8 IRQ_TYPE_LEVEL_HIGH 5>;
409 atmel,use-dma-rx; 416 atmel,use-dma-rx;
410 atmel,use-dma-tx; 417 atmel,use-dma-tx;
411 pinctrl-names = "default"; 418 pinctrl-names = "default";
@@ -416,7 +423,7 @@
416 usart3: serial@fffd0000 { 423 usart3: serial@fffd0000 {
417 compatible = "atmel,at91sam9260-usart"; 424 compatible = "atmel,at91sam9260-usart";
418 reg = <0xfffd0000 0x200>; 425 reg = <0xfffd0000 0x200>;
419 interrupts = <23 4 5>; 426 interrupts = <23 IRQ_TYPE_LEVEL_HIGH 5>;
420 atmel,use-dma-rx; 427 atmel,use-dma-rx;
421 atmel,use-dma-tx; 428 atmel,use-dma-tx;
422 pinctrl-names = "default"; 429 pinctrl-names = "default";
@@ -427,7 +434,7 @@
427 uart0: serial@fffd4000 { 434 uart0: serial@fffd4000 {
428 compatible = "atmel,at91sam9260-usart"; 435 compatible = "atmel,at91sam9260-usart";
429 reg = <0xfffd4000 0x200>; 436 reg = <0xfffd4000 0x200>;
430 interrupts = <24 4 5>; 437 interrupts = <24 IRQ_TYPE_LEVEL_HIGH 5>;
431 atmel,use-dma-rx; 438 atmel,use-dma-rx;
432 atmel,use-dma-tx; 439 atmel,use-dma-tx;
433 pinctrl-names = "default"; 440 pinctrl-names = "default";
@@ -438,7 +445,7 @@
438 uart1: serial@fffd8000 { 445 uart1: serial@fffd8000 {
439 compatible = "atmel,at91sam9260-usart"; 446 compatible = "atmel,at91sam9260-usart";
440 reg = <0xfffd8000 0x200>; 447 reg = <0xfffd8000 0x200>;
441 interrupts = <25 4 5>; 448 interrupts = <25 IRQ_TYPE_LEVEL_HIGH 5>;
442 atmel,use-dma-rx; 449 atmel,use-dma-rx;
443 atmel,use-dma-tx; 450 atmel,use-dma-tx;
444 pinctrl-names = "default"; 451 pinctrl-names = "default";
@@ -449,7 +456,7 @@
449 macb0: ethernet@fffc4000 { 456 macb0: ethernet@fffc4000 {
450 compatible = "cdns,at32ap7000-macb", "cdns,macb"; 457 compatible = "cdns,at32ap7000-macb", "cdns,macb";
451 reg = <0xfffc4000 0x100>; 458 reg = <0xfffc4000 0x100>;
452 interrupts = <21 4 3>; 459 interrupts = <21 IRQ_TYPE_LEVEL_HIGH 3>;
453 pinctrl-names = "default"; 460 pinctrl-names = "default";
454 pinctrl-0 = <&pinctrl_macb_rmii>; 461 pinctrl-0 = <&pinctrl_macb_rmii>;
455 status = "disabled"; 462 status = "disabled";
@@ -458,14 +465,14 @@
458 usb1: gadget@fffa4000 { 465 usb1: gadget@fffa4000 {
459 compatible = "atmel,at91rm9200-udc"; 466 compatible = "atmel,at91rm9200-udc";
460 reg = <0xfffa4000 0x4000>; 467 reg = <0xfffa4000 0x4000>;
461 interrupts = <10 4 2>; 468 interrupts = <10 IRQ_TYPE_LEVEL_HIGH 2>;
462 status = "disabled"; 469 status = "disabled";
463 }; 470 };
464 471
465 i2c0: i2c@fffac000 { 472 i2c0: i2c@fffac000 {
466 compatible = "atmel,at91sam9260-i2c"; 473 compatible = "atmel,at91sam9260-i2c";
467 reg = <0xfffac000 0x100>; 474 reg = <0xfffac000 0x100>;
468 interrupts = <11 4 6>; 475 interrupts = <11 IRQ_TYPE_LEVEL_HIGH 6>;
469 #address-cells = <1>; 476 #address-cells = <1>;
470 #size-cells = <0>; 477 #size-cells = <0>;
471 status = "disabled"; 478 status = "disabled";
@@ -474,7 +481,7 @@
474 mmc0: mmc@fffa8000 { 481 mmc0: mmc@fffa8000 {
475 compatible = "atmel,hsmci"; 482 compatible = "atmel,hsmci";
476 reg = <0xfffa8000 0x600>; 483 reg = <0xfffa8000 0x600>;
477 interrupts = <9 4 0>; 484 interrupts = <9 IRQ_TYPE_LEVEL_HIGH 0>;
478 #address-cells = <1>; 485 #address-cells = <1>;
479 #size-cells = <0>; 486 #size-cells = <0>;
480 status = "disabled"; 487 status = "disabled";
@@ -483,7 +490,7 @@
483 ssc0: ssc@fffbc000 { 490 ssc0: ssc@fffbc000 {
484 compatible = "atmel,at91rm9200-ssc"; 491 compatible = "atmel,at91rm9200-ssc";
485 reg = <0xfffbc000 0x4000>; 492 reg = <0xfffbc000 0x4000>;
486 interrupts = <14 4 5>; 493 interrupts = <14 IRQ_TYPE_LEVEL_HIGH 5>;
487 pinctrl-names = "default"; 494 pinctrl-names = "default";
488 pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>; 495 pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
489 status = "disabled"; 496 status = "disabled";
@@ -494,7 +501,7 @@
494 #size-cells = <0>; 501 #size-cells = <0>;
495 compatible = "atmel,at91rm9200-spi"; 502 compatible = "atmel,at91rm9200-spi";
496 reg = <0xfffc8000 0x200>; 503 reg = <0xfffc8000 0x200>;
497 interrupts = <12 4 3>; 504 interrupts = <12 IRQ_TYPE_LEVEL_HIGH 3>;
498 pinctrl-names = "default"; 505 pinctrl-names = "default";
499 pinctrl-0 = <&pinctrl_spi0>; 506 pinctrl-0 = <&pinctrl_spi0>;
500 status = "disabled"; 507 status = "disabled";
@@ -505,7 +512,7 @@
505 #size-cells = <0>; 512 #size-cells = <0>;
506 compatible = "atmel,at91rm9200-spi"; 513 compatible = "atmel,at91rm9200-spi";
507 reg = <0xfffcc000 0x200>; 514 reg = <0xfffcc000 0x200>;
508 interrupts = <13 4 3>; 515 interrupts = <13 IRQ_TYPE_LEVEL_HIGH 3>;
509 pinctrl-names = "default"; 516 pinctrl-names = "default";
510 pinctrl-0 = <&pinctrl_spi1>; 517 pinctrl-0 = <&pinctrl_spi1>;
511 status = "disabled"; 518 status = "disabled";
@@ -514,7 +521,7 @@
514 adc0: adc@fffe0000 { 521 adc0: adc@fffe0000 {
515 compatible = "atmel,at91sam9260-adc"; 522 compatible = "atmel,at91sam9260-adc";
516 reg = <0xfffe0000 0x100>; 523 reg = <0xfffe0000 0x100>;
517 interrupts = <5 4 0>; 524 interrupts = <5 IRQ_TYPE_LEVEL_HIGH 0>;
518 atmel,adc-use-external-triggers; 525 atmel,adc-use-external-triggers;
519 atmel,adc-channels-used = <0xf>; 526 atmel,adc-channels-used = <0xf>;
520 atmel,adc-vref = <3300>; 527 atmel,adc-vref = <3300>;
@@ -567,8 +574,8 @@
567 atmel,nand-cmd-offset = <22>; 574 atmel,nand-cmd-offset = <22>;
568 pinctrl-names = "default"; 575 pinctrl-names = "default";
569 pinctrl-0 = <&pinctrl_nand>; 576 pinctrl-0 = <&pinctrl_nand>;
570 gpios = <&pioC 13 0 577 gpios = <&pioC 13 GPIO_ACTIVE_HIGH
571 &pioC 14 0 578 &pioC 14 GPIO_ACTIVE_HIGH
572 0 579 0
573 >; 580 >;
574 status = "disabled"; 581 status = "disabled";
@@ -577,15 +584,15 @@
577 usb0: ohci@00500000 { 584 usb0: ohci@00500000 {
578 compatible = "atmel,at91rm9200-ohci", "usb-ohci"; 585 compatible = "atmel,at91rm9200-ohci", "usb-ohci";
579 reg = <0x00500000 0x100000>; 586 reg = <0x00500000 0x100000>;
580 interrupts = <20 4 2>; 587 interrupts = <20 IRQ_TYPE_LEVEL_HIGH 2>;
581 status = "disabled"; 588 status = "disabled";
582 }; 589 };
583 }; 590 };
584 591
585 i2c@0 { 592 i2c@0 {
586 compatible = "i2c-gpio"; 593 compatible = "i2c-gpio";
587 gpios = <&pioA 23 0 /* sda */ 594 gpios = <&pioA 23 GPIO_ACTIVE_HIGH /* sda */
588 &pioA 24 0 /* scl */ 595 &pioA 24 GPIO_ACTIVE_HIGH /* scl */
589 >; 596 >;
590 i2c-gpio,sda-open-drain; 597 i2c-gpio,sda-open-drain;
591 i2c-gpio,scl-open-drain; 598 i2c-gpio,scl-open-drain;
diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi
index 94b58ab2cc08..d9cf51a01b60 100644
--- a/arch/arm/boot/dts/at91sam9263.dtsi
+++ b/arch/arm/boot/dts/at91sam9263.dtsi
@@ -6,7 +6,10 @@
6 * Licensed under GPLv2 only. 6 * Licensed under GPLv2 only.
7 */ 7 */
8 8
9/include/ "skeleton.dtsi" 9#include "skeleton.dtsi"
10#include <dt-bindings/pinctrl/at91.h>
11#include <dt-bindings/interrupt-controller/irq.h>
12#include <dt-bindings/gpio/gpio.h>
10 13
11/ { 14/ {
12 model = "Atmel AT91SAM9263 family SoC"; 15 model = "Atmel AT91SAM9263 family SoC";
@@ -72,13 +75,13 @@
72 pit: timer@fffffd30 { 75 pit: timer@fffffd30 {
73 compatible = "atmel,at91sam9260-pit"; 76 compatible = "atmel,at91sam9260-pit";
74 reg = <0xfffffd30 0xf>; 77 reg = <0xfffffd30 0xf>;
75 interrupts = <1 4 7>; 78 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
76 }; 79 };
77 80
78 tcb0: timer@fff7c000 { 81 tcb0: timer@fff7c000 {
79 compatible = "atmel,at91rm9200-tcb"; 82 compatible = "atmel,at91rm9200-tcb";
80 reg = <0xfff7c000 0x100>; 83 reg = <0xfff7c000 0x100>;
81 interrupts = <19 4 0>; 84 interrupts = <19 IRQ_TYPE_LEVEL_HIGH 0>;
82 }; 85 };
83 86
84 rstc@fffffd00 { 87 rstc@fffffd00 {
@@ -110,221 +113,221 @@
110 dbgu { 113 dbgu {
111 pinctrl_dbgu: dbgu-0 { 114 pinctrl_dbgu: dbgu-0 {
112 atmel,pins = 115 atmel,pins =
113 <2 30 0x1 0x0 /* PC30 periph A */ 116 <AT91_PIOC 30 AT91_PERIPH_A AT91_PINCTRL_NONE /* PC30 periph A */
114 2 31 0x1 0x1>; /* PC31 periph with pullup */ 117 AT91_PIOC 31 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PC31 periph with pullup */
115 }; 118 };
116 }; 119 };
117 120
118 usart0 { 121 usart0 {
119 pinctrl_usart0: usart0-0 { 122 pinctrl_usart0: usart0-0 {
120 atmel,pins = 123 atmel,pins =
121 <0 26 0x1 0x1 /* PA26 periph A with pullup */ 124 <AT91_PIOA 26 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA26 periph A with pullup */
122 0 27 0x1 0x0>; /* PA27 periph A */ 125 AT91_PIOA 27 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA27 periph A */
123 }; 126 };
124 127
125 pinctrl_usart0_rts: usart0_rts-0 { 128 pinctrl_usart0_rts: usart0_rts-0 {
126 atmel,pins = 129 atmel,pins =
127 <0 28 0x1 0x0>; /* PA28 periph A */ 130 <AT91_PIOA 28 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA28 periph A */
128 }; 131 };
129 132
130 pinctrl_usart0_cts: usart0_cts-0 { 133 pinctrl_usart0_cts: usart0_cts-0 {
131 atmel,pins = 134 atmel,pins =
132 <0 29 0x1 0x0>; /* PA29 periph A */ 135 <AT91_PIOA 29 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA29 periph A */
133 }; 136 };
134 }; 137 };
135 138
136 usart1 { 139 usart1 {
137 pinctrl_usart1: usart1-0 { 140 pinctrl_usart1: usart1-0 {
138 atmel,pins = 141 atmel,pins =
139 <3 0 0x1 0x1 /* PD0 periph A with pullup */ 142 <AT91_PIOD 0 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD0 periph A with pullup */
140 3 1 0x1 0x0>; /* PD1 periph A */ 143 AT91_PIOD 1 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD1 periph A */
141 }; 144 };
142 145
143 pinctrl_usart1_rts: usart1_rts-0 { 146 pinctrl_usart1_rts: usart1_rts-0 {
144 atmel,pins = 147 atmel,pins =
145 <3 7 0x2 0x0>; /* PD7 periph B */ 148 <AT91_PIOD 7 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PD7 periph B */
146 }; 149 };
147 150
148 pinctrl_usart1_cts: usart1_cts-0 { 151 pinctrl_usart1_cts: usart1_cts-0 {
149 atmel,pins = 152 atmel,pins =
150 <3 8 0x2 0x0>; /* PD8 periph B */ 153 <AT91_PIOD 8 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PD8 periph B */
151 }; 154 };
152 }; 155 };
153 156
154 usart2 { 157 usart2 {
155 pinctrl_usart2: usart2-0 { 158 pinctrl_usart2: usart2-0 {
156 atmel,pins = 159 atmel,pins =
157 <3 2 0x1 0x1 /* PD2 periph A with pullup */ 160 <AT91_PIOD 2 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD2 periph A with pullup */
158 3 3 0x1 0x0>; /* PD3 periph A */ 161 AT91_PIOD 3 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD3 periph A */
159 }; 162 };
160 163
161 pinctrl_usart2_rts: usart2_rts-0 { 164 pinctrl_usart2_rts: usart2_rts-0 {
162 atmel,pins = 165 atmel,pins =
163 <3 5 0x2 0x0>; /* PD5 periph B */ 166 <AT91_PIOD 5 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PD5 periph B */
164 }; 167 };
165 168
166 pinctrl_usart2_cts: usart2_cts-0 { 169 pinctrl_usart2_cts: usart2_cts-0 {
167 atmel,pins = 170 atmel,pins =
168 <4 6 0x2 0x0>; /* PD6 periph B */ 171 <AT91_PIOD 6 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PD6 periph B */
169 }; 172 };
170 }; 173 };
171 174
172 nand { 175 nand {
173 pinctrl_nand: nand-0 { 176 pinctrl_nand: nand-0 {
174 atmel,pins = 177 atmel,pins =
175 <0 22 0x0 0x1 /* PA22 gpio RDY pin pull_up*/ 178 <AT91_PIOA 22 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP /* PA22 gpio RDY pin pull_up*/
176 3 15 0x0 0x1>; /* PD15 gpio enable pin pull_up */ 179 AT91_PIOD 15 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; /* PD15 gpio enable pin pull_up */
177 }; 180 };
178 }; 181 };
179 182
180 macb { 183 macb {
181 pinctrl_macb_rmii: macb_rmii-0 { 184 pinctrl_macb_rmii: macb_rmii-0 {
182 atmel,pins = 185 atmel,pins =
183 <2 25 0x2 0x0 /* PC25 periph B */ 186 <AT91_PIOC 25 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC25 periph B */
184 4 21 0x1 0x0 /* PE21 periph A */ 187 AT91_PIOE 21 AT91_PERIPH_A AT91_PINCTRL_NONE /* PE21 periph A */
185 4 23 0x1 0x0 /* PE23 periph A */ 188 AT91_PIOE 23 AT91_PERIPH_A AT91_PINCTRL_NONE /* PE23 periph A */
186 4 24 0x1 0x0 /* PE24 periph A */ 189 AT91_PIOE 24 AT91_PERIPH_A AT91_PINCTRL_NONE /* PE24 periph A */
187 4 25 0x1 0x0 /* PE25 periph A */ 190 AT91_PIOE 25 AT91_PERIPH_A AT91_PINCTRL_NONE /* PE25 periph A */
188 4 26 0x1 0x0 /* PE26 periph A */ 191 AT91_PIOE 26 AT91_PERIPH_A AT91_PINCTRL_NONE /* PE26 periph A */
189 4 27 0x1 0x0 /* PE27 periph A */ 192 AT91_PIOE 27 AT91_PERIPH_A AT91_PINCTRL_NONE /* PE27 periph A */
190 4 28 0x1 0x0 /* PE28 periph A */ 193 AT91_PIOE 28 AT91_PERIPH_A AT91_PINCTRL_NONE /* PE28 periph A */
191 4 29 0x1 0x0 /* PE29 periph A */ 194 AT91_PIOE 29 AT91_PERIPH_A AT91_PINCTRL_NONE /* PE29 periph A */
192 4 30 0x1 0x0>; /* PE30 periph A */ 195 AT91_PIOE 30 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PE30 periph A */
193 }; 196 };
194 197
195 pinctrl_macb_rmii_mii: macb_rmii_mii-0 { 198 pinctrl_macb_rmii_mii: macb_rmii_mii-0 {
196 atmel,pins = 199 atmel,pins =
197 <2 20 0x2 0x0 /* PC20 periph B */ 200 <AT91_PIOC 20 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC20 periph B */
198 2 21 0x2 0x0 /* PC21 periph B */ 201 AT91_PIOC 21 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC21 periph B */
199 2 22 0x2 0x0 /* PC22 periph B */ 202 AT91_PIOC 22 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC22 periph B */
200 2 23 0x2 0x0 /* PC23 periph B */ 203 AT91_PIOC 23 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC23 periph B */
201 2 24 0x2 0x0 /* PC24 periph B */ 204 AT91_PIOC 24 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC24 periph B */
202 2 25 0x2 0x0 /* PC25 periph B */ 205 AT91_PIOC 25 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC25 periph B */
203 2 27 0x2 0x0 /* PC27 periph B */ 206 AT91_PIOC 27 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC27 periph B */
204 4 22 0x2 0x0>; /* PE22 periph B */ 207 AT91_PIOE 22 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PE22 periph B */
205 }; 208 };
206 }; 209 };
207 210
208 mmc0 { 211 mmc0 {
209 pinctrl_mmc0_clk: mmc0_clk-0 { 212 pinctrl_mmc0_clk: mmc0_clk-0 {
210 atmel,pins = 213 atmel,pins =
211 <0 12 0x1 0x0>; /* PA12 periph A */ 214 <AT91_PIOA 12 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA12 periph A */
212 }; 215 };
213 216
214 pinctrl_mmc0_slot0_cmd_dat0: mmc0_slot0_cmd_dat0-0 { 217 pinctrl_mmc0_slot0_cmd_dat0: mmc0_slot0_cmd_dat0-0 {
215 atmel,pins = 218 atmel,pins =
216 <0 1 0x1 0x1 /* PA1 periph A with pullup */ 219 <AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA1 periph A with pullup */
217 0 0 0x1 0x1>; /* PA0 periph A with pullup */ 220 AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA0 periph A with pullup */
218 }; 221 };
219 222
220 pinctrl_mmc0_slot0_dat1_3: mmc0_slot0_dat1_3-0 { 223 pinctrl_mmc0_slot0_dat1_3: mmc0_slot0_dat1_3-0 {
221 atmel,pins = 224 atmel,pins =
222 <0 3 0x1 0x1 /* PA3 periph A with pullup */ 225 <AT91_PIOA 3 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA3 periph A with pullup */
223 0 4 0x1 0x1 /* PA4 periph A with pullup */ 226 AT91_PIOA 4 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA4 periph A with pullup */
224 0 5 0x1 0x1>; /* PA5 periph A with pullup */ 227 AT91_PIOA 5 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA5 periph A with pullup */
225 }; 228 };
226 229
227 pinctrl_mmc0_slot1_cmd_dat0: mmc0_slot1_cmd_dat0-0 { 230 pinctrl_mmc0_slot1_cmd_dat0: mmc0_slot1_cmd_dat0-0 {
228 atmel,pins = 231 atmel,pins =
229 <0 16 0x1 0x1 /* PA16 periph A with pullup */ 232 <AT91_PIOA 16 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA16 periph A with pullup */
230 0 17 0x1 0x1>; /* PA17 periph A with pullup */ 233 AT91_PIOA 17 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA17 periph A with pullup */
231 }; 234 };
232 235
233 pinctrl_mmc0_slot1_dat1_3: mmc0_slot1_dat1_3-0 { 236 pinctrl_mmc0_slot1_dat1_3: mmc0_slot1_dat1_3-0 {
234 atmel,pins = 237 atmel,pins =
235 <0 18 0x1 0x1 /* PA18 periph A with pullup */ 238 <AT91_PIOA 18 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA18 periph A with pullup */
236 0 19 0x1 0x1 /* PA19 periph A with pullup */ 239 AT91_PIOA 19 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA19 periph A with pullup */
237 0 20 0x1 0x1>; /* PA20 periph A with pullup */ 240 AT91_PIOA 20 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA20 periph A with pullup */
238 }; 241 };
239 }; 242 };
240 243
241 mmc1 { 244 mmc1 {
242 pinctrl_mmc1_clk: mmc1_clk-0 { 245 pinctrl_mmc1_clk: mmc1_clk-0 {
243 atmel,pins = 246 atmel,pins =
244 <0 6 0x1 0x0>; /* PA6 periph A */ 247 <AT91_PIOA 6 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA6 periph A */
245 }; 248 };
246 249
247 pinctrl_mmc1_slot0_cmd_dat0: mmc1_slot0_cmd_dat0-0 { 250 pinctrl_mmc1_slot0_cmd_dat0: mmc1_slot0_cmd_dat0-0 {
248 atmel,pins = 251 atmel,pins =
249 <0 7 0x1 0x1 /* PA7 periph A with pullup */ 252 <AT91_PIOA 7 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA7 periph A with pullup */
250 0 8 0x1 0x1>; /* PA8 periph A with pullup */ 253 AT91_PIOA 8 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA8 periph A with pullup */
251 }; 254 };
252 255
253 pinctrl_mmc1_slot0_dat1_3: mmc1_slot0_dat1_3-0 { 256 pinctrl_mmc1_slot0_dat1_3: mmc1_slot0_dat1_3-0 {
254 atmel,pins = 257 atmel,pins =
255 <0 9 0x1 0x1 /* PA9 periph A with pullup */ 258 <AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA9 periph A with pullup */
256 0 10 0x1 0x1 /* PA10 periph A with pullup */ 259 AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA10 periph A with pullup */
257 0 11 0x1 0x1>; /* PA11 periph A with pullup */ 260 AT91_PIOA 11 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA11 periph A with pullup */
258 }; 261 };
259 262
260 pinctrl_mmc1_slot1_cmd_dat0: mmc1_slot1_cmd_dat0-0 { 263 pinctrl_mmc1_slot1_cmd_dat0: mmc1_slot1_cmd_dat0-0 {
261 atmel,pins = 264 atmel,pins =
262 <0 21 0x1 0x1 /* PA21 periph A with pullup */ 265 <AT91_PIOA 21 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA21 periph A with pullup */
263 0 22 0x1 0x1>; /* PA22 periph A with pullup */ 266 AT91_PIOA 22 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA22 periph A with pullup */
264 }; 267 };
265 268
266 pinctrl_mmc1_slot1_dat1_3: mmc1_slot1_dat1_3-0 { 269 pinctrl_mmc1_slot1_dat1_3: mmc1_slot1_dat1_3-0 {
267 atmel,pins = 270 atmel,pins =
268 <0 23 0x1 0x1 /* PA23 periph A with pullup */ 271 <AT91_PIOA 23 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA23 periph A with pullup */
269 0 24 0x1 0x1 /* PA24 periph A with pullup */ 272 AT91_PIOA 24 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA24 periph A with pullup */
270 0 25 0x1 0x1>; /* PA25 periph A with pullup */ 273 AT91_PIOA 25 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA25 periph A with pullup */
271 }; 274 };
272 }; 275 };
273 276
274 ssc0 { 277 ssc0 {
275 pinctrl_ssc0_tx: ssc0_tx-0 { 278 pinctrl_ssc0_tx: ssc0_tx-0 {
276 atmel,pins = 279 atmel,pins =
277 <1 0 0x2 0x0 /* PB0 periph B */ 280 <AT91_PIOB 0 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB0 periph B */
278 1 1 0x2 0x0 /* PB1 periph B */ 281 AT91_PIOB 1 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB1 periph B */
279 1 2 0x2 0x0>; /* PB2 periph B */ 282 AT91_PIOB 2 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PB2 periph B */
280 }; 283 };
281 284
282 pinctrl_ssc0_rx: ssc0_rx-0 { 285 pinctrl_ssc0_rx: ssc0_rx-0 {
283 atmel,pins = 286 atmel,pins =
284 <1 3 0x2 0x0 /* PB3 periph B */ 287 <AT91_PIOB 3 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB3 periph B */
285 1 4 0x2 0x0 /* PB4 periph B */ 288 AT91_PIOB 4 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB4 periph B */
286 1 5 0x2 0x0>; /* PB5 periph B */ 289 AT91_PIOB 5 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PB5 periph B */
287 }; 290 };
288 }; 291 };
289 292
290 ssc1 { 293 ssc1 {
291 pinctrl_ssc1_tx: ssc1_tx-0 { 294 pinctrl_ssc1_tx: ssc1_tx-0 {
292 atmel,pins = 295 atmel,pins =
293 <1 6 0x1 0x0 /* PB6 periph A */ 296 <AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB6 periph A */
294 1 7 0x1 0x0 /* PB7 periph A */ 297 AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB7 periph A */
295 1 8 0x1 0x0>; /* PB8 periph A */ 298 AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB8 periph A */
296 }; 299 };
297 300
298 pinctrl_ssc1_rx: ssc1_rx-0 { 301 pinctrl_ssc1_rx: ssc1_rx-0 {
299 atmel,pins = 302 atmel,pins =
300 <1 9 0x1 0x0 /* PB9 periph A */ 303 <AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB9 periph A */
301 1 10 0x1 0x0 /* PB10 periph A */ 304 AT91_PIOB 10 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB10 periph A */
302 1 11 0x1 0x0>; /* PB11 periph A */ 305 AT91_PIOB 11 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB11 periph A */
303 }; 306 };
304 }; 307 };
305 308
306 spi0 { 309 spi0 {
307 pinctrl_spi0: spi0-0 { 310 pinctrl_spi0: spi0-0 {
308 atmel,pins = 311 atmel,pins =
309 <0 0 0x2 0x0 /* PA0 periph B SPI0_MISO pin */ 312 <AT91_PIOA 0 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA0 periph B SPI0_MISO pin */
310 0 1 0x2 0x0 /* PA1 periph B SPI0_MOSI pin */ 313 AT91_PIOA 1 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA1 periph B SPI0_MOSI pin */
311 0 2 0x2 0x0>; /* PA2 periph B SPI0_SPCK pin */ 314 AT91_PIOA 2 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA2 periph B SPI0_SPCK pin */
312 }; 315 };
313 }; 316 };
314 317
315 spi1 { 318 spi1 {
316 pinctrl_spi1: spi1-0 { 319 pinctrl_spi1: spi1-0 {
317 atmel,pins = 320 atmel,pins =
318 <1 12 0x1 0x0 /* PB12 periph A SPI1_MISO pin */ 321 <AT91_PIOB 12 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB12 periph A SPI1_MISO pin */
319 1 13 0x1 0x0 /* PB13 periph A SPI1_MOSI pin */ 322 AT91_PIOB 13 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB13 periph A SPI1_MOSI pin */
320 1 14 0x1 0x0>; /* PB14 periph A SPI1_SPCK pin */ 323 AT91_PIOB 14 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB14 periph A SPI1_SPCK pin */
321 }; 324 };
322 }; 325 };
323 326
324 pioA: gpio@fffff200 { 327 pioA: gpio@fffff200 {
325 compatible = "atmel,at91rm9200-gpio"; 328 compatible = "atmel,at91rm9200-gpio";
326 reg = <0xfffff200 0x200>; 329 reg = <0xfffff200 0x200>;
327 interrupts = <2 4 1>; 330 interrupts = <2 IRQ_TYPE_LEVEL_HIGH 1>;
328 #gpio-cells = <2>; 331 #gpio-cells = <2>;
329 gpio-controller; 332 gpio-controller;
330 interrupt-controller; 333 interrupt-controller;
@@ -334,7 +337,7 @@
334 pioB: gpio@fffff400 { 337 pioB: gpio@fffff400 {
335 compatible = "atmel,at91rm9200-gpio"; 338 compatible = "atmel,at91rm9200-gpio";
336 reg = <0xfffff400 0x200>; 339 reg = <0xfffff400 0x200>;
337 interrupts = <3 4 1>; 340 interrupts = <3 IRQ_TYPE_LEVEL_HIGH 1>;
338 #gpio-cells = <2>; 341 #gpio-cells = <2>;
339 gpio-controller; 342 gpio-controller;
340 interrupt-controller; 343 interrupt-controller;
@@ -344,7 +347,7 @@
344 pioC: gpio@fffff600 { 347 pioC: gpio@fffff600 {
345 compatible = "atmel,at91rm9200-gpio"; 348 compatible = "atmel,at91rm9200-gpio";
346 reg = <0xfffff600 0x200>; 349 reg = <0xfffff600 0x200>;
347 interrupts = <4 4 1>; 350 interrupts = <4 IRQ_TYPE_LEVEL_HIGH 1>;
348 #gpio-cells = <2>; 351 #gpio-cells = <2>;
349 gpio-controller; 352 gpio-controller;
350 interrupt-controller; 353 interrupt-controller;
@@ -354,7 +357,7 @@
354 pioD: gpio@fffff800 { 357 pioD: gpio@fffff800 {
355 compatible = "atmel,at91rm9200-gpio"; 358 compatible = "atmel,at91rm9200-gpio";
356 reg = <0xfffff800 0x200>; 359 reg = <0xfffff800 0x200>;
357 interrupts = <4 4 1>; 360 interrupts = <4 IRQ_TYPE_LEVEL_HIGH 1>;
358 #gpio-cells = <2>; 361 #gpio-cells = <2>;
359 gpio-controller; 362 gpio-controller;
360 interrupt-controller; 363 interrupt-controller;
@@ -364,7 +367,7 @@
364 pioE: gpio@fffffa00 { 367 pioE: gpio@fffffa00 {
365 compatible = "atmel,at91rm9200-gpio"; 368 compatible = "atmel,at91rm9200-gpio";
366 reg = <0xfffffa00 0x200>; 369 reg = <0xfffffa00 0x200>;
367 interrupts = <4 4 1>; 370 interrupts = <4 IRQ_TYPE_LEVEL_HIGH 1>;
368 #gpio-cells = <2>; 371 #gpio-cells = <2>;
369 gpio-controller; 372 gpio-controller;
370 interrupt-controller; 373 interrupt-controller;
@@ -375,7 +378,7 @@
375 dbgu: serial@ffffee00 { 378 dbgu: serial@ffffee00 {
376 compatible = "atmel,at91sam9260-usart"; 379 compatible = "atmel,at91sam9260-usart";
377 reg = <0xffffee00 0x200>; 380 reg = <0xffffee00 0x200>;
378 interrupts = <1 4 7>; 381 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
379 pinctrl-names = "default"; 382 pinctrl-names = "default";
380 pinctrl-0 = <&pinctrl_dbgu>; 383 pinctrl-0 = <&pinctrl_dbgu>;
381 status = "disabled"; 384 status = "disabled";
@@ -384,7 +387,7 @@
384 usart0: serial@fff8c000 { 387 usart0: serial@fff8c000 {
385 compatible = "atmel,at91sam9260-usart"; 388 compatible = "atmel,at91sam9260-usart";
386 reg = <0xfff8c000 0x200>; 389 reg = <0xfff8c000 0x200>;
387 interrupts = <7 4 5>; 390 interrupts = <7 IRQ_TYPE_LEVEL_HIGH 5>;
388 atmel,use-dma-rx; 391 atmel,use-dma-rx;
389 atmel,use-dma-tx; 392 atmel,use-dma-tx;
390 pinctrl-names = "default"; 393 pinctrl-names = "default";
@@ -395,7 +398,7 @@
395 usart1: serial@fff90000 { 398 usart1: serial@fff90000 {
396 compatible = "atmel,at91sam9260-usart"; 399 compatible = "atmel,at91sam9260-usart";
397 reg = <0xfff90000 0x200>; 400 reg = <0xfff90000 0x200>;
398 interrupts = <8 4 5>; 401 interrupts = <8 IRQ_TYPE_LEVEL_HIGH 5>;
399 atmel,use-dma-rx; 402 atmel,use-dma-rx;
400 atmel,use-dma-tx; 403 atmel,use-dma-tx;
401 pinctrl-names = "default"; 404 pinctrl-names = "default";
@@ -406,7 +409,7 @@
406 usart2: serial@fff94000 { 409 usart2: serial@fff94000 {
407 compatible = "atmel,at91sam9260-usart"; 410 compatible = "atmel,at91sam9260-usart";
408 reg = <0xfff94000 0x200>; 411 reg = <0xfff94000 0x200>;
409 interrupts = <9 4 5>; 412 interrupts = <9 IRQ_TYPE_LEVEL_HIGH 5>;
410 atmel,use-dma-rx; 413 atmel,use-dma-rx;
411 atmel,use-dma-tx; 414 atmel,use-dma-tx;
412 pinctrl-names = "default"; 415 pinctrl-names = "default";
@@ -417,7 +420,7 @@
417 ssc0: ssc@fff98000 { 420 ssc0: ssc@fff98000 {
418 compatible = "atmel,at91rm9200-ssc"; 421 compatible = "atmel,at91rm9200-ssc";
419 reg = <0xfff98000 0x4000>; 422 reg = <0xfff98000 0x4000>;
420 interrupts = <16 4 5>; 423 interrupts = <16 IRQ_TYPE_LEVEL_HIGH 5>;
421 pinctrl-names = "default"; 424 pinctrl-names = "default";
422 pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>; 425 pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
423 status = "disabled"; 426 status = "disabled";
@@ -426,7 +429,7 @@
426 ssc1: ssc@fff9c000 { 429 ssc1: ssc@fff9c000 {
427 compatible = "atmel,at91rm9200-ssc"; 430 compatible = "atmel,at91rm9200-ssc";
428 reg = <0xfff9c000 0x4000>; 431 reg = <0xfff9c000 0x4000>;
429 interrupts = <17 4 5>; 432 interrupts = <17 IRQ_TYPE_LEVEL_HIGH 5>;
430 pinctrl-names = "default"; 433 pinctrl-names = "default";
431 pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>; 434 pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>;
432 status = "disabled"; 435 status = "disabled";
@@ -435,7 +438,7 @@
435 macb0: ethernet@fffbc000 { 438 macb0: ethernet@fffbc000 {
436 compatible = "cdns,at32ap7000-macb", "cdns,macb"; 439 compatible = "cdns,at32ap7000-macb", "cdns,macb";
437 reg = <0xfffbc000 0x100>; 440 reg = <0xfffbc000 0x100>;
438 interrupts = <21 4 3>; 441 interrupts = <21 IRQ_TYPE_LEVEL_HIGH 3>;
439 pinctrl-names = "default"; 442 pinctrl-names = "default";
440 pinctrl-0 = <&pinctrl_macb_rmii>; 443 pinctrl-0 = <&pinctrl_macb_rmii>;
441 status = "disabled"; 444 status = "disabled";
@@ -444,14 +447,14 @@
444 usb1: gadget@fff78000 { 447 usb1: gadget@fff78000 {
445 compatible = "atmel,at91rm9200-udc"; 448 compatible = "atmel,at91rm9200-udc";
446 reg = <0xfff78000 0x4000>; 449 reg = <0xfff78000 0x4000>;
447 interrupts = <24 4 2>; 450 interrupts = <24 IRQ_TYPE_LEVEL_HIGH 2>;
448 status = "disabled"; 451 status = "disabled";
449 }; 452 };
450 453
451 i2c0: i2c@fff88000 { 454 i2c0: i2c@fff88000 {
452 compatible = "atmel,at91sam9263-i2c"; 455 compatible = "atmel,at91sam9263-i2c";
453 reg = <0xfff88000 0x100>; 456 reg = <0xfff88000 0x100>;
454 interrupts = <13 4 6>; 457 interrupts = <13 IRQ_TYPE_LEVEL_HIGH 6>;
455 #address-cells = <1>; 458 #address-cells = <1>;
456 #size-cells = <0>; 459 #size-cells = <0>;
457 status = "disabled"; 460 status = "disabled";
@@ -460,7 +463,7 @@
460 mmc0: mmc@fff80000 { 463 mmc0: mmc@fff80000 {
461 compatible = "atmel,hsmci"; 464 compatible = "atmel,hsmci";
462 reg = <0xfff80000 0x600>; 465 reg = <0xfff80000 0x600>;
463 interrupts = <10 4 0>; 466 interrupts = <10 IRQ_TYPE_LEVEL_HIGH 0>;
464 #address-cells = <1>; 467 #address-cells = <1>;
465 #size-cells = <0>; 468 #size-cells = <0>;
466 status = "disabled"; 469 status = "disabled";
@@ -469,7 +472,7 @@
469 mmc1: mmc@fff84000 { 472 mmc1: mmc@fff84000 {
470 compatible = "atmel,hsmci"; 473 compatible = "atmel,hsmci";
471 reg = <0xfff84000 0x600>; 474 reg = <0xfff84000 0x600>;
472 interrupts = <11 4 0>; 475 interrupts = <11 IRQ_TYPE_LEVEL_HIGH 0>;
473 #address-cells = <1>; 476 #address-cells = <1>;
474 #size-cells = <0>; 477 #size-cells = <0>;
475 status = "disabled"; 478 status = "disabled";
@@ -486,7 +489,7 @@
486 #size-cells = <0>; 489 #size-cells = <0>;
487 compatible = "atmel,at91rm9200-spi"; 490 compatible = "atmel,at91rm9200-spi";
488 reg = <0xfffa4000 0x200>; 491 reg = <0xfffa4000 0x200>;
489 interrupts = <14 4 3>; 492 interrupts = <14 IRQ_TYPE_LEVEL_HIGH 3>;
490 pinctrl-names = "default"; 493 pinctrl-names = "default";
491 pinctrl-0 = <&pinctrl_spi0>; 494 pinctrl-0 = <&pinctrl_spi0>;
492 status = "disabled"; 495 status = "disabled";
@@ -497,7 +500,7 @@
497 #size-cells = <0>; 500 #size-cells = <0>;
498 compatible = "atmel,at91rm9200-spi"; 501 compatible = "atmel,at91rm9200-spi";
499 reg = <0xfffa8000 0x200>; 502 reg = <0xfffa8000 0x200>;
500 interrupts = <15 4 3>; 503 interrupts = <15 IRQ_TYPE_LEVEL_HIGH 3>;
501 pinctrl-names = "default"; 504 pinctrl-names = "default";
502 pinctrl-0 = <&pinctrl_spi1>; 505 pinctrl-0 = <&pinctrl_spi1>;
503 status = "disabled"; 506 status = "disabled";
@@ -515,8 +518,8 @@
515 atmel,nand-cmd-offset = <22>; 518 atmel,nand-cmd-offset = <22>;
516 pinctrl-names = "default"; 519 pinctrl-names = "default";
517 pinctrl-0 = <&pinctrl_nand>; 520 pinctrl-0 = <&pinctrl_nand>;
518 gpios = <&pioA 22 0 521 gpios = <&pioA 22 GPIO_ACTIVE_HIGH
519 &pioD 15 0 522 &pioD 15 GPIO_ACTIVE_HIGH
520 0 523 0
521 >; 524 >;
522 status = "disabled"; 525 status = "disabled";
@@ -525,15 +528,15 @@
525 usb0: ohci@00a00000 { 528 usb0: ohci@00a00000 {
526 compatible = "atmel,at91rm9200-ohci", "usb-ohci"; 529 compatible = "atmel,at91rm9200-ohci", "usb-ohci";
527 reg = <0x00a00000 0x100000>; 530 reg = <0x00a00000 0x100000>;
528 interrupts = <29 4 2>; 531 interrupts = <29 IRQ_TYPE_LEVEL_HIGH 2>;
529 status = "disabled"; 532 status = "disabled";
530 }; 533 };
531 }; 534 };
532 535
533 i2c@0 { 536 i2c@0 {
534 compatible = "i2c-gpio"; 537 compatible = "i2c-gpio";
535 gpios = <&pioB 4 0 /* sda */ 538 gpios = <&pioB 4 GPIO_ACTIVE_HIGH /* sda */
536 &pioB 5 0 /* scl */ 539 &pioB 5 GPIO_ACTIVE_HIGH /* scl */
537 >; 540 >;
538 i2c-gpio,sda-open-drain; 541 i2c-gpio,sda-open-drain;
539 i2c-gpio,scl-open-drain; 542 i2c-gpio,scl-open-drain;
diff --git a/arch/arm/boot/dts/at91sam9263ek.dts b/arch/arm/boot/dts/at91sam9263ek.dts
index 3b82d91e7fcc..eff1afb81304 100644
--- a/arch/arm/boot/dts/at91sam9263ek.dts
+++ b/arch/arm/boot/dts/at91sam9263ek.dts
@@ -6,7 +6,7 @@
6 * Licensed under GPLv2 only 6 * Licensed under GPLv2 only
7 */ 7 */
8/dts-v1/; 8/dts-v1/;
9/include/ "at91sam9263.dtsi" 9#include "at91sam9263.dtsi"
10 10
11/ { 11/ {
12 model = "Atmel at91sam9263ek"; 12 model = "Atmel at91sam9263ek";
@@ -51,7 +51,7 @@
51 }; 51 };
52 52
53 usb1: gadget@fff78000 { 53 usb1: gadget@fff78000 {
54 atmel,vbus-gpio = <&pioA 25 0>; 54 atmel,vbus-gpio = <&pioA 25 GPIO_ACTIVE_HIGH>;
55 status = "okay"; 55 status = "okay";
56 }; 56 };
57 57
@@ -65,8 +65,8 @@
65 slot@0 { 65 slot@0 {
66 reg = <0>; 66 reg = <0>;
67 bus-width = <4>; 67 bus-width = <4>;
68 cd-gpios = <&pioE 18 0>; 68 cd-gpios = <&pioE 18 GPIO_ACTIVE_HIGH>;
69 wp-gpios = <&pioE 19 0>; 69 wp-gpios = <&pioE 19 GPIO_ACTIVE_HIGH>;
70 }; 70 };
71 }; 71 };
72 72
@@ -74,8 +74,8 @@
74 mmc0 { 74 mmc0 {
75 pinctrl_board_mmc0: mmc0-board { 75 pinctrl_board_mmc0: mmc0-board {
76 atmel,pins = 76 atmel,pins =
77 <5 18 0x0 0x5 /* PE18 gpio CD pin pull up and deglitch */ 77 <AT91_PIOE 18 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH /* PE18 gpio CD pin pull up and deglitch */
78 5 19 0x0 0x1>; /* PE19 gpio WP pin pull up */ 78 AT91_PIOE 19 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; /* PE19 gpio WP pin pull up */
79 }; 79 };
80 }; 80 };
81 }; 81 };
@@ -141,8 +141,8 @@
141 usb0: ohci@00a00000 { 141 usb0: ohci@00a00000 {
142 num-ports = <2>; 142 num-ports = <2>;
143 status = "okay"; 143 status = "okay";
144 atmel,vbus-gpio = <&pioA 24 0 144 atmel,vbus-gpio = <&pioA 24 GPIO_ACTIVE_HIGH
145 &pioA 21 0 145 &pioA 21 GPIO_ACTIVE_HIGH
146 >; 146 >;
147 }; 147 };
148 }; 148 };
@@ -152,13 +152,13 @@
152 152
153 d3 { 153 d3 {
154 label = "d3"; 154 label = "d3";
155 gpios = <&pioB 7 0>; 155 gpios = <&pioB 7 GPIO_ACTIVE_HIGH>;
156 linux,default-trigger = "heartbeat"; 156 linux,default-trigger = "heartbeat";
157 }; 157 };
158 158
159 d2 { 159 d2 {
160 label = "d2"; 160 label = "d2";
161 gpios = <&pioC 29 1>; 161 gpios = <&pioC 29 GPIO_ACTIVE_LOW>;
162 linux,default-trigger = "nand-disk"; 162 linux,default-trigger = "nand-disk";
163 }; 163 };
164 }; 164 };
@@ -168,14 +168,14 @@
168 168
169 left_click { 169 left_click {
170 label = "left_click"; 170 label = "left_click";
171 gpios = <&pioC 5 1>; 171 gpios = <&pioC 5 GPIO_ACTIVE_LOW>;
172 linux,code = <272>; 172 linux,code = <272>;
173 gpio-key,wakeup; 173 gpio-key,wakeup;
174 }; 174 };
175 175
176 right_click { 176 right_click {
177 label = "right_click"; 177 label = "right_click";
178 gpios = <&pioC 4 1>; 178 gpios = <&pioC 4 GPIO_ACTIVE_LOW>;
179 linux,code = <273>; 179 linux,code = <273>;
180 gpio-key,wakeup; 180 gpio-key,wakeup;
181 }; 181 };
diff --git a/arch/arm/boot/dts/at91sam9g15.dtsi b/arch/arm/boot/dts/at91sam9g15.dtsi
index 28467fd6bf96..cfd7044616d7 100644
--- a/arch/arm/boot/dts/at91sam9g15.dtsi
+++ b/arch/arm/boot/dts/at91sam9g15.dtsi
@@ -6,7 +6,7 @@
6 * Licensed under GPLv2. 6 * Licensed under GPLv2.
7 */ 7 */
8 8
9/include/ "at91sam9x5.dtsi" 9#include "at91sam9x5.dtsi"
10 10
11/ { 11/ {
12 model = "Atmel AT91SAM9G15 SoC"; 12 model = "Atmel AT91SAM9G15 SoC";
diff --git a/arch/arm/boot/dts/at91sam9g15ek.dts b/arch/arm/boot/dts/at91sam9g15ek.dts
index 5427b2dba87e..26b0444b0f96 100644
--- a/arch/arm/boot/dts/at91sam9g15ek.dts
+++ b/arch/arm/boot/dts/at91sam9g15ek.dts
@@ -7,8 +7,8 @@
7 * Licensed under GPLv2 or later. 7 * Licensed under GPLv2 or later.
8 */ 8 */
9/dts-v1/; 9/dts-v1/;
10/include/ "at91sam9g15.dtsi" 10#include "at91sam9g15.dtsi"
11/include/ "at91sam9x5ek.dtsi" 11#include "at91sam9x5ek.dtsi"
12 12
13/ { 13/ {
14 model = "Atmel AT91SAM9G15-EK"; 14 model = "Atmel AT91SAM9G15-EK";
diff --git a/arch/arm/boot/dts/at91sam9g20.dtsi b/arch/arm/boot/dts/at91sam9g20.dtsi
index 75ce6e760016..b8e79466014f 100644
--- a/arch/arm/boot/dts/at91sam9g20.dtsi
+++ b/arch/arm/boot/dts/at91sam9g20.dtsi
@@ -6,7 +6,7 @@
6 * Licensed under GPLv2. 6 * Licensed under GPLv2.
7 */ 7 */
8 8
9/include/ "at91sam9260.dtsi" 9#include "at91sam9260.dtsi"
10 10
11/ { 11/ {
12 model = "Atmel AT91SAM9G20 family SoC"; 12 model = "Atmel AT91SAM9G20 family SoC";
diff --git a/arch/arm/boot/dts/at91sam9g20ek.dts b/arch/arm/boot/dts/at91sam9g20ek.dts
index e5324bf9d529..bbfd753112c9 100644
--- a/arch/arm/boot/dts/at91sam9g20ek.dts
+++ b/arch/arm/boot/dts/at91sam9g20ek.dts
@@ -6,7 +6,7 @@
6 * Licensed under GPLv2. 6 * Licensed under GPLv2.
7 */ 7 */
8/dts-v1/; 8/dts-v1/;
9/include/ "at91sam9g20ek_common.dtsi" 9#include "at91sam9g20ek_common.dtsi"
10 10
11/ { 11/ {
12 model = "Atmel at91sam9g20ek"; 12 model = "Atmel at91sam9g20ek";
@@ -17,13 +17,13 @@
17 17
18 ds1 { 18 ds1 {
19 label = "ds1"; 19 label = "ds1";
20 gpios = <&pioA 9 0>; 20 gpios = <&pioA 9 GPIO_ACTIVE_HIGH>;
21 linux,default-trigger = "heartbeat"; 21 linux,default-trigger = "heartbeat";
22 }; 22 };
23 23
24 ds5 { 24 ds5 {
25 label = "ds5"; 25 label = "ds5";
26 gpios = <&pioA 6 1>; 26 gpios = <&pioA 6 GPIO_ACTIVE_LOW>;
27 }; 27 };
28 }; 28 };
29}; 29};
diff --git a/arch/arm/boot/dts/at91sam9g20ek_2mmc.dts b/arch/arm/boot/dts/at91sam9g20ek_2mmc.dts
index 66467b113126..bdb799bad179 100644
--- a/arch/arm/boot/dts/at91sam9g20ek_2mmc.dts
+++ b/arch/arm/boot/dts/at91sam9g20ek_2mmc.dts
@@ -6,7 +6,7 @@
6 * Licensed under GPLv2. 6 * Licensed under GPLv2.
7 */ 7 */
8/dts-v1/; 8/dts-v1/;
9/include/ "at91sam9g20ek_common.dtsi" 9#include "at91sam9g20ek_common.dtsi"
10 10
11/ { 11/ {
12 model = "Atmel at91sam9g20ek 2 mmc"; 12 model = "Atmel at91sam9g20ek 2 mmc";
@@ -23,7 +23,7 @@
23 slot@0 { 23 slot@0 {
24 reg = <0>; 24 reg = <0>;
25 bus-width = <4>; 25 bus-width = <4>;
26 cd-gpios = <&pioC 2 0>; 26 cd-gpios = <&pioC 2 GPIO_ACTIVE_HIGH>;
27 }; 27 };
28 }; 28 };
29 29
@@ -31,7 +31,7 @@
31 mmc0_slot0 { 31 mmc0_slot0 {
32 pinctrl_board_mmc0_slot0: mmc0_slot0-board { 32 pinctrl_board_mmc0_slot0: mmc0_slot0-board {
33 atmel,pins = 33 atmel,pins =
34 <2 2 0x0 0x5>; /* PC2 gpio CD pin pull up and deglitch */ 34 <AT91_PIOC 2 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PC2 gpio CD pin pull up and deglitch */
35 }; 35 };
36 }; 36 };
37 }; 37 };
@@ -43,13 +43,13 @@
43 43
44 ds1 { 44 ds1 {
45 label = "ds1"; 45 label = "ds1";
46 gpios = <&pioB 9 0>; 46 gpios = <&pioB 9 GPIO_ACTIVE_HIGH>;
47 linux,default-trigger = "heartbeat"; 47 linux,default-trigger = "heartbeat";
48 }; 48 };
49 49
50 ds5 { 50 ds5 {
51 label = "ds5"; 51 label = "ds5";
52 gpios = <&pioB 8 1>; 52 gpios = <&pioB 8 GPIO_ACTIVE_LOW>;
53 }; 53 };
54 }; 54 };
55}; 55};
diff --git a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
index 6a92c5baef8c..c7ffc32918f9 100644
--- a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
+++ b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
@@ -5,7 +5,7 @@
5 * 5 *
6 * Licensed under GPLv2. 6 * Licensed under GPLv2.
7 */ 7 */
8/include/ "at91sam9g20.dtsi" 8#include "at91sam9g20.dtsi"
9 9
10/ { 10/ {
11 11
@@ -34,10 +34,17 @@
34 board { 34 board {
35 pinctrl_pck0_as_mck: pck0_as_mck { 35 pinctrl_pck0_as_mck: pck0_as_mck {
36 atmel,pins = 36 atmel,pins =
37 <2 1 0x2 0x0>; /* PC1 periph B */ 37 <AT91_PIOC 1 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC1 periph B */
38 }; 38 };
39 39
40 }; 40 };
41
42 mmc0_slot1 {
43 pinctrl_board_mmc0_slot1: mmc0_slot1-board {
44 atmel,pins =
45 <AT91_PIOC 9 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PC9 gpio CD pin pull up and deglitch */
46 };
47 };
41 }; 48 };
42 49
43 dbgu: serial@fffff200 { 50 dbgu: serial@fffff200 {
@@ -65,7 +72,7 @@
65 }; 72 };
66 73
67 usb1: gadget@fffa4000 { 74 usb1: gadget@fffa4000 {
68 atmel,vbus-gpio = <&pioC 5 0>; 75 atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>;
69 status = "okay"; 76 status = "okay";
70 }; 77 };
71 78
@@ -79,16 +86,7 @@
79 slot@1 { 86 slot@1 {
80 reg = <1>; 87 reg = <1>;
81 bus-width = <4>; 88 bus-width = <4>;
82 cd-gpios = <&pioC 9 0>; 89 cd-gpios = <&pioC 9 GPIO_ACTIVE_HIGH>;
83 };
84 };
85
86 pinctrl@fffff400 {
87 mmc0_slot1 {
88 pinctrl_board_mmc0_slot1: mmc0_slot1-board {
89 atmel,pins =
90 <2 9 0x0 0x5>; /* PC9 gpio CD pin pull up and deglitch */
91 };
92 }; 90 };
93 }; 91 };
94 92
@@ -180,14 +178,14 @@
180 178
181 btn3 { 179 btn3 {
182 label = "Button 3"; 180 label = "Button 3";
183 gpios = <&pioA 30 1>; 181 gpios = <&pioA 30 GPIO_ACTIVE_LOW>;
184 linux,code = <0x103>; 182 linux,code = <0x103>;
185 gpio-key,wakeup; 183 gpio-key,wakeup;
186 }; 184 };
187 185
188 btn4 { 186 btn4 {
189 label = "Button 4"; 187 label = "Button 4";
190 gpios = <&pioA 31 1>; 188 gpios = <&pioA 31 GPIO_ACTIVE_LOW>;
191 linux,code = <0x104>; 189 linux,code = <0x104>;
192 gpio-key,wakeup; 190 gpio-key,wakeup;
193 }; 191 };
diff --git a/arch/arm/boot/dts/at91sam9g25.dtsi b/arch/arm/boot/dts/at91sam9g25.dtsi
index 5fd32df03f25..b4ec6fe53fc7 100644
--- a/arch/arm/boot/dts/at91sam9g25.dtsi
+++ b/arch/arm/boot/dts/at91sam9g25.dtsi
@@ -6,7 +6,7 @@
6 * Licensed under GPLv2. 6 * Licensed under GPLv2.
7 */ 7 */
8 8
9/include/ "at91sam9x5.dtsi" 9#include "at91sam9x5.dtsi"
10 10
11/ { 11/ {
12 model = "Atmel AT91SAM9G25 SoC"; 12 model = "Atmel AT91SAM9G25 SoC";
diff --git a/arch/arm/boot/dts/at91sam9g25ek.dts b/arch/arm/boot/dts/at91sam9g25ek.dts
index a1c511fecdc1..1e4c49c584d3 100644
--- a/arch/arm/boot/dts/at91sam9g25ek.dts
+++ b/arch/arm/boot/dts/at91sam9g25ek.dts
@@ -7,8 +7,8 @@
7 * Licensed under GPLv2 or later. 7 * Licensed under GPLv2 or later.
8 */ 8 */
9/dts-v1/; 9/dts-v1/;
10/include/ "at91sam9g25.dtsi" 10#include "at91sam9g25.dtsi"
11/include/ "at91sam9x5ek.dtsi" 11#include "at91sam9x5ek.dtsi"
12 12
13/ { 13/ {
14 model = "Atmel AT91SAM9G25-EK"; 14 model = "Atmel AT91SAM9G25-EK";
diff --git a/arch/arm/boot/dts/at91sam9g35.dtsi b/arch/arm/boot/dts/at91sam9g35.dtsi
index d6fa8af50724..bebf9f55614b 100644
--- a/arch/arm/boot/dts/at91sam9g35.dtsi
+++ b/arch/arm/boot/dts/at91sam9g35.dtsi
@@ -6,7 +6,7 @@
6 * Licensed under GPLv2. 6 * Licensed under GPLv2.
7 */ 7 */
8 8
9/include/ "at91sam9x5.dtsi" 9#include "at91sam9x5.dtsi"
10 10
11/ { 11/ {
12 model = "Atmel AT91SAM9G35 SoC"; 12 model = "Atmel AT91SAM9G35 SoC";
diff --git a/arch/arm/boot/dts/at91sam9g35ek.dts b/arch/arm/boot/dts/at91sam9g35ek.dts
index 6f58ab8d21f5..641a9bf89ed1 100644
--- a/arch/arm/boot/dts/at91sam9g35ek.dts
+++ b/arch/arm/boot/dts/at91sam9g35ek.dts
@@ -7,8 +7,8 @@
7 * Licensed under GPLv2 or later. 7 * Licensed under GPLv2 or later.
8 */ 8 */
9/dts-v1/; 9/dts-v1/;
10/include/ "at91sam9g35.dtsi" 10#include "at91sam9g35.dtsi"
11/include/ "at91sam9x5ek.dtsi" 11#include "at91sam9x5ek.dtsi"
12 12
13/ { 13/ {
14 model = "Atmel AT91SAM9G35-EK"; 14 model = "Atmel AT91SAM9G35-EK";
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index bf18a735c37d..f0091af6c285 100644
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -9,7 +9,10 @@
9 * Licensed under GPLv2 or later. 9 * Licensed under GPLv2 or later.
10 */ 10 */
11 11
12/include/ "skeleton.dtsi" 12#include "skeleton.dtsi"
13#include <dt-bindings/pinctrl/at91.h>
14#include <dt-bindings/interrupt-controller/irq.h>
15#include <dt-bindings/gpio/gpio.h>
13 16
14/ { 17/ {
15 model = "Atmel AT91SAM9G45 family SoC"; 18 model = "Atmel AT91SAM9G45 family SoC";
@@ -83,7 +86,7 @@
83 pit: timer@fffffd30 { 86 pit: timer@fffffd30 {
84 compatible = "atmel,at91sam9260-pit"; 87 compatible = "atmel,at91sam9260-pit";
85 reg = <0xfffffd30 0xf>; 88 reg = <0xfffffd30 0xf>;
86 interrupts = <1 4 7>; 89 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
87 }; 90 };
88 91
89 92
@@ -95,19 +98,19 @@
95 tcb0: timer@fff7c000 { 98 tcb0: timer@fff7c000 {
96 compatible = "atmel,at91rm9200-tcb"; 99 compatible = "atmel,at91rm9200-tcb";
97 reg = <0xfff7c000 0x100>; 100 reg = <0xfff7c000 0x100>;
98 interrupts = <18 4 0>; 101 interrupts = <18 IRQ_TYPE_LEVEL_HIGH 0>;
99 }; 102 };
100 103
101 tcb1: timer@fffd4000 { 104 tcb1: timer@fffd4000 {
102 compatible = "atmel,at91rm9200-tcb"; 105 compatible = "atmel,at91rm9200-tcb";
103 reg = <0xfffd4000 0x100>; 106 reg = <0xfffd4000 0x100>;
104 interrupts = <18 4 0>; 107 interrupts = <18 IRQ_TYPE_LEVEL_HIGH 0>;
105 }; 108 };
106 109
107 dma: dma-controller@ffffec00 { 110 dma: dma-controller@ffffec00 {
108 compatible = "atmel,at91sam9g45-dma"; 111 compatible = "atmel,at91sam9g45-dma";
109 reg = <0xffffec00 0x200>; 112 reg = <0xffffec00 0x200>;
110 interrupts = <21 4 0>; 113 interrupts = <21 IRQ_TYPE_LEVEL_HIGH 0>;
111 #dma-cells = <2>; 114 #dma-cells = <2>;
112 }; 115 };
113 116
@@ -130,221 +133,221 @@
130 dbgu { 133 dbgu {
131 pinctrl_dbgu: dbgu-0 { 134 pinctrl_dbgu: dbgu-0 {
132 atmel,pins = 135 atmel,pins =
133 <1 12 0x1 0x0 /* PB12 periph A */ 136 <AT91_PIOB 12 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB12 periph A */
134 1 13 0x1 0x0>; /* PB13 periph A */ 137 AT91_PIOB 13 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB13 periph A */
135 }; 138 };
136 }; 139 };
137 140
138 usart0 { 141 usart0 {
139 pinctrl_usart0: usart0-0 { 142 pinctrl_usart0: usart0-0 {
140 atmel,pins = 143 atmel,pins =
141 <1 19 0x1 0x1 /* PB19 periph A with pullup */ 144 <AT91_PIOB 19 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB19 periph A with pullup */
142 1 18 0x1 0x0>; /* PB18 periph A */ 145 AT91_PIOB 18 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB18 periph A */
143 }; 146 };
144 147
145 pinctrl_usart0_rts: usart0_rts-0 { 148 pinctrl_usart0_rts: usart0_rts-0 {
146 atmel,pins = 149 atmel,pins =
147 <1 17 0x2 0x0>; /* PB17 periph B */ 150 <AT91_PIOB 17 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PB17 periph B */
148 }; 151 };
149 152
150 pinctrl_usart0_cts: usart0_cts-0 { 153 pinctrl_usart0_cts: usart0_cts-0 {
151 atmel,pins = 154 atmel,pins =
152 <1 15 0x2 0x0>; /* PB15 periph B */ 155 <AT91_PIOB 15 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PB15 periph B */
153 }; 156 };
154 }; 157 };
155 158
156 uart1 { 159 uart1 {
157 pinctrl_usart1: usart1-0 { 160 pinctrl_usart1: usart1-0 {
158 atmel,pins = 161 atmel,pins =
159 <1 4 0x1 0x1 /* PB4 periph A with pullup */ 162 <AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB4 periph A with pullup */
160 1 5 0x1 0x0>; /* PB5 periph A */ 163 AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB5 periph A */
161 }; 164 };
162 165
163 pinctrl_usart1_rts: usart1_rts-0 { 166 pinctrl_usart1_rts: usart1_rts-0 {
164 atmel,pins = 167 atmel,pins =
165 <3 16 0x1 0x0>; /* PD16 periph A */ 168 <AT91_PIOD 16 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD16 periph A */
166 }; 169 };
167 170
168 pinctrl_usart1_cts: usart1_cts-0 { 171 pinctrl_usart1_cts: usart1_cts-0 {
169 atmel,pins = 172 atmel,pins =
170 <3 17 0x1 0x0>; /* PD17 periph A */ 173 <AT91_PIOD 17 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD17 periph A */
171 }; 174 };
172 }; 175 };
173 176
174 usart2 { 177 usart2 {
175 pinctrl_usart2: usart2-0 { 178 pinctrl_usart2: usart2-0 {
176 atmel,pins = 179 atmel,pins =
177 <1 6 0x1 0x1 /* PB6 periph A with pullup */ 180 <AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB6 periph A with pullup */
178 1 7 0x1 0x0>; /* PB7 periph A */ 181 AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB7 periph A */
179 }; 182 };
180 183
181 pinctrl_usart2_rts: usart2_rts-0 { 184 pinctrl_usart2_rts: usart2_rts-0 {
182 atmel,pins = 185 atmel,pins =
183 <2 9 0x2 0x0>; /* PC9 periph B */ 186 <AT91_PIOC 9 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC9 periph B */
184 }; 187 };
185 188
186 pinctrl_usart2_cts: usart2_cts-0 { 189 pinctrl_usart2_cts: usart2_cts-0 {
187 atmel,pins = 190 atmel,pins =
188 <2 11 0x2 0x0>; /* PC11 periph B */ 191 <AT91_PIOC 11 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC11 periph B */
189 }; 192 };
190 }; 193 };
191 194
192 usart3 { 195 usart3 {
193 pinctrl_usart3: usart3-0 { 196 pinctrl_usart3: usart3-0 {
194 atmel,pins = 197 atmel,pins =
195 <1 8 0x1 0x1 /* PB9 periph A with pullup */ 198 <AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB9 periph A with pullup */
196 1 9 0x1 0x0>; /* PB8 periph A */ 199 AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB8 periph A */
197 }; 200 };
198 201
199 pinctrl_usart3_rts: usart3_rts-0 { 202 pinctrl_usart3_rts: usart3_rts-0 {
200 atmel,pins = 203 atmel,pins =
201 <0 23 0x2 0x0>; /* PA23 periph B */ 204 <AT91_PIOA 23 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA23 periph B */
202 }; 205 };
203 206
204 pinctrl_usart3_cts: usart3_cts-0 { 207 pinctrl_usart3_cts: usart3_cts-0 {
205 atmel,pins = 208 atmel,pins =
206 <0 24 0x2 0x0>; /* PA24 periph B */ 209 <AT91_PIOA 24 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA24 periph B */
207 }; 210 };
208 }; 211 };
209 212
210 nand { 213 nand {
211 pinctrl_nand: nand-0 { 214 pinctrl_nand: nand-0 {
212 atmel,pins = 215 atmel,pins =
213 <2 8 0x0 0x1 /* PC8 gpio RDY pin pull_up*/ 216 <AT91_PIOC 8 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP /* PC8 gpio RDY pin pull_up*/
214 2 14 0x0 0x1>; /* PC14 gpio enable pin pull_up */ 217 AT91_PIOC 14 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; /* PC14 gpio enable pin pull_up */
215 }; 218 };
216 }; 219 };
217 220
218 macb { 221 macb {
219 pinctrl_macb_rmii: macb_rmii-0 { 222 pinctrl_macb_rmii: macb_rmii-0 {
220 atmel,pins = 223 atmel,pins =
221 <0 10 0x1 0x0 /* PA10 periph A */ 224 <AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA10 periph A */
222 0 11 0x1 0x0 /* PA11 periph A */ 225 AT91_PIOA 11 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA11 periph A */
223 0 12 0x1 0x0 /* PA12 periph A */ 226 AT91_PIOA 12 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA12 periph A */
224 0 13 0x1 0x0 /* PA13 periph A */ 227 AT91_PIOA 13 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA13 periph A */
225 0 14 0x1 0x0 /* PA14 periph A */ 228 AT91_PIOA 14 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA14 periph A */
226 0 15 0x1 0x0 /* PA15 periph A */ 229 AT91_PIOA 15 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA15 periph A */
227 0 16 0x1 0x0 /* PA16 periph A */ 230 AT91_PIOA 16 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA16 periph A */
228 0 17 0x1 0x0 /* PA17 periph A */ 231 AT91_PIOA 17 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA17 periph A */
229 0 18 0x1 0x0 /* PA18 periph A */ 232 AT91_PIOA 18 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA18 periph A */
230 0 19 0x1 0x0>; /* PA19 periph A */ 233 AT91_PIOA 19 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA19 periph A */
231 }; 234 };
232 235
233 pinctrl_macb_rmii_mii: macb_rmii_mii-0 { 236 pinctrl_macb_rmii_mii: macb_rmii_mii-0 {
234 atmel,pins = 237 atmel,pins =
235 <0 6 0x2 0x0 /* PA6 periph B */ 238 <AT91_PIOA 6 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA6 periph B */
236 0 7 0x2 0x0 /* PA7 periph B */ 239 AT91_PIOA 7 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA7 periph B */
237 0 8 0x2 0x0 /* PA8 periph B */ 240 AT91_PIOA 8 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA8 periph B */
238 0 9 0x2 0x0 /* PA9 periph B */ 241 AT91_PIOA 9 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA9 periph B */
239 0 27 0x2 0x0 /* PA27 periph B */ 242 AT91_PIOA 27 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA27 periph B */
240 0 28 0x2 0x0 /* PA28 periph B */ 243 AT91_PIOA 28 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA28 periph B */
241 0 29 0x2 0x0 /* PA29 periph B */ 244 AT91_PIOA 29 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA29 periph B */
242 0 30 0x2 0x0>; /* PA30 periph B */ 245 AT91_PIOA 30 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA30 periph B */
243 }; 246 };
244 }; 247 };
245 248
246 mmc0 { 249 mmc0 {
247 pinctrl_mmc0_slot0_clk_cmd_dat0: mmc0_slot0_clk_cmd_dat0-0 { 250 pinctrl_mmc0_slot0_clk_cmd_dat0: mmc0_slot0_clk_cmd_dat0-0 {
248 atmel,pins = 251 atmel,pins =
249 <0 0 0x1 0x0 /* PA0 periph A */ 252 <AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA0 periph A */
250 0 1 0x1 0x1 /* PA1 periph A with pullup */ 253 AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA1 periph A with pullup */
251 0 2 0x1 0x1>; /* PA2 periph A with pullup */ 254 AT91_PIOA 2 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA2 periph A with pullup */
252 }; 255 };
253 256
254 pinctrl_mmc0_slot0_dat1_3: mmc0_slot0_dat1_3-0 { 257 pinctrl_mmc0_slot0_dat1_3: mmc0_slot0_dat1_3-0 {
255 atmel,pins = 258 atmel,pins =
256 <0 3 0x1 0x1 /* PA3 periph A with pullup */ 259 <AT91_PIOA 3 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA3 periph A with pullup */
257 0 4 0x1 0x1 /* PA4 periph A with pullup */ 260 AT91_PIOA 4 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA4 periph A with pullup */
258 0 5 0x1 0x1>; /* PA5 periph A with pullup */ 261 AT91_PIOA 5 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA5 periph A with pullup */
259 }; 262 };
260 263
261 pinctrl_mmc0_slot0_dat4_7: mmc0_slot0_dat4_7-0 { 264 pinctrl_mmc0_slot0_dat4_7: mmc0_slot0_dat4_7-0 {
262 atmel,pins = 265 atmel,pins =
263 <0 6 0x1 0x1 /* PA6 periph A with pullup */ 266 <AT91_PIOA 6 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA6 periph A with pullup */
264 0 7 0x1 0x1 /* PA7 periph A with pullup */ 267 AT91_PIOA 7 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA7 periph A with pullup */
265 0 8 0x1 0x1 /* PA8 periph A with pullup */ 268 AT91_PIOA 8 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA8 periph A with pullup */
266 0 9 0x1 0x1>; /* PA9 periph A with pullup */ 269 AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA9 periph A with pullup */
267 }; 270 };
268 }; 271 };
269 272
270 mmc1 { 273 mmc1 {
271 pinctrl_mmc1_slot0_clk_cmd_dat0: mmc1_slot0_clk_cmd_dat0-0 { 274 pinctrl_mmc1_slot0_clk_cmd_dat0: mmc1_slot0_clk_cmd_dat0-0 {
272 atmel,pins = 275 atmel,pins =
273 <0 31 0x1 0x0 /* PA31 periph A */ 276 <AT91_PIOA 31 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA31 periph A */
274 0 22 0x1 0x1 /* PA22 periph A with pullup */ 277 AT91_PIOA 22 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA22 periph A with pullup */
275 0 23 0x1 0x1>; /* PA23 periph A with pullup */ 278 AT91_PIOA 23 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA23 periph A with pullup */
276 }; 279 };
277 280
278 pinctrl_mmc1_slot0_dat1_3: mmc1_slot0_dat1_3-0 { 281 pinctrl_mmc1_slot0_dat1_3: mmc1_slot0_dat1_3-0 {
279 atmel,pins = 282 atmel,pins =
280 <0 24 0x1 0x1 /* PA24 periph A with pullup */ 283 <AT91_PIOA 24 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA24 periph A with pullup */
281 0 25 0x1 0x1 /* PA25 periph A with pullup */ 284 AT91_PIOA 25 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA25 periph A with pullup */
282 0 26 0x1 0x1>; /* PA26 periph A with pullup */ 285 AT91_PIOA 26 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA26 periph A with pullup */
283 }; 286 };
284 287
285 pinctrl_mmc1_slot0_dat4_7: mmc1_slot0_dat4_7-0 { 288 pinctrl_mmc1_slot0_dat4_7: mmc1_slot0_dat4_7-0 {
286 atmel,pins = 289 atmel,pins =
287 <0 27 0x1 0x1 /* PA27 periph A with pullup */ 290 <AT91_PIOA 27 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA27 periph A with pullup */
288 0 28 0x1 0x1 /* PA28 periph A with pullup */ 291 AT91_PIOA 28 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA28 periph A with pullup */
289 0 29 0x1 0x1 /* PA29 periph A with pullup */ 292 AT91_PIOA 29 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA29 periph A with pullup */
290 0 20 0x1 0x1>; /* PA30 periph A with pullup */ 293 AT91_PIOA 20 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA30 periph A with pullup */
291 }; 294 };
292 }; 295 };
293 296
294 ssc0 { 297 ssc0 {
295 pinctrl_ssc0_tx: ssc0_tx-0 { 298 pinctrl_ssc0_tx: ssc0_tx-0 {
296 atmel,pins = 299 atmel,pins =
297 <3 0 0x1 0x0 /* PD0 periph A */ 300 <AT91_PIOD 0 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD0 periph A */
298 3 1 0x1 0x0 /* PD1 periph A */ 301 AT91_PIOD 1 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD1 periph A */
299 3 2 0x1 0x0>; /* PD2 periph A */ 302 AT91_PIOD 2 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD2 periph A */
300 }; 303 };
301 304
302 pinctrl_ssc0_rx: ssc0_rx-0 { 305 pinctrl_ssc0_rx: ssc0_rx-0 {
303 atmel,pins = 306 atmel,pins =
304 <3 3 0x1 0x0 /* PD3 periph A */ 307 <AT91_PIOD 3 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD3 periph A */
305 3 4 0x1 0x0 /* PD4 periph A */ 308 AT91_PIOD 4 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD4 periph A */
306 3 5 0x1 0x0>; /* PD5 periph A */ 309 AT91_PIOD 5 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD5 periph A */
307 }; 310 };
308 }; 311 };
309 312
310 ssc1 { 313 ssc1 {
311 pinctrl_ssc1_tx: ssc1_tx-0 { 314 pinctrl_ssc1_tx: ssc1_tx-0 {
312 atmel,pins = 315 atmel,pins =
313 <3 10 0x1 0x0 /* PD10 periph A */ 316 <AT91_PIOD 10 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD10 periph A */
314 3 11 0x1 0x0 /* PD11 periph A */ 317 AT91_PIOD 11 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD11 periph A */
315 3 12 0x1 0x0>; /* PD12 periph A */ 318 AT91_PIOD 12 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD12 periph A */
316 }; 319 };
317 320
318 pinctrl_ssc1_rx: ssc1_rx-0 { 321 pinctrl_ssc1_rx: ssc1_rx-0 {
319 atmel,pins = 322 atmel,pins =
320 <3 13 0x1 0x0 /* PD13 periph A */ 323 <AT91_PIOD 13 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD13 periph A */
321 3 14 0x1 0x0 /* PD14 periph A */ 324 AT91_PIOD 14 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD14 periph A */
322 3 15 0x1 0x0>; /* PD15 periph A */ 325 AT91_PIOD 15 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD15 periph A */
323 }; 326 };
324 }; 327 };
325 328
326 spi0 { 329 spi0 {
327 pinctrl_spi0: spi0-0 { 330 pinctrl_spi0: spi0-0 {
328 atmel,pins = 331 atmel,pins =
329 <1 0 0x1 0x0 /* PB0 periph A SPI0_MISO pin */ 332 <AT91_PIOB 0 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB0 periph A SPI0_MISO pin */
330 1 1 0x1 0x0 /* PB1 periph A SPI0_MOSI pin */ 333 AT91_PIOB 1 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB1 periph A SPI0_MOSI pin */
331 1 2 0x1 0x0>; /* PB2 periph A SPI0_SPCK pin */ 334 AT91_PIOB 2 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB2 periph A SPI0_SPCK pin */
332 }; 335 };
333 }; 336 };
334 337
335 spi1 { 338 spi1 {
336 pinctrl_spi1: spi1-0 { 339 pinctrl_spi1: spi1-0 {
337 atmel,pins = 340 atmel,pins =
338 <1 14 0x1 0x0 /* PB14 periph A SPI1_MISO pin */ 341 <AT91_PIOB 14 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB14 periph A SPI1_MISO pin */
339 1 15 0x1 0x0 /* PB15 periph A SPI1_MOSI pin */ 342 AT91_PIOB 15 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB15 periph A SPI1_MOSI pin */
340 1 16 0x1 0x0>; /* PB16 periph A SPI1_SPCK pin */ 343 AT91_PIOB 16 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB16 periph A SPI1_SPCK pin */
341 }; 344 };
342 }; 345 };
343 346
344 pioA: gpio@fffff200 { 347 pioA: gpio@fffff200 {
345 compatible = "atmel,at91rm9200-gpio"; 348 compatible = "atmel,at91rm9200-gpio";
346 reg = <0xfffff200 0x200>; 349 reg = <0xfffff200 0x200>;
347 interrupts = <2 4 1>; 350 interrupts = <2 IRQ_TYPE_LEVEL_HIGH 1>;
348 #gpio-cells = <2>; 351 #gpio-cells = <2>;
349 gpio-controller; 352 gpio-controller;
350 interrupt-controller; 353 interrupt-controller;
@@ -354,7 +357,7 @@
354 pioB: gpio@fffff400 { 357 pioB: gpio@fffff400 {
355 compatible = "atmel,at91rm9200-gpio"; 358 compatible = "atmel,at91rm9200-gpio";
356 reg = <0xfffff400 0x200>; 359 reg = <0xfffff400 0x200>;
357 interrupts = <3 4 1>; 360 interrupts = <3 IRQ_TYPE_LEVEL_HIGH 1>;
358 #gpio-cells = <2>; 361 #gpio-cells = <2>;
359 gpio-controller; 362 gpio-controller;
360 interrupt-controller; 363 interrupt-controller;
@@ -364,7 +367,7 @@
364 pioC: gpio@fffff600 { 367 pioC: gpio@fffff600 {
365 compatible = "atmel,at91rm9200-gpio"; 368 compatible = "atmel,at91rm9200-gpio";
366 reg = <0xfffff600 0x200>; 369 reg = <0xfffff600 0x200>;
367 interrupts = <4 4 1>; 370 interrupts = <4 IRQ_TYPE_LEVEL_HIGH 1>;
368 #gpio-cells = <2>; 371 #gpio-cells = <2>;
369 gpio-controller; 372 gpio-controller;
370 interrupt-controller; 373 interrupt-controller;
@@ -374,7 +377,7 @@
374 pioD: gpio@fffff800 { 377 pioD: gpio@fffff800 {
375 compatible = "atmel,at91rm9200-gpio"; 378 compatible = "atmel,at91rm9200-gpio";
376 reg = <0xfffff800 0x200>; 379 reg = <0xfffff800 0x200>;
377 interrupts = <5 4 1>; 380 interrupts = <5 IRQ_TYPE_LEVEL_HIGH 1>;
378 #gpio-cells = <2>; 381 #gpio-cells = <2>;
379 gpio-controller; 382 gpio-controller;
380 interrupt-controller; 383 interrupt-controller;
@@ -384,7 +387,7 @@
384 pioE: gpio@fffffa00 { 387 pioE: gpio@fffffa00 {
385 compatible = "atmel,at91rm9200-gpio"; 388 compatible = "atmel,at91rm9200-gpio";
386 reg = <0xfffffa00 0x200>; 389 reg = <0xfffffa00 0x200>;
387 interrupts = <5 4 1>; 390 interrupts = <5 IRQ_TYPE_LEVEL_HIGH 1>;
388 #gpio-cells = <2>; 391 #gpio-cells = <2>;
389 gpio-controller; 392 gpio-controller;
390 interrupt-controller; 393 interrupt-controller;
@@ -395,7 +398,7 @@
395 dbgu: serial@ffffee00 { 398 dbgu: serial@ffffee00 {
396 compatible = "atmel,at91sam9260-usart"; 399 compatible = "atmel,at91sam9260-usart";
397 reg = <0xffffee00 0x200>; 400 reg = <0xffffee00 0x200>;
398 interrupts = <1 4 7>; 401 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
399 pinctrl-names = "default"; 402 pinctrl-names = "default";
400 pinctrl-0 = <&pinctrl_dbgu>; 403 pinctrl-0 = <&pinctrl_dbgu>;
401 status = "disabled"; 404 status = "disabled";
@@ -404,7 +407,7 @@
404 usart0: serial@fff8c000 { 407 usart0: serial@fff8c000 {
405 compatible = "atmel,at91sam9260-usart"; 408 compatible = "atmel,at91sam9260-usart";
406 reg = <0xfff8c000 0x200>; 409 reg = <0xfff8c000 0x200>;
407 interrupts = <7 4 5>; 410 interrupts = <7 IRQ_TYPE_LEVEL_HIGH 5>;
408 atmel,use-dma-rx; 411 atmel,use-dma-rx;
409 atmel,use-dma-tx; 412 atmel,use-dma-tx;
410 pinctrl-names = "default"; 413 pinctrl-names = "default";
@@ -415,7 +418,7 @@
415 usart1: serial@fff90000 { 418 usart1: serial@fff90000 {
416 compatible = "atmel,at91sam9260-usart"; 419 compatible = "atmel,at91sam9260-usart";
417 reg = <0xfff90000 0x200>; 420 reg = <0xfff90000 0x200>;
418 interrupts = <8 4 5>; 421 interrupts = <8 IRQ_TYPE_LEVEL_HIGH 5>;
419 atmel,use-dma-rx; 422 atmel,use-dma-rx;
420 atmel,use-dma-tx; 423 atmel,use-dma-tx;
421 pinctrl-names = "default"; 424 pinctrl-names = "default";
@@ -426,7 +429,7 @@
426 usart2: serial@fff94000 { 429 usart2: serial@fff94000 {
427 compatible = "atmel,at91sam9260-usart"; 430 compatible = "atmel,at91sam9260-usart";
428 reg = <0xfff94000 0x200>; 431 reg = <0xfff94000 0x200>;
429 interrupts = <9 4 5>; 432 interrupts = <9 IRQ_TYPE_LEVEL_HIGH 5>;
430 atmel,use-dma-rx; 433 atmel,use-dma-rx;
431 atmel,use-dma-tx; 434 atmel,use-dma-tx;
432 pinctrl-names = "default"; 435 pinctrl-names = "default";
@@ -437,7 +440,7 @@
437 usart3: serial@fff98000 { 440 usart3: serial@fff98000 {
438 compatible = "atmel,at91sam9260-usart"; 441 compatible = "atmel,at91sam9260-usart";
439 reg = <0xfff98000 0x200>; 442 reg = <0xfff98000 0x200>;
440 interrupts = <10 4 5>; 443 interrupts = <10 IRQ_TYPE_LEVEL_HIGH 5>;
441 atmel,use-dma-rx; 444 atmel,use-dma-rx;
442 atmel,use-dma-tx; 445 atmel,use-dma-tx;
443 pinctrl-names = "default"; 446 pinctrl-names = "default";
@@ -448,7 +451,7 @@
448 macb0: ethernet@fffbc000 { 451 macb0: ethernet@fffbc000 {
449 compatible = "cdns,at32ap7000-macb", "cdns,macb"; 452 compatible = "cdns,at32ap7000-macb", "cdns,macb";
450 reg = <0xfffbc000 0x100>; 453 reg = <0xfffbc000 0x100>;
451 interrupts = <25 4 3>; 454 interrupts = <25 IRQ_TYPE_LEVEL_HIGH 3>;
452 pinctrl-names = "default"; 455 pinctrl-names = "default";
453 pinctrl-0 = <&pinctrl_macb_rmii>; 456 pinctrl-0 = <&pinctrl_macb_rmii>;
454 status = "disabled"; 457 status = "disabled";
@@ -457,7 +460,7 @@
457 i2c0: i2c@fff84000 { 460 i2c0: i2c@fff84000 {
458 compatible = "atmel,at91sam9g10-i2c"; 461 compatible = "atmel,at91sam9g10-i2c";
459 reg = <0xfff84000 0x100>; 462 reg = <0xfff84000 0x100>;
460 interrupts = <12 4 6>; 463 interrupts = <12 IRQ_TYPE_LEVEL_HIGH 6>;
461 #address-cells = <1>; 464 #address-cells = <1>;
462 #size-cells = <0>; 465 #size-cells = <0>;
463 status = "disabled"; 466 status = "disabled";
@@ -466,7 +469,7 @@
466 i2c1: i2c@fff88000 { 469 i2c1: i2c@fff88000 {
467 compatible = "atmel,at91sam9g10-i2c"; 470 compatible = "atmel,at91sam9g10-i2c";
468 reg = <0xfff88000 0x100>; 471 reg = <0xfff88000 0x100>;
469 interrupts = <13 4 6>; 472 interrupts = <13 IRQ_TYPE_LEVEL_HIGH 6>;
470 #address-cells = <1>; 473 #address-cells = <1>;
471 #size-cells = <0>; 474 #size-cells = <0>;
472 status = "disabled"; 475 status = "disabled";
@@ -475,7 +478,7 @@
475 ssc0: ssc@fff9c000 { 478 ssc0: ssc@fff9c000 {
476 compatible = "atmel,at91sam9g45-ssc"; 479 compatible = "atmel,at91sam9g45-ssc";
477 reg = <0xfff9c000 0x4000>; 480 reg = <0xfff9c000 0x4000>;
478 interrupts = <16 4 5>; 481 interrupts = <16 IRQ_TYPE_LEVEL_HIGH 5>;
479 pinctrl-names = "default"; 482 pinctrl-names = "default";
480 pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>; 483 pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
481 status = "disabled"; 484 status = "disabled";
@@ -484,7 +487,7 @@
484 ssc1: ssc@fffa0000 { 487 ssc1: ssc@fffa0000 {
485 compatible = "atmel,at91sam9g45-ssc"; 488 compatible = "atmel,at91sam9g45-ssc";
486 reg = <0xfffa0000 0x4000>; 489 reg = <0xfffa0000 0x4000>;
487 interrupts = <17 4 5>; 490 interrupts = <17 IRQ_TYPE_LEVEL_HIGH 5>;
488 pinctrl-names = "default"; 491 pinctrl-names = "default";
489 pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>; 492 pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>;
490 status = "disabled"; 493 status = "disabled";
@@ -493,7 +496,7 @@
493 adc0: adc@fffb0000 { 496 adc0: adc@fffb0000 {
494 compatible = "atmel,at91sam9260-adc"; 497 compatible = "atmel,at91sam9260-adc";
495 reg = <0xfffb0000 0x100>; 498 reg = <0xfffb0000 0x100>;
496 interrupts = <20 4 0>; 499 interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;
497 atmel,adc-use-external-triggers; 500 atmel,adc-use-external-triggers;
498 atmel,adc-channels-used = <0xff>; 501 atmel,adc-channels-used = <0xff>;
499 atmel,adc-vref = <3300>; 502 atmel,adc-vref = <3300>;
@@ -533,7 +536,7 @@
533 mmc0: mmc@fff80000 { 536 mmc0: mmc@fff80000 {
534 compatible = "atmel,hsmci"; 537 compatible = "atmel,hsmci";
535 reg = <0xfff80000 0x600>; 538 reg = <0xfff80000 0x600>;
536 interrupts = <11 4 0>; 539 interrupts = <11 IRQ_TYPE_LEVEL_HIGH 0>;
537 dmas = <&dma 1 0>; 540 dmas = <&dma 1 0>;
538 dma-names = "rxtx"; 541 dma-names = "rxtx";
539 #address-cells = <1>; 542 #address-cells = <1>;
@@ -544,7 +547,7 @@
544 mmc1: mmc@fffd0000 { 547 mmc1: mmc@fffd0000 {
545 compatible = "atmel,hsmci"; 548 compatible = "atmel,hsmci";
546 reg = <0xfffd0000 0x600>; 549 reg = <0xfffd0000 0x600>;
547 interrupts = <29 4 0>; 550 interrupts = <29 IRQ_TYPE_LEVEL_HIGH 0>;
548 dmas = <&dma 1 13>; 551 dmas = <&dma 1 13>;
549 dma-names = "rxtx"; 552 dma-names = "rxtx";
550 #address-cells = <1>; 553 #address-cells = <1>;
@@ -592,8 +595,8 @@
592 atmel,nand-cmd-offset = <22>; 595 atmel,nand-cmd-offset = <22>;
593 pinctrl-names = "default"; 596 pinctrl-names = "default";
594 pinctrl-0 = <&pinctrl_nand>; 597 pinctrl-0 = <&pinctrl_nand>;
595 gpios = <&pioC 8 0 598 gpios = <&pioC 8 GPIO_ACTIVE_HIGH
596 &pioC 14 0 599 &pioC 14 GPIO_ACTIVE_HIGH
597 0 600 0
598 >; 601 >;
599 status = "disabled"; 602 status = "disabled";
@@ -602,22 +605,22 @@
602 usb0: ohci@00700000 { 605 usb0: ohci@00700000 {
603 compatible = "atmel,at91rm9200-ohci", "usb-ohci"; 606 compatible = "atmel,at91rm9200-ohci", "usb-ohci";
604 reg = <0x00700000 0x100000>; 607 reg = <0x00700000 0x100000>;
605 interrupts = <22 4 2>; 608 interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
606 status = "disabled"; 609 status = "disabled";
607 }; 610 };
608 611
609 usb1: ehci@00800000 { 612 usb1: ehci@00800000 {
610 compatible = "atmel,at91sam9g45-ehci", "usb-ehci"; 613 compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
611 reg = <0x00800000 0x100000>; 614 reg = <0x00800000 0x100000>;
612 interrupts = <22 4 2>; 615 interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
613 status = "disabled"; 616 status = "disabled";
614 }; 617 };
615 }; 618 };
616 619
617 i2c@0 { 620 i2c@0 {
618 compatible = "i2c-gpio"; 621 compatible = "i2c-gpio";
619 gpios = <&pioA 20 0 /* sda */ 622 gpios = <&pioA 20 GPIO_ACTIVE_HIGH /* sda */
620 &pioA 21 0 /* scl */ 623 &pioA 21 GPIO_ACTIVE_HIGH /* scl */
621 >; 624 >;
622 i2c-gpio,sda-open-drain; 625 i2c-gpio,sda-open-drain;
623 i2c-gpio,scl-open-drain; 626 i2c-gpio,scl-open-drain;
diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts
index 51d9251b5bbe..89c50d108d44 100644
--- a/arch/arm/boot/dts/at91sam9m10g45ek.dts
+++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts
@@ -7,7 +7,7 @@
7 * Licensed under GPLv2 or later. 7 * Licensed under GPLv2 or later.
8 */ 8 */
9/dts-v1/; 9/dts-v1/;
10/include/ "at91sam9g45.dtsi" 10#include "at91sam9g45.dtsi"
11 11
12/ { 12/ {
13 model = "Atmel AT91SAM9M10G45-EK"; 13 model = "Atmel AT91SAM9M10G45-EK";
@@ -68,7 +68,7 @@
68 slot@0 { 68 slot@0 {
69 reg = <0>; 69 reg = <0>;
70 bus-width = <4>; 70 bus-width = <4>;
71 cd-gpios = <&pioD 10 0>; 71 cd-gpios = <&pioD 10 GPIO_ACTIVE_HIGH>;
72 }; 72 };
73 }; 73 };
74 74
@@ -81,8 +81,8 @@
81 slot@0 { 81 slot@0 {
82 reg = <0>; 82 reg = <0>;
83 bus-width = <4>; 83 bus-width = <4>;
84 cd-gpios = <&pioD 11 0>; 84 cd-gpios = <&pioD 11 GPIO_ACTIVE_HIGH>;
85 wp-gpios = <&pioD 29 0>; 85 wp-gpios = <&pioD 29 GPIO_ACTIVE_HIGH>;
86 }; 86 };
87 }; 87 };
88 88
@@ -90,15 +90,15 @@
90 mmc0 { 90 mmc0 {
91 pinctrl_board_mmc0: mmc0-board { 91 pinctrl_board_mmc0: mmc0-board {
92 atmel,pins = 92 atmel,pins =
93 <3 10 0x0 0x5>; /* PD10 gpio CD pin pull up and deglitch */ 93 <AT91_PIOD 10 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PD10 gpio CD pin pull up and deglitch */
94 }; 94 };
95 }; 95 };
96 96
97 mmc1 { 97 mmc1 {
98 pinctrl_board_mmc1: mmc1-board { 98 pinctrl_board_mmc1: mmc1-board {
99 atmel,pins = 99 atmel,pins =
100 <3 11 0x0 0x5 /* PD11 gpio CD pin pull up and deglitch */ 100 <AT91_PIOD 11 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH /* PD11 gpio CD pin pull up and deglitch */
101 3 29 0x0 0x1>; /* PD29 gpio WP pin pull up */ 101 AT91_PIOD 29 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; /* PD29 gpio WP pin pull up */
102 }; 102 };
103 }; 103 };
104 }; 104 };
@@ -139,8 +139,8 @@
139 usb0: ohci@00700000 { 139 usb0: ohci@00700000 {
140 status = "okay"; 140 status = "okay";
141 num-ports = <2>; 141 num-ports = <2>;
142 atmel,vbus-gpio = <&pioD 1 1 142 atmel,vbus-gpio = <&pioD 1 GPIO_ACTIVE_LOW
143 &pioD 3 1>; 143 &pioD 3 GPIO_ACTIVE_LOW>;
144 }; 144 };
145 145
146 usb1: ehci@00800000 { 146 usb1: ehci@00800000 {
@@ -153,19 +153,19 @@
153 153
154 d8 { 154 d8 {
155 label = "d8"; 155 label = "d8";
156 gpios = <&pioD 30 0>; 156 gpios = <&pioD 30 GPIO_ACTIVE_HIGH>;
157 linux,default-trigger = "heartbeat"; 157 linux,default-trigger = "heartbeat";
158 }; 158 };
159 159
160 d6 { 160 d6 {
161 label = "d6"; 161 label = "d6";
162 gpios = <&pioD 0 1>; 162 gpios = <&pioD 0 GPIO_ACTIVE_LOW>;
163 linux,default-trigger = "nand-disk"; 163 linux,default-trigger = "nand-disk";
164 }; 164 };
165 165
166 d7 { 166 d7 {
167 label = "d7"; 167 label = "d7";
168 gpios = <&pioD 31 1>; 168 gpios = <&pioD 31 GPIO_ACTIVE_LOW>;
169 linux,default-trigger = "mmc0"; 169 linux,default-trigger = "mmc0";
170 }; 170 };
171 }; 171 };
@@ -175,45 +175,45 @@
175 175
176 left_click { 176 left_click {
177 label = "left_click"; 177 label = "left_click";
178 gpios = <&pioB 6 1>; 178 gpios = <&pioB 6 GPIO_ACTIVE_LOW>;
179 linux,code = <272>; 179 linux,code = <272>;
180 gpio-key,wakeup; 180 gpio-key,wakeup;
181 }; 181 };
182 182
183 right_click { 183 right_click {
184 label = "right_click"; 184 label = "right_click";
185 gpios = <&pioB 7 1>; 185 gpios = <&pioB 7 GPIO_ACTIVE_LOW>;
186 linux,code = <273>; 186 linux,code = <273>;
187 gpio-key,wakeup; 187 gpio-key,wakeup;
188 }; 188 };
189 189
190 left { 190 left {
191 label = "Joystick Left"; 191 label = "Joystick Left";
192 gpios = <&pioB 14 1>; 192 gpios = <&pioB 14 GPIO_ACTIVE_LOW>;
193 linux,code = <105>; 193 linux,code = <105>;
194 }; 194 };
195 195
196 right { 196 right {
197 label = "Joystick Right"; 197 label = "Joystick Right";
198 gpios = <&pioB 15 1>; 198 gpios = <&pioB 15 GPIO_ACTIVE_LOW>;
199 linux,code = <106>; 199 linux,code = <106>;
200 }; 200 };
201 201
202 up { 202 up {
203 label = "Joystick Up"; 203 label = "Joystick Up";
204 gpios = <&pioB 16 1>; 204 gpios = <&pioB 16 GPIO_ACTIVE_LOW>;
205 linux,code = <103>; 205 linux,code = <103>;
206 }; 206 };
207 207
208 down { 208 down {
209 label = "Joystick Down"; 209 label = "Joystick Down";
210 gpios = <&pioB 17 1>; 210 gpios = <&pioB 17 GPIO_ACTIVE_LOW>;
211 linux,code = <108>; 211 linux,code = <108>;
212 }; 212 };
213 213
214 enter { 214 enter {
215 label = "Joystick Press"; 215 label = "Joystick Press";
216 gpios = <&pioB 18 1>; 216 gpios = <&pioB 18 GPIO_ACTIVE_LOW>;
217 linux,code = <28>; 217 linux,code = <28>;
218 }; 218 };
219 }; 219 };
diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
index 8d25f889928e..d864f7a9d2e0 100644
--- a/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@ -7,7 +7,10 @@
7 * Licensed under GPLv2 or later. 7 * Licensed under GPLv2 or later.
8 */ 8 */
9 9
10/include/ "skeleton.dtsi" 10#include "skeleton.dtsi"
11#include <dt-bindings/pinctrl/at91.h>
12#include <dt-bindings/interrupt-controller/irq.h>
13#include <dt-bindings/gpio/gpio.h>
11 14
12/ { 15/ {
13 model = "Atmel AT91SAM9N12 SoC"; 16 model = "Atmel AT91SAM9N12 SoC";
@@ -78,7 +81,7 @@
78 pit: timer@fffffe30 { 81 pit: timer@fffffe30 {
79 compatible = "atmel,at91sam9260-pit"; 82 compatible = "atmel,at91sam9260-pit";
80 reg = <0xfffffe30 0xf>; 83 reg = <0xfffffe30 0xf>;
81 interrupts = <1 4 7>; 84 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
82 }; 85 };
83 86
84 shdwc@fffffe10 { 87 shdwc@fffffe10 {
@@ -89,7 +92,7 @@
89 mmc0: mmc@f0008000 { 92 mmc0: mmc@f0008000 {
90 compatible = "atmel,hsmci"; 93 compatible = "atmel,hsmci";
91 reg = <0xf0008000 0x600>; 94 reg = <0xf0008000 0x600>;
92 interrupts = <12 4 0>; 95 interrupts = <12 IRQ_TYPE_LEVEL_HIGH 0>;
93 dmas = <&dma 1 0>; 96 dmas = <&dma 1 0>;
94 dma-names = "rxtx"; 97 dma-names = "rxtx";
95 #address-cells = <1>; 98 #address-cells = <1>;
@@ -100,19 +103,19 @@
100 tcb0: timer@f8008000 { 103 tcb0: timer@f8008000 {
101 compatible = "atmel,at91sam9x5-tcb"; 104 compatible = "atmel,at91sam9x5-tcb";
102 reg = <0xf8008000 0x100>; 105 reg = <0xf8008000 0x100>;
103 interrupts = <17 4 0>; 106 interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0>;
104 }; 107 };
105 108
106 tcb1: timer@f800c000 { 109 tcb1: timer@f800c000 {
107 compatible = "atmel,at91sam9x5-tcb"; 110 compatible = "atmel,at91sam9x5-tcb";
108 reg = <0xf800c000 0x100>; 111 reg = <0xf800c000 0x100>;
109 interrupts = <17 4 0>; 112 interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0>;
110 }; 113 };
111 114
112 dma: dma-controller@ffffec00 { 115 dma: dma-controller@ffffec00 {
113 compatible = "atmel,at91sam9g45-dma"; 116 compatible = "atmel,at91sam9g45-dma";
114 reg = <0xffffec00 0x200>; 117 reg = <0xffffec00 0x200>;
115 interrupts = <20 4 0>; 118 interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;
116 #dma-cells = <2>; 119 #dma-cells = <2>;
117 }; 120 };
118 121
@@ -134,159 +137,159 @@
134 dbgu { 137 dbgu {
135 pinctrl_dbgu: dbgu-0 { 138 pinctrl_dbgu: dbgu-0 {
136 atmel,pins = 139 atmel,pins =
137 <0 9 0x1 0x0 /* PA9 periph A */ 140 <AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA9 periph A */
138 0 10 0x1 0x1>; /* PA10 periph with pullup */ 141 AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA10 periph with pullup */
139 }; 142 };
140 }; 143 };
141 144
142 usart0 { 145 usart0 {
143 pinctrl_usart0: usart0-0 { 146 pinctrl_usart0: usart0-0 {
144 atmel,pins = 147 atmel,pins =
145 <0 1 0x1 0x1 /* PA1 periph A with pullup */ 148 <AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA1 periph A with pullup */
146 0 0 0x1 0x0>; /* PA0 periph A */ 149 AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA0 periph A */
147 }; 150 };
148 151
149 pinctrl_usart0_rts: usart0_rts-0 { 152 pinctrl_usart0_rts: usart0_rts-0 {
150 atmel,pins = 153 atmel,pins =
151 <0 2 0x1 0x0>; /* PA2 periph A */ 154 <AT91_PIOA 2 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA2 periph A */
152 }; 155 };
153 156
154 pinctrl_usart0_cts: usart0_cts-0 { 157 pinctrl_usart0_cts: usart0_cts-0 {
155 atmel,pins = 158 atmel,pins =
156 <0 3 0x1 0x0>; /* PA3 periph A */ 159 <AT91_PIOA 3 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA3 periph A */
157 }; 160 };
158 }; 161 };
159 162
160 usart1 { 163 usart1 {
161 pinctrl_usart1: usart1-0 { 164 pinctrl_usart1: usart1-0 {
162 atmel,pins = 165 atmel,pins =
163 <0 6 0x1 0x1 /* PA6 periph A with pullup */ 166 <AT91_PIOA 6 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA6 periph A with pullup */
164 0 5 0x1 0x0>; /* PA5 periph A */ 167 AT91_PIOA 5 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA5 periph A */
165 }; 168 };
166 }; 169 };
167 170
168 usart2 { 171 usart2 {
169 pinctrl_usart2: usart2-0 { 172 pinctrl_usart2: usart2-0 {
170 atmel,pins = 173 atmel,pins =
171 <0 8 0x1 0x1 /* PA8 periph A with pullup */ 174 <AT91_PIOA 8 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA8 periph A with pullup */
172 0 7 0x1 0x0>; /* PA7 periph A */ 175 AT91_PIOA 7 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA7 periph A */
173 }; 176 };
174 177
175 pinctrl_usart2_rts: usart2_rts-0 { 178 pinctrl_usart2_rts: usart2_rts-0 {
176 atmel,pins = 179 atmel,pins =
177 <1 0 0x2 0x0>; /* PB0 periph B */ 180 <AT91_PIOB 0 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PB0 periph B */
178 }; 181 };
179 182
180 pinctrl_usart2_cts: usart2_cts-0 { 183 pinctrl_usart2_cts: usart2_cts-0 {
181 atmel,pins = 184 atmel,pins =
182 <1 1 0x2 0x0>; /* PB1 periph B */ 185 <AT91_PIOB 1 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PB1 periph B */
183 }; 186 };
184 }; 187 };
185 188
186 usart3 { 189 usart3 {
187 pinctrl_usart3: usart3-0 { 190 pinctrl_usart3: usart3-0 {
188 atmel,pins = 191 atmel,pins =
189 <2 23 0x2 0x1 /* PC23 periph B with pullup */ 192 <AT91_PIOC 23 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PC23 periph B with pullup */
190 2 22 0x2 0x0>; /* PC22 periph B */ 193 AT91_PIOC 22 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC22 periph B */
191 }; 194 };
192 195
193 pinctrl_usart3_rts: usart3_rts-0 { 196 pinctrl_usart3_rts: usart3_rts-0 {
194 atmel,pins = 197 atmel,pins =
195 <2 24 0x2 0x0>; /* PC24 periph B */ 198 <AT91_PIOC 24 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC24 periph B */
196 }; 199 };
197 200
198 pinctrl_usart3_cts: usart3_cts-0 { 201 pinctrl_usart3_cts: usart3_cts-0 {
199 atmel,pins = 202 atmel,pins =
200 <2 25 0x2 0x0>; /* PC25 periph B */ 203 <AT91_PIOC 25 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC25 periph B */
201 }; 204 };
202 }; 205 };
203 206
204 uart0 { 207 uart0 {
205 pinctrl_uart0: uart0-0 { 208 pinctrl_uart0: uart0-0 {
206 atmel,pins = 209 atmel,pins =
207 <2 9 0x3 0x1 /* PC9 periph C with pullup */ 210 <AT91_PIOC 9 AT91_PERIPH_C AT91_PINCTRL_PULL_UP /* PC9 periph C with pullup */
208 2 8 0x3 0x0>; /* PC8 periph C */ 211 AT91_PIOC 8 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* PC8 periph C */
209 }; 212 };
210 }; 213 };
211 214
212 uart1 { 215 uart1 {
213 pinctrl_uart1: uart1-0 { 216 pinctrl_uart1: uart1-0 {
214 atmel,pins = 217 atmel,pins =
215 <2 16 0x3 0x1 /* PC17 periph C with pullup */ 218 <AT91_PIOC 16 AT91_PERIPH_C AT91_PINCTRL_PULL_UP /* PC17 periph C with pullup */
216 2 17 0x3 0x0>; /* PC16 periph C */ 219 AT91_PIOC 17 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* PC16 periph C */
217 }; 220 };
218 }; 221 };
219 222
220 nand { 223 nand {
221 pinctrl_nand: nand-0 { 224 pinctrl_nand: nand-0 {
222 atmel,pins = 225 atmel,pins =
223 <3 5 0x0 0x1 /* PD5 gpio RDY pin pull_up*/ 226 <AT91_PIOD 5 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP /* PD5 gpio RDY pin pull_up*/
224 3 4 0x0 0x1>; /* PD4 gpio enable pin pull_up */ 227 AT91_PIOD 4 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; /* PD4 gpio enable pin pull_up */
225 }; 228 };
226 }; 229 };
227 230
228 mmc0 { 231 mmc0 {
229 pinctrl_mmc0_slot0_clk_cmd_dat0: mmc0_slot0_clk_cmd_dat0-0 { 232 pinctrl_mmc0_slot0_clk_cmd_dat0: mmc0_slot0_clk_cmd_dat0-0 {
230 atmel,pins = 233 atmel,pins =
231 <0 17 0x1 0x0 /* PA17 periph A */ 234 <AT91_PIOA 17 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA17 periph A */
232 0 16 0x1 0x1 /* PA16 periph A with pullup */ 235 AT91_PIOA 16 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA16 periph A with pullup */
233 0 15 0x1 0x1>; /* PA15 periph A with pullup */ 236 AT91_PIOA 15 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA15 periph A with pullup */
234 }; 237 };
235 238
236 pinctrl_mmc0_slot0_dat1_3: mmc0_slot0_dat1_3-0 { 239 pinctrl_mmc0_slot0_dat1_3: mmc0_slot0_dat1_3-0 {
237 atmel,pins = 240 atmel,pins =
238 <0 18 0x1 0x1 /* PA18 periph A with pullup */ 241 <AT91_PIOA 18 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA18 periph A with pullup */
239 0 19 0x1 0x1 /* PA19 periph A with pullup */ 242 AT91_PIOA 19 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA19 periph A with pullup */
240 0 20 0x1 0x1>; /* PA20 periph A with pullup */ 243 AT91_PIOA 20 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA20 periph A with pullup */
241 }; 244 };
242 245
243 pinctrl_mmc0_slot0_dat4_7: mmc0_slot0_dat4_7-0 { 246 pinctrl_mmc0_slot0_dat4_7: mmc0_slot0_dat4_7-0 {
244 atmel,pins = 247 atmel,pins =
245 <0 11 0x2 0x1 /* PA11 periph B with pullup */ 248 <AT91_PIOA 11 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA11 periph B with pullup */
246 0 12 0x2 0x1 /* PA12 periph B with pullup */ 249 AT91_PIOA 12 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA12 periph B with pullup */
247 0 13 0x2 0x1 /* PA13 periph B with pullup */ 250 AT91_PIOA 13 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA13 periph B with pullup */
248 0 14 0x2 0x1>; /* PA14 periph B with pullup */ 251 AT91_PIOA 14 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>; /* PA14 periph B with pullup */
249 }; 252 };
250 }; 253 };
251 254
252 ssc0 { 255 ssc0 {
253 pinctrl_ssc0_tx: ssc0_tx-0 { 256 pinctrl_ssc0_tx: ssc0_tx-0 {
254 atmel,pins = 257 atmel,pins =
255 <0 24 0x2 0x0 /* PA24 periph B */ 258 <AT91_PIOA 24 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA24 periph B */
256 0 25 0x2 0x0 /* PA25 periph B */ 259 AT91_PIOA 25 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA25 periph B */
257 0 26 0x2 0x0>; /* PA26 periph B */ 260 AT91_PIOA 26 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA26 periph B */
258 }; 261 };
259 262
260 pinctrl_ssc0_rx: ssc0_rx-0 { 263 pinctrl_ssc0_rx: ssc0_rx-0 {
261 atmel,pins = 264 atmel,pins =
262 <0 27 0x2 0x0 /* PA27 periph B */ 265 <AT91_PIOA 27 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA27 periph B */
263 0 28 0x2 0x0 /* PA28 periph B */ 266 AT91_PIOA 28 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA28 periph B */
264 0 29 0x2 0x0>; /* PA29 periph B */ 267 AT91_PIOA 29 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA29 periph B */
265 }; 268 };
266 }; 269 };
267 270
268 spi0 { 271 spi0 {
269 pinctrl_spi0: spi0-0 { 272 pinctrl_spi0: spi0-0 {
270 atmel,pins = 273 atmel,pins =
271 <0 11 0x1 0x0 /* PA11 periph A SPI0_MISO pin */ 274 <AT91_PIOA 11 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA11 periph A SPI0_MISO pin */
272 0 12 0x1 0x0 /* PA12 periph A SPI0_MOSI pin */ 275 AT91_PIOA 12 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA12 periph A SPI0_MOSI pin */
273 0 13 0x1 0x0>; /* PA13 periph A SPI0_SPCK pin */ 276 AT91_PIOA 13 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA13 periph A SPI0_SPCK pin */
274 }; 277 };
275 }; 278 };
276 279
277 spi1 { 280 spi1 {
278 pinctrl_spi1: spi1-0 { 281 pinctrl_spi1: spi1-0 {
279 atmel,pins = 282 atmel,pins =
280 <0 21 0x2 0x0 /* PA21 periph B SPI1_MISO pin */ 283 <AT91_PIOA 21 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA21 periph B SPI1_MISO pin */
281 0 22 0x2 0x0 /* PA22 periph B SPI1_MOSI pin */ 284 AT91_PIOA 22 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA22 periph B SPI1_MOSI pin */
282 0 23 0x2 0x0>; /* PA23 periph B SPI1_SPCK pin */ 285 AT91_PIOA 23 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA23 periph B SPI1_SPCK pin */
283 }; 286 };
284 }; 287 };
285 288
286 pioA: gpio@fffff400 { 289 pioA: gpio@fffff400 {
287 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; 290 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
288 reg = <0xfffff400 0x200>; 291 reg = <0xfffff400 0x200>;
289 interrupts = <2 4 1>; 292 interrupts = <2 IRQ_TYPE_LEVEL_HIGH 1>;
290 #gpio-cells = <2>; 293 #gpio-cells = <2>;
291 gpio-controller; 294 gpio-controller;
292 interrupt-controller; 295 interrupt-controller;
@@ -296,7 +299,7 @@
296 pioB: gpio@fffff600 { 299 pioB: gpio@fffff600 {
297 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; 300 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
298 reg = <0xfffff600 0x200>; 301 reg = <0xfffff600 0x200>;
299 interrupts = <2 4 1>; 302 interrupts = <2 IRQ_TYPE_LEVEL_HIGH 1>;
300 #gpio-cells = <2>; 303 #gpio-cells = <2>;
301 gpio-controller; 304 gpio-controller;
302 interrupt-controller; 305 interrupt-controller;
@@ -306,7 +309,7 @@
306 pioC: gpio@fffff800 { 309 pioC: gpio@fffff800 {
307 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; 310 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
308 reg = <0xfffff800 0x200>; 311 reg = <0xfffff800 0x200>;
309 interrupts = <3 4 1>; 312 interrupts = <3 IRQ_TYPE_LEVEL_HIGH 1>;
310 #gpio-cells = <2>; 313 #gpio-cells = <2>;
311 gpio-controller; 314 gpio-controller;
312 interrupt-controller; 315 interrupt-controller;
@@ -316,7 +319,7 @@
316 pioD: gpio@fffffa00 { 319 pioD: gpio@fffffa00 {
317 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; 320 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
318 reg = <0xfffffa00 0x200>; 321 reg = <0xfffffa00 0x200>;
319 interrupts = <3 4 1>; 322 interrupts = <3 IRQ_TYPE_LEVEL_HIGH 1>;
320 #gpio-cells = <2>; 323 #gpio-cells = <2>;
321 gpio-controller; 324 gpio-controller;
322 interrupt-controller; 325 interrupt-controller;
@@ -327,7 +330,7 @@
327 dbgu: serial@fffff200 { 330 dbgu: serial@fffff200 {
328 compatible = "atmel,at91sam9260-usart"; 331 compatible = "atmel,at91sam9260-usart";
329 reg = <0xfffff200 0x200>; 332 reg = <0xfffff200 0x200>;
330 interrupts = <1 4 7>; 333 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
331 pinctrl-names = "default"; 334 pinctrl-names = "default";
332 pinctrl-0 = <&pinctrl_dbgu>; 335 pinctrl-0 = <&pinctrl_dbgu>;
333 status = "disabled"; 336 status = "disabled";
@@ -336,7 +339,7 @@
336 ssc0: ssc@f0010000 { 339 ssc0: ssc@f0010000 {
337 compatible = "atmel,at91sam9g45-ssc"; 340 compatible = "atmel,at91sam9g45-ssc";
338 reg = <0xf0010000 0x4000>; 341 reg = <0xf0010000 0x4000>;
339 interrupts = <28 4 5>; 342 interrupts = <28 IRQ_TYPE_LEVEL_HIGH 5>;
340 pinctrl-names = "default"; 343 pinctrl-names = "default";
341 pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>; 344 pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
342 status = "disabled"; 345 status = "disabled";
@@ -345,7 +348,7 @@
345 usart0: serial@f801c000 { 348 usart0: serial@f801c000 {
346 compatible = "atmel,at91sam9260-usart"; 349 compatible = "atmel,at91sam9260-usart";
347 reg = <0xf801c000 0x4000>; 350 reg = <0xf801c000 0x4000>;
348 interrupts = <5 4 5>; 351 interrupts = <5 IRQ_TYPE_LEVEL_HIGH 5>;
349 pinctrl-names = "default"; 352 pinctrl-names = "default";
350 pinctrl-0 = <&pinctrl_usart0>; 353 pinctrl-0 = <&pinctrl_usart0>;
351 status = "disabled"; 354 status = "disabled";
@@ -354,7 +357,7 @@
354 usart1: serial@f8020000 { 357 usart1: serial@f8020000 {
355 compatible = "atmel,at91sam9260-usart"; 358 compatible = "atmel,at91sam9260-usart";
356 reg = <0xf8020000 0x4000>; 359 reg = <0xf8020000 0x4000>;
357 interrupts = <6 4 5>; 360 interrupts = <6 IRQ_TYPE_LEVEL_HIGH 5>;
358 pinctrl-names = "default"; 361 pinctrl-names = "default";
359 pinctrl-0 = <&pinctrl_usart1>; 362 pinctrl-0 = <&pinctrl_usart1>;
360 status = "disabled"; 363 status = "disabled";
@@ -363,7 +366,7 @@
363 usart2: serial@f8024000 { 366 usart2: serial@f8024000 {
364 compatible = "atmel,at91sam9260-usart"; 367 compatible = "atmel,at91sam9260-usart";
365 reg = <0xf8024000 0x4000>; 368 reg = <0xf8024000 0x4000>;
366 interrupts = <7 4 5>; 369 interrupts = <7 IRQ_TYPE_LEVEL_HIGH 5>;
367 pinctrl-names = "default"; 370 pinctrl-names = "default";
368 pinctrl-0 = <&pinctrl_usart2>; 371 pinctrl-0 = <&pinctrl_usart2>;
369 status = "disabled"; 372 status = "disabled";
@@ -372,7 +375,7 @@
372 usart3: serial@f8028000 { 375 usart3: serial@f8028000 {
373 compatible = "atmel,at91sam9260-usart"; 376 compatible = "atmel,at91sam9260-usart";
374 reg = <0xf8028000 0x4000>; 377 reg = <0xf8028000 0x4000>;
375 interrupts = <8 4 5>; 378 interrupts = <8 IRQ_TYPE_LEVEL_HIGH 5>;
376 pinctrl-names = "default"; 379 pinctrl-names = "default";
377 pinctrl-0 = <&pinctrl_usart3>; 380 pinctrl-0 = <&pinctrl_usart3>;
378 status = "disabled"; 381 status = "disabled";
@@ -381,7 +384,7 @@
381 i2c0: i2c@f8010000 { 384 i2c0: i2c@f8010000 {
382 compatible = "atmel,at91sam9x5-i2c"; 385 compatible = "atmel,at91sam9x5-i2c";
383 reg = <0xf8010000 0x100>; 386 reg = <0xf8010000 0x100>;
384 interrupts = <9 4 6>; 387 interrupts = <9 IRQ_TYPE_LEVEL_HIGH 6>;
385 dmas = <&dma 1 13>, 388 dmas = <&dma 1 13>,
386 <&dma 1 14>; 389 <&dma 1 14>;
387 dma-names = "tx", "rx"; 390 dma-names = "tx", "rx";
@@ -393,7 +396,7 @@
393 i2c1: i2c@f8014000 { 396 i2c1: i2c@f8014000 {
394 compatible = "atmel,at91sam9x5-i2c"; 397 compatible = "atmel,at91sam9x5-i2c";
395 reg = <0xf8014000 0x100>; 398 reg = <0xf8014000 0x100>;
396 interrupts = <10 4 6>; 399 interrupts = <10 IRQ_TYPE_LEVEL_HIGH 6>;
397 dmas = <&dma 1 15>, 400 dmas = <&dma 1 15>,
398 <&dma 1 16>; 401 <&dma 1 16>;
399 dma-names = "tx", "rx"; 402 dma-names = "tx", "rx";
@@ -407,7 +410,7 @@
407 #size-cells = <0>; 410 #size-cells = <0>;
408 compatible = "atmel,at91rm9200-spi"; 411 compatible = "atmel,at91rm9200-spi";
409 reg = <0xf0000000 0x100>; 412 reg = <0xf0000000 0x100>;
410 interrupts = <13 4 3>; 413 interrupts = <13 IRQ_TYPE_LEVEL_HIGH 3>;
411 pinctrl-names = "default"; 414 pinctrl-names = "default";
412 pinctrl-0 = <&pinctrl_spi0>; 415 pinctrl-0 = <&pinctrl_spi0>;
413 status = "disabled"; 416 status = "disabled";
@@ -418,7 +421,7 @@
418 #size-cells = <0>; 421 #size-cells = <0>;
419 compatible = "atmel,at91rm9200-spi"; 422 compatible = "atmel,at91rm9200-spi";
420 reg = <0xf0004000 0x100>; 423 reg = <0xf0004000 0x100>;
421 interrupts = <14 4 3>; 424 interrupts = <14 IRQ_TYPE_LEVEL_HIGH 3>;
422 pinctrl-names = "default"; 425 pinctrl-names = "default";
423 pinctrl-0 = <&pinctrl_spi1>; 426 pinctrl-0 = <&pinctrl_spi1>;
424 status = "disabled"; 427 status = "disabled";
@@ -439,8 +442,8 @@
439 atmel,nand-cmd-offset = <22>; 442 atmel,nand-cmd-offset = <22>;
440 pinctrl-names = "default"; 443 pinctrl-names = "default";
441 pinctrl-0 = <&pinctrl_nand>; 444 pinctrl-0 = <&pinctrl_nand>;
442 gpios = <&pioD 5 0 445 gpios = <&pioD 5 GPIO_ACTIVE_HIGH
443 &pioD 4 0 446 &pioD 4 GPIO_ACTIVE_HIGH
444 0 447 0
445 >; 448 >;
446 status = "disabled"; 449 status = "disabled";
@@ -449,15 +452,15 @@
449 usb0: ohci@00500000 { 452 usb0: ohci@00500000 {
450 compatible = "atmel,at91rm9200-ohci", "usb-ohci"; 453 compatible = "atmel,at91rm9200-ohci", "usb-ohci";
451 reg = <0x00500000 0x00100000>; 454 reg = <0x00500000 0x00100000>;
452 interrupts = <22 4 2>; 455 interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
453 status = "disabled"; 456 status = "disabled";
454 }; 457 };
455 }; 458 };
456 459
457 i2c@0 { 460 i2c@0 {
458 compatible = "i2c-gpio"; 461 compatible = "i2c-gpio";
459 gpios = <&pioA 30 0 /* sda */ 462 gpios = <&pioA 30 GPIO_ACTIVE_HIGH /* sda */
460 &pioA 31 0 /* scl */ 463 &pioA 31 GPIO_ACTIVE_HIGH /* scl */
461 >; 464 >;
462 i2c-gpio,sda-open-drain; 465 i2c-gpio,sda-open-drain;
463 i2c-gpio,scl-open-drain; 466 i2c-gpio,scl-open-drain;
diff --git a/arch/arm/boot/dts/at91sam9n12ek.dts b/arch/arm/boot/dts/at91sam9n12ek.dts
index d30e48bd1e9d..2e67cd5e47eb 100644
--- a/arch/arm/boot/dts/at91sam9n12ek.dts
+++ b/arch/arm/boot/dts/at91sam9n12ek.dts
@@ -7,7 +7,7 @@
7 * Licensed under GPLv2 or later. 7 * Licensed under GPLv2 or later.
8 */ 8 */
9/dts-v1/; 9/dts-v1/;
10/include/ "at91sam9n12.dtsi" 10#include "at91sam9n12.dtsi"
11 11
12/ { 12/ {
13 model = "Atmel AT91SAM9N12-EK"; 13 model = "Atmel AT91SAM9N12-EK";
@@ -55,7 +55,7 @@
55 slot@0 { 55 slot@0 {
56 reg = <0>; 56 reg = <0>;
57 bus-width = <4>; 57 bus-width = <4>;
58 cd-gpios = <&pioA 7 0>; 58 cd-gpios = <&pioA 7 GPIO_ACTIVE_HIGH>;
59 }; 59 };
60 }; 60 };
61 61
@@ -63,7 +63,7 @@
63 mmc0 { 63 mmc0 {
64 pinctrl_board_mmc0: mmc0-board { 64 pinctrl_board_mmc0: mmc0-board {
65 atmel,pins = 65 atmel,pins =
66 <0 7 0x0 0x5>; /* PA7 gpio CD pin pull up and deglitch */ 66 <AT91_PIOA 7 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PA7 gpio CD pin pull up and deglitch */
67 }; 67 };
68 }; 68 };
69 }; 69 };
@@ -95,19 +95,19 @@
95 95
96 d8 { 96 d8 {
97 label = "d8"; 97 label = "d8";
98 gpios = <&pioB 4 1>; 98 gpios = <&pioB 4 GPIO_ACTIVE_LOW>;
99 linux,default-trigger = "mmc0"; 99 linux,default-trigger = "mmc0";
100 }; 100 };
101 101
102 d9 { 102 d9 {
103 label = "d6"; 103 label = "d6";
104 gpios = <&pioB 5 1>; 104 gpios = <&pioB 5 GPIO_ACTIVE_LOW>;
105 linux,default-trigger = "nand-disk"; 105 linux,default-trigger = "nand-disk";
106 }; 106 };
107 107
108 d10 { 108 d10 {
109 label = "d7"; 109 label = "d7";
110 gpios = <&pioB 6 0>; 110 gpios = <&pioB 6 GPIO_ACTIVE_HIGH>;
111 linux,default-trigger = "heartbeat"; 111 linux,default-trigger = "heartbeat";
112 }; 112 };
113 }; 113 };
@@ -117,7 +117,7 @@
117 117
118 enter { 118 enter {
119 label = "Enter"; 119 label = "Enter";
120 gpios = <&pioB 4 1>; 120 gpios = <&pioB 4 GPIO_ACTIVE_LOW>;
121 linux,code = <28>; 121 linux,code = <28>;
122 gpio-key,wakeup; 122 gpio-key,wakeup;
123 }; 123 };
diff --git a/arch/arm/boot/dts/at91sam9x25.dtsi b/arch/arm/boot/dts/at91sam9x25.dtsi
index 9ac2bc2b4f07..49e94aba938f 100644
--- a/arch/arm/boot/dts/at91sam9x25.dtsi
+++ b/arch/arm/boot/dts/at91sam9x25.dtsi
@@ -6,7 +6,7 @@
6 * Licensed under GPLv2. 6 * Licensed under GPLv2.
7 */ 7 */
8 8
9/include/ "at91sam9x5.dtsi" 9#include "at91sam9x5.dtsi"
10 10
11/ { 11/ {
12 model = "Atmel AT91SAM9X25 SoC"; 12 model = "Atmel AT91SAM9X25 SoC";
@@ -26,16 +26,16 @@
26 macb1 { 26 macb1 {
27 pinctrl_macb1_rmii: macb1_rmii-0 { 27 pinctrl_macb1_rmii: macb1_rmii-0 {
28 atmel,pins = 28 atmel,pins =
29 <2 16 0x2 0x0 /* PC16 periph B */ 29 <AT91_PIOC 16 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC16 periph B */
30 2 18 0x2 0x0 /* PC18 periph B */ 30 AT91_PIOC 18 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC18 periph B */
31 2 19 0x2 0x0 /* PC19 periph B */ 31 AT91_PIOC 19 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC19 periph B */
32 2 20 0x2 0x0 /* PC20 periph B */ 32 AT91_PIOC 20 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC20 periph B */
33 2 21 0x2 0x0 /* PC21 periph B */ 33 AT91_PIOC 21 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC21 periph B */
34 2 27 0x2 0x0 /* PC27 periph B */ 34 AT91_PIOC 27 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC27 periph B */
35 2 28 0x2 0x0 /* PC28 periph B */ 35 AT91_PIOC 28 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC28 periph B */
36 2 29 0x2 0x0 /* PC29 periph B */ 36 AT91_PIOC 29 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC29 periph B */
37 2 30 0x2 0x0 /* PC30 periph B */ 37 AT91_PIOC 30 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC30 periph B */
38 2 31 0x2 0x0>; /* PC31 periph B */ 38 AT91_PIOC 31 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC31 periph B */
39 }; 39 };
40 }; 40 };
41 }; 41 };
diff --git a/arch/arm/boot/dts/at91sam9x25ek.dts b/arch/arm/boot/dts/at91sam9x25ek.dts
index 315250b4995e..494864836e83 100644
--- a/arch/arm/boot/dts/at91sam9x25ek.dts
+++ b/arch/arm/boot/dts/at91sam9x25ek.dts
@@ -7,8 +7,8 @@
7 * Licensed under GPLv2 or later. 7 * Licensed under GPLv2 or later.
8 */ 8 */
9/dts-v1/; 9/dts-v1/;
10/include/ "at91sam9x25.dtsi" 10#include "at91sam9x25.dtsi"
11/include/ "at91sam9x5ek.dtsi" 11#include "at91sam9x5ek.dtsi"
12 12
13/ { 13/ {
14 model = "Atmel AT91SAM9X25-EK"; 14 model = "Atmel AT91SAM9X25-EK";
diff --git a/arch/arm/boot/dts/at91sam9x35.dtsi b/arch/arm/boot/dts/at91sam9x35.dtsi
index ba67d83d17ac..1a3d525a1f5d 100644
--- a/arch/arm/boot/dts/at91sam9x35.dtsi
+++ b/arch/arm/boot/dts/at91sam9x35.dtsi
@@ -6,7 +6,7 @@
6 * Licensed under GPLv2. 6 * Licensed under GPLv2.
7 */ 7 */
8 8
9/include/ "at91sam9x5.dtsi" 9#include "at91sam9x5.dtsi"
10 10
11/ { 11/ {
12 model = "Atmel AT91SAM9X35 SoC"; 12 model = "Atmel AT91SAM9X35 SoC";
diff --git a/arch/arm/boot/dts/at91sam9x35ek.dts b/arch/arm/boot/dts/at91sam9x35ek.dts
index 6ad19a0d5424..343d32818ca3 100644
--- a/arch/arm/boot/dts/at91sam9x35ek.dts
+++ b/arch/arm/boot/dts/at91sam9x35ek.dts
@@ -7,8 +7,8 @@
7 * Licensed under GPLv2 or later. 7 * Licensed under GPLv2 or later.
8 */ 8 */
9/dts-v1/; 9/dts-v1/;
10/include/ "at91sam9x35.dtsi" 10#include "at91sam9x35.dtsi"
11/include/ "at91sam9x5ek.dtsi" 11#include "at91sam9x5ek.dtsi"
12 12
13/ { 13/ {
14 model = "Atmel AT91SAM9X35-EK"; 14 model = "Atmel AT91SAM9X35-EK";
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index 1145ac330fb7..af91599488e9 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -9,7 +9,10 @@
9 * Licensed under GPLv2 or later. 9 * Licensed under GPLv2 or later.
10 */ 10 */
11 11
12/include/ "skeleton.dtsi" 12#include "skeleton.dtsi"
13#include <dt-bindings/pinctrl/at91.h>
14#include <dt-bindings/interrupt-controller/irq.h>
15#include <dt-bindings/gpio/gpio.h>
13 16
14/ { 17/ {
15 model = "Atmel AT91SAM9x5 family SoC"; 18 model = "Atmel AT91SAM9x5 family SoC";
@@ -85,32 +88,32 @@
85 pit: timer@fffffe30 { 88 pit: timer@fffffe30 {
86 compatible = "atmel,at91sam9260-pit"; 89 compatible = "atmel,at91sam9260-pit";
87 reg = <0xfffffe30 0xf>; 90 reg = <0xfffffe30 0xf>;
88 interrupts = <1 4 7>; 91 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
89 }; 92 };
90 93
91 tcb0: timer@f8008000 { 94 tcb0: timer@f8008000 {
92 compatible = "atmel,at91sam9x5-tcb"; 95 compatible = "atmel,at91sam9x5-tcb";
93 reg = <0xf8008000 0x100>; 96 reg = <0xf8008000 0x100>;
94 interrupts = <17 4 0>; 97 interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0>;
95 }; 98 };
96 99
97 tcb1: timer@f800c000 { 100 tcb1: timer@f800c000 {
98 compatible = "atmel,at91sam9x5-tcb"; 101 compatible = "atmel,at91sam9x5-tcb";
99 reg = <0xf800c000 0x100>; 102 reg = <0xf800c000 0x100>;
100 interrupts = <17 4 0>; 103 interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0>;
101 }; 104 };
102 105
103 dma0: dma-controller@ffffec00 { 106 dma0: dma-controller@ffffec00 {
104 compatible = "atmel,at91sam9g45-dma"; 107 compatible = "atmel,at91sam9g45-dma";
105 reg = <0xffffec00 0x200>; 108 reg = <0xffffec00 0x200>;
106 interrupts = <20 4 0>; 109 interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;
107 #dma-cells = <2>; 110 #dma-cells = <2>;
108 }; 111 };
109 112
110 dma1: dma-controller@ffffee00 { 113 dma1: dma-controller@ffffee00 {
111 compatible = "atmel,at91sam9g45-dma"; 114 compatible = "atmel,at91sam9g45-dma";
112 reg = <0xffffee00 0x200>; 115 reg = <0xffffee00 0x200>;
113 interrupts = <21 4 0>; 116 interrupts = <21 IRQ_TYPE_LEVEL_HIGH 0>;
114 #dma-cells = <2>; 117 #dma-cells = <2>;
115 }; 118 };
116 119
@@ -124,297 +127,297 @@
124 dbgu { 127 dbgu {
125 pinctrl_dbgu: dbgu-0 { 128 pinctrl_dbgu: dbgu-0 {
126 atmel,pins = 129 atmel,pins =
127 <0 9 0x1 0x0 /* PA9 periph A */ 130 <AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA9 periph A */
128 0 10 0x1 0x1>; /* PA10 periph A with pullup */ 131 AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA10 periph A with pullup */
129 }; 132 };
130 }; 133 };
131 134
132 usart0 { 135 usart0 {
133 pinctrl_usart0: usart0-0 { 136 pinctrl_usart0: usart0-0 {
134 atmel,pins = 137 atmel,pins =
135 <0 0 0x1 0x1 /* PA0 periph A with pullup */ 138 <AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA0 periph A with pullup */
136 0 1 0x1 0x0>; /* PA1 periph A */ 139 AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA1 periph A */
137 }; 140 };
138 141
139 pinctrl_usart0_rts: usart0_rts-0 { 142 pinctrl_usart0_rts: usart0_rts-0 {
140 atmel,pins = 143 atmel,pins =
141 <0 2 0x1 0x0>; /* PA2 periph A */ 144 <AT91_PIOA 2 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA2 periph A */
142 }; 145 };
143 146
144 pinctrl_usart0_cts: usart0_cts-0 { 147 pinctrl_usart0_cts: usart0_cts-0 {
145 atmel,pins = 148 atmel,pins =
146 <0 3 0x1 0x0>; /* PA3 periph A */ 149 <AT91_PIOA 3 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA3 periph A */
147 }; 150 };
148 151
149 pinctrl_usart0_sck: usart0_sck-0 { 152 pinctrl_usart0_sck: usart0_sck-0 {
150 atmel,pins = 153 atmel,pins =
151 <0 4 0x1 0x0>; /* PA4 periph A */ 154 <AT91_PIOA 4 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA4 periph A */
152 }; 155 };
153 }; 156 };
154 157
155 usart1 { 158 usart1 {
156 pinctrl_usart1: usart1-0 { 159 pinctrl_usart1: usart1-0 {
157 atmel,pins = 160 atmel,pins =
158 <0 5 0x1 0x1 /* PA5 periph A with pullup */ 161 <AT91_PIOA 5 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA5 periph A with pullup */
159 0 6 0x1 0x0>; /* PA6 periph A */ 162 AT91_PIOA 6 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA6 periph A */
160 }; 163 };
161 164
162 pinctrl_usart1_rts: usart1_rts-0 { 165 pinctrl_usart1_rts: usart1_rts-0 {
163 atmel,pins = 166 atmel,pins =
164 <2 27 0x3 0x0>; /* PC27 periph C */ 167 <AT91_PIOC 27 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* PC27 periph C */
165 }; 168 };
166 169
167 pinctrl_usart1_cts: usart1_cts-0 { 170 pinctrl_usart1_cts: usart1_cts-0 {
168 atmel,pins = 171 atmel,pins =
169 <2 28 0x3 0x0>; /* PC28 periph C */ 172 <AT91_PIOC 28 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* PC28 periph C */
170 }; 173 };
171 174
172 pinctrl_usart1_sck: usart1_sck-0 { 175 pinctrl_usart1_sck: usart1_sck-0 {
173 atmel,pins = 176 atmel,pins =
174 <2 28 0x3 0x0>; /* PC29 periph C */ 177 <AT91_PIOC 28 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* PC29 periph C */
175 }; 178 };
176 }; 179 };
177 180
178 usart2 { 181 usart2 {
179 pinctrl_usart2: usart2-0 { 182 pinctrl_usart2: usart2-0 {
180 atmel,pins = 183 atmel,pins =
181 <0 7 0x1 0x1 /* PA7 periph A with pullup */ 184 <AT91_PIOA 7 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA7 periph A with pullup */
182 0 8 0x1 0x0>; /* PA8 periph A */ 185 AT91_PIOA 8 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA8 periph A */
183 }; 186 };
184 187
185 pinctrl_uart2_rts: uart2_rts-0 { 188 pinctrl_uart2_rts: uart2_rts-0 {
186 atmel,pins = 189 atmel,pins =
187 <1 0 0x2 0x0>; /* PB0 periph B */ 190 <AT91_PIOB 0 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PB0 periph B */
188 }; 191 };
189 192
190 pinctrl_uart2_cts: uart2_cts-0 { 193 pinctrl_uart2_cts: uart2_cts-0 {
191 atmel,pins = 194 atmel,pins =
192 <1 1 0x2 0x0>; /* PB1 periph B */ 195 <AT91_PIOB 1 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PB1 periph B */
193 }; 196 };
194 197
195 pinctrl_usart2_sck: usart2_sck-0 { 198 pinctrl_usart2_sck: usart2_sck-0 {
196 atmel,pins = 199 atmel,pins =
197 <1 2 0x2 0x0>; /* PB2 periph B */ 200 <AT91_PIOB 2 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PB2 periph B */
198 }; 201 };
199 }; 202 };
200 203
201 usart3 { 204 usart3 {
202 pinctrl_usart3: usart3-0 { 205 pinctrl_usart3: usart3-0 {
203 atmel,pins = 206 atmel,pins =
204 <2 22 0x2 0x1 /* PC22 periph B with pullup */ 207 <AT91_PIOC 22 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PC22 periph B with pullup */
205 2 23 0x2 0x0>; /* PC23 periph B */ 208 AT91_PIOC 23 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC23 periph B */
206 }; 209 };
207 210
208 pinctrl_usart3_rts: usart3_rts-0 { 211 pinctrl_usart3_rts: usart3_rts-0 {
209 atmel,pins = 212 atmel,pins =
210 <2 24 0x2 0x0>; /* PC24 periph B */ 213 <AT91_PIOC 24 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC24 periph B */
211 }; 214 };
212 215
213 pinctrl_usart3_cts: usart3_cts-0 { 216 pinctrl_usart3_cts: usart3_cts-0 {
214 atmel,pins = 217 atmel,pins =
215 <2 25 0x2 0x0>; /* PC25 periph B */ 218 <AT91_PIOC 25 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC25 periph B */
216 }; 219 };
217 220
218 pinctrl_usart3_sck: usart3_sck-0 { 221 pinctrl_usart3_sck: usart3_sck-0 {
219 atmel,pins = 222 atmel,pins =
220 <2 26 0x2 0x0>; /* PC26 periph B */ 223 <AT91_PIOC 26 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC26 periph B */
221 }; 224 };
222 }; 225 };
223 226
224 uart0 { 227 uart0 {
225 pinctrl_uart0: uart0-0 { 228 pinctrl_uart0: uart0-0 {
226 atmel,pins = 229 atmel,pins =
227 <2 8 0x3 0x0 /* PC8 periph C */ 230 <AT91_PIOC 8 AT91_PERIPH_C AT91_PINCTRL_NONE /* PC8 periph C */
228 2 9 0x3 0x1>; /* PC9 periph C with pullup */ 231 AT91_PIOC 9 AT91_PERIPH_C AT91_PINCTRL_PULL_UP>; /* PC9 periph C with pullup */
229 }; 232 };
230 }; 233 };
231 234
232 uart1 { 235 uart1 {
233 pinctrl_uart1: uart1-0 { 236 pinctrl_uart1: uart1-0 {
234 atmel,pins = 237 atmel,pins =
235 <2 16 0x3 0x0 /* PC16 periph C */ 238 <AT91_PIOC 16 AT91_PERIPH_C AT91_PINCTRL_NONE /* PC16 periph C */
236 2 17 0x3 0x1>; /* PC17 periph C with pullup */ 239 AT91_PIOC 17 AT91_PERIPH_C AT91_PINCTRL_PULL_UP>; /* PC17 periph C with pullup */
237 }; 240 };
238 }; 241 };
239 242
240 nand { 243 nand {
241 pinctrl_nand: nand-0 { 244 pinctrl_nand: nand-0 {
242 atmel,pins = 245 atmel,pins =
243 <3 0 0x1 0x0 /* PD0 periph A Read Enable */ 246 <AT91_PIOD 0 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD0 periph A Read Enable */
244 3 1 0x1 0x0 /* PD1 periph A Write Enable */ 247 AT91_PIOD 1 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD1 periph A Write Enable */
245 3 2 0x1 0x0 /* PD2 periph A Address Latch Enable */ 248 AT91_PIOD 2 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD2 periph A Address Latch Enable */
246 3 3 0x1 0x0 /* PD3 periph A Command Latch Enable */ 249 AT91_PIOD 3 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD3 periph A Command Latch Enable */
247 3 4 0x0 0x1 /* PD4 gpio Chip Enable pin pull_up */ 250 AT91_PIOD 4 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP /* PD4 gpio Chip Enable pin pull_up */
248 3 5 0x0 0x1 /* PD5 gpio RDY/BUSY pin pull_up */ 251 AT91_PIOD 5 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP /* PD5 gpio RDY/BUSY pin pull_up */
249 3 6 0x1 0x0 /* PD6 periph A Data bit 0 */ 252 AT91_PIOD 6 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD6 periph A Data bit 0 */
250 3 7 0x1 0x0 /* PD7 periph A Data bit 1 */ 253 AT91_PIOD 7 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD7 periph A Data bit 1 */
251 3 8 0x1 0x0 /* PD8 periph A Data bit 2 */ 254 AT91_PIOD 8 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD8 periph A Data bit 2 */
252 3 9 0x1 0x0 /* PD9 periph A Data bit 3 */ 255 AT91_PIOD 9 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD9 periph A Data bit 3 */
253 3 10 0x1 0x0 /* PD10 periph A Data bit 4 */ 256 AT91_PIOD 10 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD10 periph A Data bit 4 */
254 3 11 0x1 0x0 /* PD11 periph A Data bit 5 */ 257 AT91_PIOD 11 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD11 periph A Data bit 5 */
255 3 12 0x1 0x0 /* PD12 periph A Data bit 6 */ 258 AT91_PIOD 12 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD12 periph A Data bit 6 */
256 3 13 0x1 0x0>; /* PD13 periph A Data bit 7 */ 259 AT91_PIOD 13 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD13 periph A Data bit 7 */
257 }; 260 };
258 261
259 pinctrl_nand_16bits: nand_16bits-0 { 262 pinctrl_nand_16bits: nand_16bits-0 {
260 atmel,pins = 263 atmel,pins =
261 <3 14 0x1 0x0 /* PD14 periph A Data bit 8 */ 264 <AT91_PIOD 14 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD14 periph A Data bit 8 */
262 3 15 0x1 0x0 /* PD15 periph A Data bit 9 */ 265 AT91_PIOD 15 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD15 periph A Data bit 9 */
263 3 16 0x1 0x0 /* PD16 periph A Data bit 10 */ 266 AT91_PIOD 16 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD16 periph A Data bit 10 */
264 3 17 0x1 0x0 /* PD17 periph A Data bit 11 */ 267 AT91_PIOD 17 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD17 periph A Data bit 11 */
265 3 18 0x1 0x0 /* PD18 periph A Data bit 12 */ 268 AT91_PIOD 18 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD18 periph A Data bit 12 */
266 3 19 0x1 0x0 /* PD19 periph A Data bit 13 */ 269 AT91_PIOD 19 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD19 periph A Data bit 13 */
267 3 20 0x1 0x0 /* PD20 periph A Data bit 14 */ 270 AT91_PIOD 20 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD20 periph A Data bit 14 */
268 3 21 0x1 0x0>; /* PD21 periph A Data bit 15 */ 271 AT91_PIOD 21 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD21 periph A Data bit 15 */
269 }; 272 };
270 }; 273 };
271 274
272 macb0 { 275 macb0 {
273 pinctrl_macb0_rmii: macb0_rmii-0 { 276 pinctrl_macb0_rmii: macb0_rmii-0 {
274 atmel,pins = 277 atmel,pins =
275 <1 0 0x1 0x0 /* PB0 periph A */ 278 <AT91_PIOB 0 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB0 periph A */
276 1 1 0x1 0x0 /* PB1 periph A */ 279 AT91_PIOB 1 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB1 periph A */
277 1 2 0x1 0x0 /* PB2 periph A */ 280 AT91_PIOB 2 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB2 periph A */
278 1 3 0x1 0x0 /* PB3 periph A */ 281 AT91_PIOB 3 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB3 periph A */
279 1 4 0x1 0x0 /* PB4 periph A */ 282 AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB4 periph A */
280 1 5 0x1 0x0 /* PB5 periph A */ 283 AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB5 periph A */
281 1 6 0x1 0x0 /* PB6 periph A */ 284 AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB6 periph A */
282 1 7 0x1 0x0 /* PB7 periph A */ 285 AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB7 periph A */
283 1 9 0x1 0x0 /* PB9 periph A */ 286 AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB9 periph A */
284 1 10 0x1 0x0>; /* PB10 periph A */ 287 AT91_PIOB 10 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB10 periph A */
285 }; 288 };
286 289
287 pinctrl_macb0_rmii_mii: macb0_rmii_mii-0 { 290 pinctrl_macb0_rmii_mii: macb0_rmii_mii-0 {
288 atmel,pins = 291 atmel,pins =
289 <1 8 0x1 0x0 /* PB8 periph A */ 292 <AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB8 periph A */
290 1 11 0x1 0x0 /* PB11 periph A */ 293 AT91_PIOB 11 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB11 periph A */
291 1 12 0x1 0x0 /* PB12 periph A */ 294 AT91_PIOB 12 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB12 periph A */
292 1 13 0x1 0x0 /* PB13 periph A */ 295 AT91_PIOB 13 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB13 periph A */
293 1 14 0x1 0x0 /* PB14 periph A */ 296 AT91_PIOB 14 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB14 periph A */
294 1 15 0x1 0x0 /* PB15 periph A */ 297 AT91_PIOB 15 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB15 periph A */
295 1 16 0x1 0x0 /* PB16 periph A */ 298 AT91_PIOB 16 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB16 periph A */
296 1 17 0x1 0x0>; /* PB17 periph A */ 299 AT91_PIOB 17 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB17 periph A */
297 }; 300 };
298 }; 301 };
299 302
300 mmc0 { 303 mmc0 {
301 pinctrl_mmc0_slot0_clk_cmd_dat0: mmc0_slot0_clk_cmd_dat0-0 { 304 pinctrl_mmc0_slot0_clk_cmd_dat0: mmc0_slot0_clk_cmd_dat0-0 {
302 atmel,pins = 305 atmel,pins =
303 <0 17 0x1 0x0 /* PA17 periph A */ 306 <AT91_PIOA 17 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA17 periph A */
304 0 16 0x1 0x1 /* PA16 periph A with pullup */ 307 AT91_PIOA 16 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA16 periph A with pullup */
305 0 15 0x1 0x1>; /* PA15 periph A with pullup */ 308 AT91_PIOA 15 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA15 periph A with pullup */
306 }; 309 };
307 310
308 pinctrl_mmc0_slot0_dat1_3: mmc0_slot0_dat1_3-0 { 311 pinctrl_mmc0_slot0_dat1_3: mmc0_slot0_dat1_3-0 {
309 atmel,pins = 312 atmel,pins =
310 <0 18 0x1 0x1 /* PA18 periph A with pullup */ 313 <AT91_PIOA 18 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA18 periph A with pullup */
311 0 19 0x1 0x1 /* PA19 periph A with pullup */ 314 AT91_PIOA 19 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA19 periph A with pullup */
312 0 20 0x1 0x1>; /* PA20 periph A with pullup */ 315 AT91_PIOA 20 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA20 periph A with pullup */
313 }; 316 };
314 }; 317 };
315 318
316 mmc1 { 319 mmc1 {
317 pinctrl_mmc1_slot0_clk_cmd_dat0: mmc1_slot0_clk_cmd_dat0-0 { 320 pinctrl_mmc1_slot0_clk_cmd_dat0: mmc1_slot0_clk_cmd_dat0-0 {
318 atmel,pins = 321 atmel,pins =
319 <0 13 0x2 0x0 /* PA13 periph B */ 322 <AT91_PIOA 13 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA13 periph B */
320 0 12 0x2 0x1 /* PA12 periph B with pullup */ 323 AT91_PIOA 12 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA12 periph B with pullup */
321 0 11 0x2 0x1>; /* PA11 periph B with pullup */ 324 AT91_PIOA 11 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>; /* PA11 periph B with pullup */
322 }; 325 };
323 326
324 pinctrl_mmc1_slot0_dat1_3: mmc1_slot0_dat1_3-0 { 327 pinctrl_mmc1_slot0_dat1_3: mmc1_slot0_dat1_3-0 {
325 atmel,pins = 328 atmel,pins =
326 <0 2 0x2 0x1 /* PA2 periph B with pullup */ 329 <AT91_PIOA 2 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA2 periph B with pullup */
327 0 3 0x2 0x1 /* PA3 periph B with pullup */ 330 AT91_PIOA 3 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA3 periph B with pullup */
328 0 4 0x2 0x1>; /* PA4 periph B with pullup */ 331 AT91_PIOA 4 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>; /* PA4 periph B with pullup */
329 }; 332 };
330 }; 333 };
331 334
332 ssc0 { 335 ssc0 {
333 pinctrl_ssc0_tx: ssc0_tx-0 { 336 pinctrl_ssc0_tx: ssc0_tx-0 {
334 atmel,pins = 337 atmel,pins =
335 <0 24 0x2 0x0 /* PA24 periph B */ 338 <AT91_PIOA 24 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA24 periph B */
336 0 25 0x2 0x0 /* PA25 periph B */ 339 AT91_PIOA 25 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA25 periph B */
337 0 26 0x2 0x0>; /* PA26 periph B */ 340 AT91_PIOA 26 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA26 periph B */
338 }; 341 };
339 342
340 pinctrl_ssc0_rx: ssc0_rx-0 { 343 pinctrl_ssc0_rx: ssc0_rx-0 {
341 atmel,pins = 344 atmel,pins =
342 <0 27 0x2 0x0 /* PA27 periph B */ 345 <AT91_PIOA 27 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA27 periph B */
343 0 28 0x2 0x0 /* PA28 periph B */ 346 AT91_PIOA 28 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA28 periph B */
344 0 29 0x2 0x0>; /* PA29 periph B */ 347 AT91_PIOA 29 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA29 periph B */
345 }; 348 };
346 }; 349 };
347 350
348 spi0 { 351 spi0 {
349 pinctrl_spi0: spi0-0 { 352 pinctrl_spi0: spi0-0 {
350 atmel,pins = 353 atmel,pins =
351 <0 11 0x1 0x0 /* PA11 periph A SPI0_MISO pin */ 354 <AT91_PIOA 11 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA11 periph A SPI0_MISO pin */
352 0 12 0x1 0x0 /* PA12 periph A SPI0_MOSI pin */ 355 AT91_PIOA 12 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA12 periph A SPI0_MOSI pin */
353 0 13 0x1 0x0>; /* PA13 periph A SPI0_SPCK pin */ 356 AT91_PIOA 13 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA13 periph A SPI0_SPCK pin */
354 }; 357 };
355 }; 358 };
356 359
357 spi1 { 360 spi1 {
358 pinctrl_spi1: spi1-0 { 361 pinctrl_spi1: spi1-0 {
359 atmel,pins = 362 atmel,pins =
360 <0 21 0x2 0x0 /* PA21 periph B SPI1_MISO pin */ 363 <AT91_PIOA 21 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA21 periph B SPI1_MISO pin */
361 0 22 0x2 0x0 /* PA22 periph B SPI1_MOSI pin */ 364 AT91_PIOA 22 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA22 periph B SPI1_MOSI pin */
362 0 23 0x2 0x0>; /* PA23 periph B SPI1_SPCK pin */ 365 AT91_PIOA 23 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA23 periph B SPI1_SPCK pin */
363 }; 366 };
364 }; 367 };
365 368
366 i2c0 { 369 i2c0 {
367 pinctrl_i2c0: i2c0-0 { 370 pinctrl_i2c0: i2c0-0 {
368 atmel,pins = 371 atmel,pins =
369 <0 30 0x1 0x0 /* PA30 periph A I2C0 data */ 372 <AT91_PIOA 30 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA30 periph A I2C0 data */
370 0 31 0x1 0x0>; /* PA31 periph A I2C0 clock */ 373 AT91_PIOA 31 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA31 periph A I2C0 clock */
371 }; 374 };
372 }; 375 };
373 376
374 i2c1 { 377 i2c1 {
375 pinctrl_i2c1: i2c1-0 { 378 pinctrl_i2c1: i2c1-0 {
376 atmel,pins = 379 atmel,pins =
377 <2 0 0x3 0x0 /* PC0 periph C I2C1 data */ 380 <AT91_PIOC 0 AT91_PERIPH_C AT91_PINCTRL_NONE /* PC0 periph C I2C1 data */
378 2 1 0x3 0x0>; /* PC1 periph C I2C1 clock */ 381 AT91_PIOC 1 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* PC1 periph C I2C1 clock */
379 }; 382 };
380 }; 383 };
381 384
382 i2c2 { 385 i2c2 {
383 pinctrl_i2c2: i2c2-0 { 386 pinctrl_i2c2: i2c2-0 {
384 atmel,pins = 387 atmel,pins =
385 <1 4 0x2 0x0 /* PB4 periph B I2C2 data */ 388 <AT91_PIOB 4 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB4 periph B I2C2 data */
386 1 5 0x2 0x0>; /* PB5 periph B I2C2 clock */ 389 AT91_PIOB 5 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PB5 periph B I2C2 clock */
387 }; 390 };
388 }; 391 };
389 392
390 i2c_gpio0 { 393 i2c_gpio0 {
391 pinctrl_i2c_gpio0: i2c_gpio0-0 { 394 pinctrl_i2c_gpio0: i2c_gpio0-0 {
392 atmel,pins = 395 atmel,pins =
393 <0 30 0x0 0x2 /* PA30 gpio multidrive I2C0 data */ 396 <AT91_PIOA 30 AT91_PERIPH_GPIO AT91_PINCTRL_MULTI_DRIVE /* PA30 gpio multidrive I2C0 data */
394 0 31 0x0 0x2>; /* PA31 gpio multidrive I2C0 clock */ 397 AT91_PIOA 31 AT91_PERIPH_GPIO AT91_PINCTRL_MULTI_DRIVE>; /* PA31 gpio multidrive I2C0 clock */
395 }; 398 };
396 }; 399 };
397 400
398 i2c_gpio1 { 401 i2c_gpio1 {
399 pinctrl_i2c_gpio1: i2c_gpio1-0 { 402 pinctrl_i2c_gpio1: i2c_gpio1-0 {
400 atmel,pins = 403 atmel,pins =
401 <2 0 0x0 0x2 /* PC0 gpio multidrive I2C1 data */ 404 <AT91_PIOC 0 AT91_PERIPH_GPIO AT91_PINCTRL_MULTI_DRIVE /* PC0 gpio multidrive I2C1 data */
402 2 1 0x0 0x2>; /* PC1 gpio multidrive I2C1 clock */ 405 AT91_PIOC 1 AT91_PERIPH_GPIO AT91_PINCTRL_MULTI_DRIVE>; /* PC1 gpio multidrive I2C1 clock */
403 }; 406 };
404 }; 407 };
405 408
406 i2c_gpio2 { 409 i2c_gpio2 {
407 pinctrl_i2c_gpio2: i2c_gpio2-0 { 410 pinctrl_i2c_gpio2: i2c_gpio2-0 {
408 atmel,pins = 411 atmel,pins =
409 <1 4 0x0 0x2 /* PB4 gpio multidrive I2C2 data */ 412 <AT91_PIOB 4 AT91_PERIPH_GPIO AT91_PINCTRL_MULTI_DRIVE /* PB4 gpio multidrive I2C2 data */
410 1 5 0x0 0x2>; /* PB5 gpio multidrive I2C2 clock */ 413 AT91_PIOB 5 AT91_PERIPH_GPIO AT91_PINCTRL_MULTI_DRIVE>; /* PB5 gpio multidrive I2C2 clock */
411 }; 414 };
412 }; 415 };
413 416
414 pioA: gpio@fffff400 { 417 pioA: gpio@fffff400 {
415 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; 418 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
416 reg = <0xfffff400 0x200>; 419 reg = <0xfffff400 0x200>;
417 interrupts = <2 4 1>; 420 interrupts = <2 IRQ_TYPE_LEVEL_HIGH 1>;
418 #gpio-cells = <2>; 421 #gpio-cells = <2>;
419 gpio-controller; 422 gpio-controller;
420 interrupt-controller; 423 interrupt-controller;
@@ -424,7 +427,7 @@
424 pioB: gpio@fffff600 { 427 pioB: gpio@fffff600 {
425 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; 428 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
426 reg = <0xfffff600 0x200>; 429 reg = <0xfffff600 0x200>;
427 interrupts = <2 4 1>; 430 interrupts = <2 IRQ_TYPE_LEVEL_HIGH 1>;
428 #gpio-cells = <2>; 431 #gpio-cells = <2>;
429 gpio-controller; 432 gpio-controller;
430 #gpio-lines = <19>; 433 #gpio-lines = <19>;
@@ -435,7 +438,7 @@
435 pioC: gpio@fffff800 { 438 pioC: gpio@fffff800 {
436 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; 439 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
437 reg = <0xfffff800 0x200>; 440 reg = <0xfffff800 0x200>;
438 interrupts = <3 4 1>; 441 interrupts = <3 IRQ_TYPE_LEVEL_HIGH 1>;
439 #gpio-cells = <2>; 442 #gpio-cells = <2>;
440 gpio-controller; 443 gpio-controller;
441 interrupt-controller; 444 interrupt-controller;
@@ -445,7 +448,7 @@
445 pioD: gpio@fffffa00 { 448 pioD: gpio@fffffa00 {
446 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; 449 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
447 reg = <0xfffffa00 0x200>; 450 reg = <0xfffffa00 0x200>;
448 interrupts = <3 4 1>; 451 interrupts = <3 IRQ_TYPE_LEVEL_HIGH 1>;
449 #gpio-cells = <2>; 452 #gpio-cells = <2>;
450 gpio-controller; 453 gpio-controller;
451 #gpio-lines = <22>; 454 #gpio-lines = <22>;
@@ -457,7 +460,7 @@
457 ssc0: ssc@f0010000 { 460 ssc0: ssc@f0010000 {
458 compatible = "atmel,at91sam9g45-ssc"; 461 compatible = "atmel,at91sam9g45-ssc";
459 reg = <0xf0010000 0x4000>; 462 reg = <0xf0010000 0x4000>;
460 interrupts = <28 4 5>; 463 interrupts = <28 IRQ_TYPE_LEVEL_HIGH 5>;
461 pinctrl-names = "default"; 464 pinctrl-names = "default";
462 pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>; 465 pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
463 status = "disabled"; 466 status = "disabled";
@@ -466,7 +469,7 @@
466 mmc0: mmc@f0008000 { 469 mmc0: mmc@f0008000 {
467 compatible = "atmel,hsmci"; 470 compatible = "atmel,hsmci";
468 reg = <0xf0008000 0x600>; 471 reg = <0xf0008000 0x600>;
469 interrupts = <12 4 0>; 472 interrupts = <12 IRQ_TYPE_LEVEL_HIGH 0>;
470 dmas = <&dma0 1 0>; 473 dmas = <&dma0 1 0>;
471 dma-names = "rxtx"; 474 dma-names = "rxtx";
472 #address-cells = <1>; 475 #address-cells = <1>;
@@ -477,7 +480,7 @@
477 mmc1: mmc@f000c000 { 480 mmc1: mmc@f000c000 {
478 compatible = "atmel,hsmci"; 481 compatible = "atmel,hsmci";
479 reg = <0xf000c000 0x600>; 482 reg = <0xf000c000 0x600>;
480 interrupts = <26 4 0>; 483 interrupts = <26 IRQ_TYPE_LEVEL_HIGH 0>;
481 dmas = <&dma1 1 0>; 484 dmas = <&dma1 1 0>;
482 dma-names = "rxtx"; 485 dma-names = "rxtx";
483 #address-cells = <1>; 486 #address-cells = <1>;
@@ -488,7 +491,7 @@
488 dbgu: serial@fffff200 { 491 dbgu: serial@fffff200 {
489 compatible = "atmel,at91sam9260-usart"; 492 compatible = "atmel,at91sam9260-usart";
490 reg = <0xfffff200 0x200>; 493 reg = <0xfffff200 0x200>;
491 interrupts = <1 4 7>; 494 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
492 pinctrl-names = "default"; 495 pinctrl-names = "default";
493 pinctrl-0 = <&pinctrl_dbgu>; 496 pinctrl-0 = <&pinctrl_dbgu>;
494 status = "disabled"; 497 status = "disabled";
@@ -497,7 +500,7 @@
497 usart0: serial@f801c000 { 500 usart0: serial@f801c000 {
498 compatible = "atmel,at91sam9260-usart"; 501 compatible = "atmel,at91sam9260-usart";
499 reg = <0xf801c000 0x200>; 502 reg = <0xf801c000 0x200>;
500 interrupts = <5 4 5>; 503 interrupts = <5 IRQ_TYPE_LEVEL_HIGH 5>;
501 pinctrl-names = "default"; 504 pinctrl-names = "default";
502 pinctrl-0 = <&pinctrl_usart0>; 505 pinctrl-0 = <&pinctrl_usart0>;
503 status = "disabled"; 506 status = "disabled";
@@ -506,7 +509,7 @@
506 usart1: serial@f8020000 { 509 usart1: serial@f8020000 {
507 compatible = "atmel,at91sam9260-usart"; 510 compatible = "atmel,at91sam9260-usart";
508 reg = <0xf8020000 0x200>; 511 reg = <0xf8020000 0x200>;
509 interrupts = <6 4 5>; 512 interrupts = <6 IRQ_TYPE_LEVEL_HIGH 5>;
510 pinctrl-names = "default"; 513 pinctrl-names = "default";
511 pinctrl-0 = <&pinctrl_usart1>; 514 pinctrl-0 = <&pinctrl_usart1>;
512 status = "disabled"; 515 status = "disabled";
@@ -515,7 +518,7 @@
515 usart2: serial@f8024000 { 518 usart2: serial@f8024000 {
516 compatible = "atmel,at91sam9260-usart"; 519 compatible = "atmel,at91sam9260-usart";
517 reg = <0xf8024000 0x200>; 520 reg = <0xf8024000 0x200>;
518 interrupts = <7 4 5>; 521 interrupts = <7 IRQ_TYPE_LEVEL_HIGH 5>;
519 pinctrl-names = "default"; 522 pinctrl-names = "default";
520 pinctrl-0 = <&pinctrl_usart2>; 523 pinctrl-0 = <&pinctrl_usart2>;
521 status = "disabled"; 524 status = "disabled";
@@ -524,7 +527,7 @@
524 macb0: ethernet@f802c000 { 527 macb0: ethernet@f802c000 {
525 compatible = "cdns,at32ap7000-macb", "cdns,macb"; 528 compatible = "cdns,at32ap7000-macb", "cdns,macb";
526 reg = <0xf802c000 0x100>; 529 reg = <0xf802c000 0x100>;
527 interrupts = <24 4 3>; 530 interrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>;
528 pinctrl-names = "default"; 531 pinctrl-names = "default";
529 pinctrl-0 = <&pinctrl_macb0_rmii>; 532 pinctrl-0 = <&pinctrl_macb0_rmii>;
530 status = "disabled"; 533 status = "disabled";
@@ -533,14 +536,14 @@
533 macb1: ethernet@f8030000 { 536 macb1: ethernet@f8030000 {
534 compatible = "cdns,at32ap7000-macb", "cdns,macb"; 537 compatible = "cdns,at32ap7000-macb", "cdns,macb";
535 reg = <0xf8030000 0x100>; 538 reg = <0xf8030000 0x100>;
536 interrupts = <27 4 3>; 539 interrupts = <27 IRQ_TYPE_LEVEL_HIGH 3>;
537 status = "disabled"; 540 status = "disabled";
538 }; 541 };
539 542
540 i2c0: i2c@f8010000 { 543 i2c0: i2c@f8010000 {
541 compatible = "atmel,at91sam9x5-i2c"; 544 compatible = "atmel,at91sam9x5-i2c";
542 reg = <0xf8010000 0x100>; 545 reg = <0xf8010000 0x100>;
543 interrupts = <9 4 6>; 546 interrupts = <9 IRQ_TYPE_LEVEL_HIGH 6>;
544 dmas = <&dma0 1 7>, 547 dmas = <&dma0 1 7>,
545 <&dma0 1 8>; 548 <&dma0 1 8>;
546 dma-names = "tx", "rx"; 549 dma-names = "tx", "rx";
@@ -554,7 +557,7 @@
554 i2c1: i2c@f8014000 { 557 i2c1: i2c@f8014000 {
555 compatible = "atmel,at91sam9x5-i2c"; 558 compatible = "atmel,at91sam9x5-i2c";
556 reg = <0xf8014000 0x100>; 559 reg = <0xf8014000 0x100>;
557 interrupts = <10 4 6>; 560 interrupts = <10 IRQ_TYPE_LEVEL_HIGH 6>;
558 dmas = <&dma1 1 5>, 561 dmas = <&dma1 1 5>,
559 <&dma1 1 6>; 562 <&dma1 1 6>;
560 dma-names = "tx", "rx"; 563 dma-names = "tx", "rx";
@@ -568,7 +571,7 @@
568 i2c2: i2c@f8018000 { 571 i2c2: i2c@f8018000 {
569 compatible = "atmel,at91sam9x5-i2c"; 572 compatible = "atmel,at91sam9x5-i2c";
570 reg = <0xf8018000 0x100>; 573 reg = <0xf8018000 0x100>;
571 interrupts = <11 4 6>; 574 interrupts = <11 IRQ_TYPE_LEVEL_HIGH 6>;
572 dmas = <&dma0 1 9>, 575 dmas = <&dma0 1 9>,
573 <&dma0 1 10>; 576 <&dma0 1 10>;
574 dma-names = "tx", "rx"; 577 dma-names = "tx", "rx";
@@ -582,7 +585,7 @@
582 adc0: adc@f804c000 { 585 adc0: adc@f804c000 {
583 compatible = "atmel,at91sam9260-adc"; 586 compatible = "atmel,at91sam9260-adc";
584 reg = <0xf804c000 0x100>; 587 reg = <0xf804c000 0x100>;
585 interrupts = <19 4 0>; 588 interrupts = <19 IRQ_TYPE_LEVEL_HIGH 0>;
586 atmel,adc-use-external; 589 atmel,adc-use-external;
587 atmel,adc-channels-used = <0xffff>; 590 atmel,adc-channels-used = <0xffff>;
588 atmel,adc-vref = <3300>; 591 atmel,adc-vref = <3300>;
@@ -625,7 +628,7 @@
625 #size-cells = <0>; 628 #size-cells = <0>;
626 compatible = "atmel,at91rm9200-spi"; 629 compatible = "atmel,at91rm9200-spi";
627 reg = <0xf0000000 0x100>; 630 reg = <0xf0000000 0x100>;
628 interrupts = <13 4 3>; 631 interrupts = <13 IRQ_TYPE_LEVEL_HIGH 3>;
629 pinctrl-names = "default"; 632 pinctrl-names = "default";
630 pinctrl-0 = <&pinctrl_spi0>; 633 pinctrl-0 = <&pinctrl_spi0>;
631 status = "disabled"; 634 status = "disabled";
@@ -636,7 +639,7 @@
636 #size-cells = <0>; 639 #size-cells = <0>;
637 compatible = "atmel,at91rm9200-spi"; 640 compatible = "atmel,at91rm9200-spi";
638 reg = <0xf0004000 0x100>; 641 reg = <0xf0004000 0x100>;
639 interrupts = <14 4 3>; 642 interrupts = <14 IRQ_TYPE_LEVEL_HIGH 3>;
640 pinctrl-names = "default"; 643 pinctrl-names = "default";
641 pinctrl-0 = <&pinctrl_spi1>; 644 pinctrl-0 = <&pinctrl_spi1>;
642 status = "disabled"; 645 status = "disabled";
@@ -645,7 +648,7 @@
645 rtc@fffffeb0 { 648 rtc@fffffeb0 {
646 compatible = "atmel,at91rm9200-rtc"; 649 compatible = "atmel,at91rm9200-rtc";
647 reg = <0xfffffeb0 0x40>; 650 reg = <0xfffffeb0 0x40>;
648 interrupts = <1 4 7>; 651 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
649 status = "disabled"; 652 status = "disabled";
650 }; 653 };
651 }; 654 };
@@ -664,8 +667,8 @@
664 atmel,nand-cmd-offset = <22>; 667 atmel,nand-cmd-offset = <22>;
665 pinctrl-names = "default"; 668 pinctrl-names = "default";
666 pinctrl-0 = <&pinctrl_nand>; 669 pinctrl-0 = <&pinctrl_nand>;
667 gpios = <&pioD 5 0 670 gpios = <&pioD 5 GPIO_ACTIVE_HIGH
668 &pioD 4 0 671 &pioD 4 GPIO_ACTIVE_HIGH
669 0 672 0
670 >; 673 >;
671 status = "disabled"; 674 status = "disabled";
@@ -674,22 +677,22 @@
674 usb0: ohci@00600000 { 677 usb0: ohci@00600000 {
675 compatible = "atmel,at91rm9200-ohci", "usb-ohci"; 678 compatible = "atmel,at91rm9200-ohci", "usb-ohci";
676 reg = <0x00600000 0x100000>; 679 reg = <0x00600000 0x100000>;
677 interrupts = <22 4 2>; 680 interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
678 status = "disabled"; 681 status = "disabled";
679 }; 682 };
680 683
681 usb1: ehci@00700000 { 684 usb1: ehci@00700000 {
682 compatible = "atmel,at91sam9g45-ehci", "usb-ehci"; 685 compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
683 reg = <0x00700000 0x100000>; 686 reg = <0x00700000 0x100000>;
684 interrupts = <22 4 2>; 687 interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
685 status = "disabled"; 688 status = "disabled";
686 }; 689 };
687 }; 690 };
688 691
689 i2c@0 { 692 i2c@0 {
690 compatible = "i2c-gpio"; 693 compatible = "i2c-gpio";
691 gpios = <&pioA 30 0 /* sda */ 694 gpios = <&pioA 30 GPIO_ACTIVE_HIGH /* sda */
692 &pioA 31 0 /* scl */ 695 &pioA 31 GPIO_ACTIVE_HIGH /* scl */
693 >; 696 >;
694 i2c-gpio,sda-open-drain; 697 i2c-gpio,sda-open-drain;
695 i2c-gpio,scl-open-drain; 698 i2c-gpio,scl-open-drain;
@@ -703,8 +706,8 @@
703 706
704 i2c@1 { 707 i2c@1 {
705 compatible = "i2c-gpio"; 708 compatible = "i2c-gpio";
706 gpios = <&pioC 0 0 /* sda */ 709 gpios = <&pioC 0 GPIO_ACTIVE_HIGH /* sda */
707 &pioC 1 0 /* scl */ 710 &pioC 1 GPIO_ACTIVE_HIGH /* scl */
708 >; 711 >;
709 i2c-gpio,sda-open-drain; 712 i2c-gpio,sda-open-drain;
710 i2c-gpio,scl-open-drain; 713 i2c-gpio,scl-open-drain;
@@ -718,8 +721,8 @@
718 721
719 i2c@2 { 722 i2c@2 {
720 compatible = "i2c-gpio"; 723 compatible = "i2c-gpio";
721 gpios = <&pioB 4 0 /* sda */ 724 gpios = <&pioB 4 GPIO_ACTIVE_HIGH /* sda */
722 &pioB 5 0 /* scl */ 725 &pioB 5 GPIO_ACTIVE_HIGH /* scl */
723 >; 726 >;
724 i2c-gpio,sda-open-drain; 727 i2c-gpio,sda-open-drain;
725 i2c-gpio,scl-open-drain; 728 i2c-gpio,scl-open-drain;
diff --git a/arch/arm/boot/dts/at91sam9x5cm.dtsi b/arch/arm/boot/dts/at91sam9x5cm.dtsi
index 347a74a857f6..4a5ee5cc115a 100644
--- a/arch/arm/boot/dts/at91sam9x5cm.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5cm.dtsi
@@ -28,7 +28,7 @@
28 pinctrl@fffff400 { 28 pinctrl@fffff400 {
29 1wire_cm { 29 1wire_cm {
30 pinctrl_1wire_cm: 1wire_cm-0 { 30 pinctrl_1wire_cm: 1wire_cm-0 {
31 atmel,pins = <1 18 0x0 0x2>; /* PB18 multidrive, conflicts with led */ 31 atmel,pins = <AT91_PIOB 18 AT91_PERIPH_GPIO AT91_PINCTRL_MULTI_DRIVE>; /* PB18 multidrive, conflicts with led */
32 }; 32 };
33 }; 33 };
34 }; 34 };
@@ -75,19 +75,19 @@
75 75
76 pb18 { 76 pb18 {
77 label = "pb18"; 77 label = "pb18";
78 gpios = <&pioB 18 1>; 78 gpios = <&pioB 18 GPIO_ACTIVE_LOW>;
79 linux,default-trigger = "heartbeat"; 79 linux,default-trigger = "heartbeat";
80 }; 80 };
81 81
82 pd21 { 82 pd21 {
83 label = "pd21"; 83 label = "pd21";
84 gpios = <&pioD 21 0>; 84 gpios = <&pioD 21 GPIO_ACTIVE_HIGH>;
85 }; 85 };
86 }; 86 };
87 87
88 1wire_cm { 88 1wire_cm {
89 compatible = "w1-gpio"; 89 compatible = "w1-gpio";
90 gpios = <&pioB 18 0>; 90 gpios = <&pioB 18 GPIO_ACTIVE_HIGH>;
91 linux,open-drain; 91 linux,open-drain;
92 pinctrl-names = "default"; 92 pinctrl-names = "default";
93 pinctrl-0 = <&pinctrl_1wire_cm>; 93 pinctrl-0 = <&pinctrl_1wire_cm>;
diff --git a/arch/arm/boot/dts/at91sam9x5ek.dtsi b/arch/arm/boot/dts/at91sam9x5ek.dtsi
index 1fa48d2bfd80..19c8ebb303f4 100644
--- a/arch/arm/boot/dts/at91sam9x5ek.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5ek.dtsi
@@ -6,7 +6,7 @@
6 * 6 *
7 * Licensed under GPLv2 or later. 7 * Licensed under GPLv2 or later.
8 */ 8 */
9/include/ "at91sam9x5cm.dtsi" 9#include "at91sam9x5cm.dtsi"
10 10
11/ { 11/ {
12 model = "Atmel AT91SAM9X5-EK"; 12 model = "Atmel AT91SAM9X5-EK";
@@ -27,7 +27,7 @@
27 slot@0 { 27 slot@0 {
28 reg = <0>; 28 reg = <0>;
29 bus-width = <4>; 29 bus-width = <4>;
30 cd-gpios = <&pioD 15 0>; 30 cd-gpios = <&pioD 15 GPIO_ACTIVE_HIGH>;
31 }; 31 };
32 }; 32 };
33 33
@@ -40,7 +40,7 @@
40 slot@0 { 40 slot@0 {
41 reg = <0>; 41 reg = <0>;
42 bus-width = <4>; 42 bus-width = <4>;
43 cd-gpios = <&pioD 14 0>; 43 cd-gpios = <&pioD 14 GPIO_ACTIVE_HIGH>;
44 }; 44 };
45 }; 45 };
46 46
@@ -60,14 +60,14 @@
60 mmc0 { 60 mmc0 {
61 pinctrl_board_mmc0: mmc0-board { 61 pinctrl_board_mmc0: mmc0-board {
62 atmel,pins = 62 atmel,pins =
63 <3 15 0x0 0x5>; /* PD15 gpio CD pin pull up and deglitch */ 63 <AT91_PIOD 15 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PD15 gpio CD pin pull up and deglitch */
64 }; 64 };
65 }; 65 };
66 66
67 mmc1 { 67 mmc1 {
68 pinctrl_board_mmc1: mmc1-board { 68 pinctrl_board_mmc1: mmc1-board {
69 atmel,pins = 69 atmel,pins =
70 <3 14 0x0 0x5>; /* PD14 gpio CD pin pull up and deglitch */ 70 <AT91_PIOD 14 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PD14 gpio CD pin pull up and deglitch */
71 }; 71 };
72 }; 72 };
73 }; 73 };
@@ -86,8 +86,8 @@
86 usb0: ohci@00600000 { 86 usb0: ohci@00600000 {
87 status = "okay"; 87 status = "okay";
88 num-ports = <2>; 88 num-ports = <2>;
89 atmel,vbus-gpio = <&pioD 19 1 89 atmel,vbus-gpio = <&pioD 19 GPIO_ACTIVE_LOW
90 &pioD 20 1 90 &pioD 20 GPIO_ACTIVE_LOW
91 >; 91 >;
92 }; 92 };
93 93
diff --git a/arch/arm/boot/dts/ethernut5.dts b/arch/arm/boot/dts/ethernut5.dts
index 1ea9d34460a4..143b6d25bc80 100644
--- a/arch/arm/boot/dts/ethernut5.dts
+++ b/arch/arm/boot/dts/ethernut5.dts
@@ -6,7 +6,7 @@
6 * Licensed under GPLv2. 6 * Licensed under GPLv2.
7 */ 7 */
8/dts-v1/; 8/dts-v1/;
9/include/ "at91sam9260.dtsi" 9#include "at91sam9260.dtsi"
10 10
11/ { 11/ {
12 model = "Ethernut 5"; 12 model = "Ethernut 5";
@@ -40,7 +40,7 @@
40 }; 40 };
41 41
42 usb1: gadget@fffa4000 { 42 usb1: gadget@fffa4000 {
43 atmel,vbus-gpio = <&pioC 5 0>; 43 atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>;
44 status = "okay"; 44 status = "okay";
45 }; 45 };
46 }; 46 };
@@ -52,7 +52,7 @@
52 status = "okay"; 52 status = "okay";
53 53
54 gpios = <0 54 gpios = <0
55 &pioC 14 0 55 &pioC 14 GPIO_ACTIVE_HIGH
56 0 56 0
57 >; 57 >;
58 58
diff --git a/arch/arm/boot/dts/evk-pro3.dts b/arch/arm/boot/dts/evk-pro3.dts
index 96e50f569433..4d829685fdfb 100644
--- a/arch/arm/boot/dts/evk-pro3.dts
+++ b/arch/arm/boot/dts/evk-pro3.dts
@@ -9,7 +9,7 @@
9 9
10/dts-v1/; 10/dts-v1/;
11 11
12/include/ "ge863-pro3.dtsi" 12#include "ge863-pro3.dtsi"
13 13
14/ { 14/ {
15 model = "Telit EVK-PRO3 for Telit GE863-PRO3"; 15 model = "Telit EVK-PRO3 for Telit GE863-PRO3";
@@ -31,7 +31,7 @@
31 }; 31 };
32 32
33 usb1: gadget@fffa4000 { 33 usb1: gadget@fffa4000 {
34 atmel,vbus-gpio = <&pioC 5 0>; 34 atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>;
35 status = "okay"; 35 status = "okay";
36 }; 36 };
37 37
@@ -50,4 +50,4 @@
50 status = "okay"; 50 status = "okay";
51 }; 51 };
52 52
53}; \ No newline at end of file 53};
diff --git a/arch/arm/boot/dts/ge863-pro3.dtsi b/arch/arm/boot/dts/ge863-pro3.dtsi
index 17136fc7a516..230099bb31c8 100644
--- a/arch/arm/boot/dts/ge863-pro3.dtsi
+++ b/arch/arm/boot/dts/ge863-pro3.dtsi
@@ -7,7 +7,7 @@
7 * Licensed under GPLv2 or later. 7 * Licensed under GPLv2 or later.
8 */ 8 */
9 9
10/include/ "at91sam9260.dtsi" 10#include "at91sam9260.dtsi"
11 11
12/ { 12/ {
13 clocks { 13 clocks {
diff --git a/arch/arm/boot/dts/kizbox.dts b/arch/arm/boot/dts/kizbox.dts
index b4dc3ed9a3ec..02df1914a47c 100644
--- a/arch/arm/boot/dts/kizbox.dts
+++ b/arch/arm/boot/dts/kizbox.dts
@@ -6,7 +6,7 @@
6 * Licensed under GPLv2. 6 * Licensed under GPLv2.
7 */ 7 */
8/dts-v1/; 8/dts-v1/;
9/include/ "at91sam9g20.dtsi" 9#include "at91sam9g20.dtsi"
10 10
11/ { 11/ {
12 12
@@ -94,26 +94,26 @@
94 94
95 led1g { 95 led1g {
96 label = "led1:green"; 96 label = "led1:green";
97 gpios = <&pioB 0 1>; 97 gpios = <&pioB 0 GPIO_ACTIVE_LOW>;
98 linux,default-trigger = "none"; 98 linux,default-trigger = "none";
99 }; 99 };
100 100
101 led1r { 101 led1r {
102 label = "led1:red"; 102 label = "led1:red";
103 gpios = <&pioB 1 1>; 103 gpios = <&pioB 1 GPIO_ACTIVE_LOW>;
104 linux,default-trigger = "none"; 104 linux,default-trigger = "none";
105 }; 105 };
106 106
107 led2g { 107 led2g {
108 label = "led2:green"; 108 label = "led2:green";
109 gpios = <&pioB 2 1>; 109 gpios = <&pioB 2 GPIO_ACTIVE_LOW>;
110 linux,default-trigger = "none"; 110 linux,default-trigger = "none";
111 default-state = "on"; 111 default-state = "on";
112 }; 112 };
113 113
114 led2r { 114 led2r {
115 label = "led2:red"; 115 label = "led2:red";
116 gpios = <&pioB 3 1>; 116 gpios = <&pioB 3 GPIO_ACTIVE_LOW>;
117 linux,default-trigger = "none"; 117 linux,default-trigger = "none";
118 }; 118 };
119 }; 119 };
@@ -125,16 +125,16 @@
125 125
126 reset { 126 reset {
127 label = "reset"; 127 label = "reset";
128 gpios = <&pioB 30 1>; 128 gpios = <&pioB 30 GPIO_ACTIVE_LOW>;
129 linux,code = <0x100>; 129 linux,code = <0x100>;
130 gpio-key,wakeup; 130 gpio-key,wakeup;
131 }; 131 };
132 132
133 mode { 133 mode {
134 label = "mode"; 134 label = "mode";
135 gpios = <&pioB 31 1>; 135 gpios = <&pioB 31 GPIO_ACTIVE_LOW>;
136 linux,code = <0x101>; 136 linux,code = <0x101>;
137 gpio-key,wakeup; 137 gpio-key,wakeup;
138 }; 138 };
139 }; 139 };
140}; \ No newline at end of file 140};
diff --git a/arch/arm/boot/dts/mpa1600.dts b/arch/arm/boot/dts/mpa1600.dts
index 317300875f34..ccf9ea242f72 100644
--- a/arch/arm/boot/dts/mpa1600.dts
+++ b/arch/arm/boot/dts/mpa1600.dts
@@ -6,7 +6,7 @@
6 * Licensed under GPLv2 only 6 * Licensed under GPLv2 only
7 */ 7 */
8/dts-v1/; 8/dts-v1/;
9/include/ "at91rm9200.dtsi" 9#include "at91rm9200.dtsi"
10 10
11/ { 11/ {
12 model = "Phontech MPA 1600"; 12 model = "Phontech MPA 1600";
@@ -62,7 +62,7 @@
62 62
63 monitor_mute { 63 monitor_mute {
64 label = "Monitor mute"; 64 label = "Monitor mute";
65 gpios = <&pioC 1 1>; 65 gpios = <&pioC 1 GPIO_ACTIVE_LOW>;
66 linux,code = <113>; 66 linux,code = <113>;
67 }; 67 };
68 }; 68 };
diff --git a/arch/arm/boot/dts/pm9g45.dts b/arch/arm/boot/dts/pm9g45.dts
index 387fedb58988..33ffabe9c4c8 100644
--- a/arch/arm/boot/dts/pm9g45.dts
+++ b/arch/arm/boot/dts/pm9g45.dts
@@ -6,7 +6,7 @@
6 * Licensed under GPLv2. 6 * Licensed under GPLv2.
7 */ 7 */
8/dts-v1/; 8/dts-v1/;
9/include/ "at91sam9g45.dtsi" 9#include "at91sam9g45.dtsi"
10 10
11/ { 11/ {
12 model = "Ronetix pm9g45"; 12 model = "Ronetix pm9g45";
@@ -42,15 +42,15 @@
42 board { 42 board {
43 pinctrl_board_nand: nand0-board { 43 pinctrl_board_nand: nand0-board {
44 atmel,pins = 44 atmel,pins =
45 <3 3 0x0 0x1 /* PD3 gpio RDY pin pull_up*/ 45 <AT91_PIOD 3 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP /* PD3 gpio RDY pin pull_up*/
46 2 14 0x0 0x1>; /* PC14 gpio enable pin pull_up */ 46 AT91_PIOC 14 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; /* PC14 gpio enable pin pull_up */
47 }; 47 };
48 }; 48 };
49 49
50 mmc { 50 mmc {
51 pinctrl_board_mmc: mmc0-board { 51 pinctrl_board_mmc: mmc0-board {
52 atmel,pins = 52 atmel,pins =
53 <3 6 0x0 0x5>; /* PD6 gpio CD pin pull_up and deglitch */ 53 <AT91_PIOD 6 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PD6 gpio CD pin pull_up and deglitch */
54 }; 54 };
55 }; 55 };
56 }; 56 };
@@ -64,7 +64,7 @@
64 slot@0 { 64 slot@0 {
65 reg = <0>; 65 reg = <0>;
66 bus-width = <4>; 66 bus-width = <4>;
67 cd-gpios = <&pioD 6 0>; 67 cd-gpios = <&pioD 6 GPIO_ACTIVE_HIGH>;
68 }; 68 };
69 }; 69 };
70 70
@@ -81,8 +81,8 @@
81 nand-on-flash-bbt; 81 nand-on-flash-bbt;
82 pinctrl-0 = <&pinctrl_board_nand>; 82 pinctrl-0 = <&pinctrl_board_nand>;
83 83
84 gpios = <&pioD 3 0 84 gpios = <&pioD 3 GPIO_ACTIVE_HIGH
85 &pioC 14 0 85 &pioC 14 GPIO_ACTIVE_HIGH
86 0 86 0
87 >; 87 >;
88 88
@@ -134,13 +134,13 @@
134 134
135 led0 { 135 led0 {
136 label = "led0"; 136 label = "led0";
137 gpios = <&pioD 0 1>; 137 gpios = <&pioD 0 GPIO_ACTIVE_LOW>;
138 linux,default-trigger = "nand-disk"; 138 linux,default-trigger = "nand-disk";
139 }; 139 };
140 140
141 led1 { 141 led1 {
142 label = "led1"; 142 label = "led1";
143 gpios = <&pioD 31 0>; 143 gpios = <&pioD 31 GPIO_ACTIVE_HIGH>;
144 linux,default-trigger = "heartbeat"; 144 linux,default-trigger = "heartbeat";
145 }; 145 };
146 }; 146 };
@@ -152,13 +152,13 @@
152 152
153 right { 153 right {
154 label = "SW4"; 154 label = "SW4";
155 gpios = <&pioE 7 1>; 155 gpios = <&pioE 7 GPIO_ACTIVE_LOW>;
156 linux,code = <106>; 156 linux,code = <106>;
157 }; 157 };
158 158
159 up { 159 up {
160 label = "SW3"; 160 label = "SW3";
161 gpios = <&pioE 8 1>; 161 gpios = <&pioE 8 GPIO_ACTIVE_LOW>;
162 linux,code = <103>; 162 linux,code = <103>;
163 }; 163 };
164 }; 164 };
diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index 5000e0d42849..d5922935523f 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -8,7 +8,10 @@
8 * Licensed under GPLv2 or later. 8 * Licensed under GPLv2 or later.
9 */ 9 */
10 10
11/include/ "skeleton.dtsi" 11#include "skeleton.dtsi"
12#include <dt-bindings/pinctrl/at91.h>
13#include <dt-bindings/interrupt-controller/irq.h>
14#include <dt-bindings/gpio/gpio.h>
12 15
13/ { 16/ {
14 model = "Atmel SAMA5D3 family SoC"; 17 model = "Atmel SAMA5D3 family SoC";
@@ -59,7 +62,7 @@
59 mmc0: mmc@f0000000 { 62 mmc0: mmc@f0000000 {
60 compatible = "atmel,hsmci"; 63 compatible = "atmel,hsmci";
61 reg = <0xf0000000 0x600>; 64 reg = <0xf0000000 0x600>;
62 interrupts = <21 4 0>; 65 interrupts = <21 IRQ_TYPE_LEVEL_HIGH 0>;
63 dmas = <&dma0 2 0>; 66 dmas = <&dma0 2 0>;
64 dma-names = "rxtx"; 67 dma-names = "rxtx";
65 pinctrl-names = "default"; 68 pinctrl-names = "default";
@@ -74,7 +77,7 @@
74 #size-cells = <0>; 77 #size-cells = <0>;
75 compatible = "atmel,at91sam9x5-spi"; 78 compatible = "atmel,at91sam9x5-spi";
76 reg = <0xf0004000 0x100>; 79 reg = <0xf0004000 0x100>;
77 interrupts = <24 4 3>; 80 interrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>;
78 pinctrl-names = "default"; 81 pinctrl-names = "default";
79 pinctrl-0 = <&pinctrl_spi0>; 82 pinctrl-0 = <&pinctrl_spi0>;
80 status = "disabled"; 83 status = "disabled";
@@ -83,7 +86,7 @@
83 ssc0: ssc@f0008000 { 86 ssc0: ssc@f0008000 {
84 compatible = "atmel,at91sam9g45-ssc"; 87 compatible = "atmel,at91sam9g45-ssc";
85 reg = <0xf0008000 0x4000>; 88 reg = <0xf0008000 0x4000>;
86 interrupts = <38 4 4>; 89 interrupts = <38 IRQ_TYPE_LEVEL_HIGH 4>;
87 pinctrl-names = "default"; 90 pinctrl-names = "default";
88 pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>; 91 pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
89 status = "disabled"; 92 status = "disabled";
@@ -92,7 +95,7 @@
92 can0: can@f000c000 { 95 can0: can@f000c000 {
93 compatible = "atmel,at91sam9x5-can"; 96 compatible = "atmel,at91sam9x5-can";
94 reg = <0xf000c000 0x300>; 97 reg = <0xf000c000 0x300>;
95 interrupts = <40 4 3>; 98 interrupts = <40 IRQ_TYPE_LEVEL_HIGH 3>;
96 pinctrl-names = "default"; 99 pinctrl-names = "default";
97 pinctrl-0 = <&pinctrl_can0_rx_tx>; 100 pinctrl-0 = <&pinctrl_can0_rx_tx>;
98 status = "disabled"; 101 status = "disabled";
@@ -101,13 +104,13 @@
101 tcb0: timer@f0010000 { 104 tcb0: timer@f0010000 {
102 compatible = "atmel,at91sam9x5-tcb"; 105 compatible = "atmel,at91sam9x5-tcb";
103 reg = <0xf0010000 0x100>; 106 reg = <0xf0010000 0x100>;
104 interrupts = <26 4 0>; 107 interrupts = <26 IRQ_TYPE_LEVEL_HIGH 0>;
105 }; 108 };
106 109
107 i2c0: i2c@f0014000 { 110 i2c0: i2c@f0014000 {
108 compatible = "atmel,at91sam9x5-i2c"; 111 compatible = "atmel,at91sam9x5-i2c";
109 reg = <0xf0014000 0x4000>; 112 reg = <0xf0014000 0x4000>;
110 interrupts = <18 4 6>; 113 interrupts = <18 IRQ_TYPE_LEVEL_HIGH 6>;
111 dmas = <&dma0 2 7>, 114 dmas = <&dma0 2 7>,
112 <&dma0 2 8>; 115 <&dma0 2 8>;
113 dma-names = "tx", "rx"; 116 dma-names = "tx", "rx";
@@ -121,7 +124,7 @@
121 i2c1: i2c@f0018000 { 124 i2c1: i2c@f0018000 {
122 compatible = "atmel,at91sam9x5-i2c"; 125 compatible = "atmel,at91sam9x5-i2c";
123 reg = <0xf0018000 0x4000>; 126 reg = <0xf0018000 0x4000>;
124 interrupts = <19 4 6>; 127 interrupts = <19 IRQ_TYPE_LEVEL_HIGH 6>;
125 dmas = <&dma0 2 9>, 128 dmas = <&dma0 2 9>,
126 <&dma0 2 10>; 129 <&dma0 2 10>;
127 dma-names = "tx", "rx"; 130 dma-names = "tx", "rx";
@@ -135,7 +138,7 @@
135 usart0: serial@f001c000 { 138 usart0: serial@f001c000 {
136 compatible = "atmel,at91sam9260-usart"; 139 compatible = "atmel,at91sam9260-usart";
137 reg = <0xf001c000 0x100>; 140 reg = <0xf001c000 0x100>;
138 interrupts = <12 4 5>; 141 interrupts = <12 IRQ_TYPE_LEVEL_HIGH 5>;
139 pinctrl-names = "default"; 142 pinctrl-names = "default";
140 pinctrl-0 = <&pinctrl_usart0>; 143 pinctrl-0 = <&pinctrl_usart0>;
141 status = "disabled"; 144 status = "disabled";
@@ -144,7 +147,7 @@
144 usart1: serial@f0020000 { 147 usart1: serial@f0020000 {
145 compatible = "atmel,at91sam9260-usart"; 148 compatible = "atmel,at91sam9260-usart";
146 reg = <0xf0020000 0x100>; 149 reg = <0xf0020000 0x100>;
147 interrupts = <13 4 5>; 150 interrupts = <13 IRQ_TYPE_LEVEL_HIGH 5>;
148 pinctrl-names = "default"; 151 pinctrl-names = "default";
149 pinctrl-0 = <&pinctrl_usart1>; 152 pinctrl-0 = <&pinctrl_usart1>;
150 status = "disabled"; 153 status = "disabled";
@@ -153,7 +156,7 @@
153 macb0: ethernet@f0028000 { 156 macb0: ethernet@f0028000 {
154 compatible = "cdns,pc302-gem", "cdns,gem"; 157 compatible = "cdns,pc302-gem", "cdns,gem";
155 reg = <0xf0028000 0x100>; 158 reg = <0xf0028000 0x100>;
156 interrupts = <34 4 3>; 159 interrupts = <34 IRQ_TYPE_LEVEL_HIGH 3>;
157 pinctrl-names = "default"; 160 pinctrl-names = "default";
158 pinctrl-0 = <&pinctrl_macb0_data_rgmii &pinctrl_macb0_signal_rgmii>; 161 pinctrl-0 = <&pinctrl_macb0_data_rgmii &pinctrl_macb0_signal_rgmii>;
159 status = "disabled"; 162 status = "disabled";
@@ -162,14 +165,14 @@
162 isi: isi@f0034000 { 165 isi: isi@f0034000 {
163 compatible = "atmel,at91sam9g45-isi"; 166 compatible = "atmel,at91sam9g45-isi";
164 reg = <0xf0034000 0x4000>; 167 reg = <0xf0034000 0x4000>;
165 interrupts = <37 4 5>; 168 interrupts = <37 IRQ_TYPE_LEVEL_HIGH 5>;
166 status = "disabled"; 169 status = "disabled";
167 }; 170 };
168 171
169 mmc1: mmc@f8000000 { 172 mmc1: mmc@f8000000 {
170 compatible = "atmel,hsmci"; 173 compatible = "atmel,hsmci";
171 reg = <0xf8000000 0x600>; 174 reg = <0xf8000000 0x600>;
172 interrupts = <22 4 0>; 175 interrupts = <22 IRQ_TYPE_LEVEL_HIGH 0>;
173 dmas = <&dma1 2 0>; 176 dmas = <&dma1 2 0>;
174 dma-names = "rxtx"; 177 dma-names = "rxtx";
175 pinctrl-names = "default"; 178 pinctrl-names = "default";
@@ -182,7 +185,7 @@
182 mmc2: mmc@f8004000 { 185 mmc2: mmc@f8004000 {
183 compatible = "atmel,hsmci"; 186 compatible = "atmel,hsmci";
184 reg = <0xf8004000 0x600>; 187 reg = <0xf8004000 0x600>;
185 interrupts = <23 4 0>; 188 interrupts = <23 IRQ_TYPE_LEVEL_HIGH 0>;
186 dmas = <&dma1 2 1>; 189 dmas = <&dma1 2 1>;
187 dma-names = "rxtx"; 190 dma-names = "rxtx";
188 pinctrl-names = "default"; 191 pinctrl-names = "default";
@@ -197,7 +200,7 @@
197 #size-cells = <0>; 200 #size-cells = <0>;
198 compatible = "atmel,at91sam9x5-spi"; 201 compatible = "atmel,at91sam9x5-spi";
199 reg = <0xf8008000 0x100>; 202 reg = <0xf8008000 0x100>;
200 interrupts = <25 4 3>; 203 interrupts = <25 IRQ_TYPE_LEVEL_HIGH 3>;
201 pinctrl-names = "default"; 204 pinctrl-names = "default";
202 pinctrl-0 = <&pinctrl_spi1>; 205 pinctrl-0 = <&pinctrl_spi1>;
203 status = "disabled"; 206 status = "disabled";
@@ -206,7 +209,7 @@
206 ssc1: ssc@f800c000 { 209 ssc1: ssc@f800c000 {
207 compatible = "atmel,at91sam9g45-ssc"; 210 compatible = "atmel,at91sam9g45-ssc";
208 reg = <0xf800c000 0x4000>; 211 reg = <0xf800c000 0x4000>;
209 interrupts = <39 4 4>; 212 interrupts = <39 IRQ_TYPE_LEVEL_HIGH 4>;
210 pinctrl-names = "default"; 213 pinctrl-names = "default";
211 pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>; 214 pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>;
212 status = "disabled"; 215 status = "disabled";
@@ -215,7 +218,7 @@
215 can1: can@f8010000 { 218 can1: can@f8010000 {
216 compatible = "atmel,at91sam9x5-can"; 219 compatible = "atmel,at91sam9x5-can";
217 reg = <0xf8010000 0x300>; 220 reg = <0xf8010000 0x300>;
218 interrupts = <41 4 3>; 221 interrupts = <41 IRQ_TYPE_LEVEL_HIGH 3>;
219 pinctrl-names = "default"; 222 pinctrl-names = "default";
220 pinctrl-0 = <&pinctrl_can1_rx_tx>; 223 pinctrl-0 = <&pinctrl_can1_rx_tx>;
221 }; 224 };
@@ -223,13 +226,13 @@
223 tcb1: timer@f8014000 { 226 tcb1: timer@f8014000 {
224 compatible = "atmel,at91sam9x5-tcb"; 227 compatible = "atmel,at91sam9x5-tcb";
225 reg = <0xf8014000 0x100>; 228 reg = <0xf8014000 0x100>;
226 interrupts = <27 4 0>; 229 interrupts = <27 IRQ_TYPE_LEVEL_HIGH 0>;
227 }; 230 };
228 231
229 adc0: adc@f8018000 { 232 adc0: adc@f8018000 {
230 compatible = "atmel,at91sam9260-adc"; 233 compatible = "atmel,at91sam9260-adc";
231 reg = <0xf8018000 0x100>; 234 reg = <0xf8018000 0x100>;
232 interrupts = <29 4 5>; 235 interrupts = <29 IRQ_TYPE_LEVEL_HIGH 5>;
233 pinctrl-names = "default"; 236 pinctrl-names = "default";
234 pinctrl-0 = < 237 pinctrl-0 = <
235 &pinctrl_adc0_adtrg 238 &pinctrl_adc0_adtrg
@@ -283,7 +286,7 @@
283 tsadcc: tsadcc@f8018000 { 286 tsadcc: tsadcc@f8018000 {
284 compatible = "atmel,at91sam9x5-tsadcc"; 287 compatible = "atmel,at91sam9x5-tsadcc";
285 reg = <0xf8018000 0x4000>; 288 reg = <0xf8018000 0x4000>;
286 interrupts = <29 4 5>; 289 interrupts = <29 IRQ_TYPE_LEVEL_HIGH 5>;
287 atmel,tsadcc_clock = <300000>; 290 atmel,tsadcc_clock = <300000>;
288 atmel,filtering_average = <0x03>; 291 atmel,filtering_average = <0x03>;
289 atmel,pendet_debounce = <0x08>; 292 atmel,pendet_debounce = <0x08>;
@@ -295,7 +298,7 @@
295 i2c2: i2c@f801c000 { 298 i2c2: i2c@f801c000 {
296 compatible = "atmel,at91sam9x5-i2c"; 299 compatible = "atmel,at91sam9x5-i2c";
297 reg = <0xf801c000 0x4000>; 300 reg = <0xf801c000 0x4000>;
298 interrupts = <20 4 6>; 301 interrupts = <20 IRQ_TYPE_LEVEL_HIGH 6>;
299 dmas = <&dma1 2 11>, 302 dmas = <&dma1 2 11>,
300 <&dma1 2 12>; 303 <&dma1 2 12>;
301 dma-names = "tx", "rx"; 304 dma-names = "tx", "rx";
@@ -307,7 +310,7 @@
307 usart2: serial@f8020000 { 310 usart2: serial@f8020000 {
308 compatible = "atmel,at91sam9260-usart"; 311 compatible = "atmel,at91sam9260-usart";
309 reg = <0xf8020000 0x100>; 312 reg = <0xf8020000 0x100>;
310 interrupts = <14 4 5>; 313 interrupts = <14 IRQ_TYPE_LEVEL_HIGH 5>;
311 pinctrl-names = "default"; 314 pinctrl-names = "default";
312 pinctrl-0 = <&pinctrl_usart2>; 315 pinctrl-0 = <&pinctrl_usart2>;
313 status = "disabled"; 316 status = "disabled";
@@ -316,7 +319,7 @@
316 usart3: serial@f8024000 { 319 usart3: serial@f8024000 {
317 compatible = "atmel,at91sam9260-usart"; 320 compatible = "atmel,at91sam9260-usart";
318 reg = <0xf8024000 0x100>; 321 reg = <0xf8024000 0x100>;
319 interrupts = <15 4 5>; 322 interrupts = <15 IRQ_TYPE_LEVEL_HIGH 5>;
320 pinctrl-names = "default"; 323 pinctrl-names = "default";
321 pinctrl-0 = <&pinctrl_usart3>; 324 pinctrl-0 = <&pinctrl_usart3>;
322 status = "disabled"; 325 status = "disabled";
@@ -325,7 +328,7 @@
325 macb1: ethernet@f802c000 { 328 macb1: ethernet@f802c000 {
326 compatible = "cdns,at32ap7000-macb", "cdns,macb"; 329 compatible = "cdns,at32ap7000-macb", "cdns,macb";
327 reg = <0xf802c000 0x100>; 330 reg = <0xf802c000 0x100>;
328 interrupts = <35 4 3>; 331 interrupts = <35 IRQ_TYPE_LEVEL_HIGH 3>;
329 pinctrl-names = "default"; 332 pinctrl-names = "default";
330 pinctrl-0 = <&pinctrl_macb1_rmii>; 333 pinctrl-0 = <&pinctrl_macb1_rmii>;
331 status = "disabled"; 334 status = "disabled";
@@ -334,7 +337,7 @@
334 sha@f8034000 { 337 sha@f8034000 {
335 compatible = "atmel,sam9g46-sha"; 338 compatible = "atmel,sam9g46-sha";
336 reg = <0xf8034000 0x100>; 339 reg = <0xf8034000 0x100>;
337 interrupts = <42 4 0>; 340 interrupts = <42 IRQ_TYPE_LEVEL_HIGH 0>;
338 }; 341 };
339 342
340 aes@f8038000 { 343 aes@f8038000 {
@@ -346,20 +349,20 @@
346 tdes@f803c000 { 349 tdes@f803c000 {
347 compatible = "atmel,sam9g46-tdes"; 350 compatible = "atmel,sam9g46-tdes";
348 reg = <0xf803c000 0x100>; 351 reg = <0xf803c000 0x100>;
349 interrupts = <44 4 0>; 352 interrupts = <44 IRQ_TYPE_LEVEL_HIGH 0>;
350 }; 353 };
351 354
352 dma0: dma-controller@ffffe600 { 355 dma0: dma-controller@ffffe600 {
353 compatible = "atmel,at91sam9g45-dma"; 356 compatible = "atmel,at91sam9g45-dma";
354 reg = <0xffffe600 0x200>; 357 reg = <0xffffe600 0x200>;
355 interrupts = <30 4 0>; 358 interrupts = <30 IRQ_TYPE_LEVEL_HIGH 0>;
356 #dma-cells = <2>; 359 #dma-cells = <2>;
357 }; 360 };
358 361
359 dma1: dma-controller@ffffe800 { 362 dma1: dma-controller@ffffe800 {
360 compatible = "atmel,at91sam9g45-dma"; 363 compatible = "atmel,at91sam9g45-dma";
361 reg = <0xffffe800 0x200>; 364 reg = <0xffffe800 0x200>;
362 interrupts = <31 4 0>; 365 interrupts = <31 IRQ_TYPE_LEVEL_HIGH 0>;
363 #dma-cells = <2>; 366 #dma-cells = <2>;
364 }; 367 };
365 368
@@ -371,7 +374,7 @@
371 dbgu: serial@ffffee00 { 374 dbgu: serial@ffffee00 {
372 compatible = "atmel,at91sam9260-usart"; 375 compatible = "atmel,at91sam9260-usart";
373 reg = <0xffffee00 0x200>; 376 reg = <0xffffee00 0x200>;
374 interrupts = <2 4 7>; 377 interrupts = <2 IRQ_TYPE_LEVEL_HIGH 7>;
375 pinctrl-names = "default"; 378 pinctrl-names = "default";
376 pinctrl-0 = <&pinctrl_dbgu>; 379 pinctrl-0 = <&pinctrl_dbgu>;
377 status = "disabled"; 380 status = "disabled";
@@ -403,202 +406,202 @@
403 adc0 { 406 adc0 {
404 pinctrl_adc0_adtrg: adc0_adtrg { 407 pinctrl_adc0_adtrg: adc0_adtrg {
405 atmel,pins = 408 atmel,pins =
406 <3 19 0x1 0x0>; /* PD19 periph A ADTRG */ 409 <AT91_PIOD 19 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD19 periph A ADTRG */
407 }; 410 };
408 pinctrl_adc0_ad0: adc0_ad0 { 411 pinctrl_adc0_ad0: adc0_ad0 {
409 atmel,pins = 412 atmel,pins =
410 <3 20 0x1 0x0>; /* PD20 periph A AD0 */ 413 <AT91_PIOD 20 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD20 periph A AD0 */
411 }; 414 };
412 pinctrl_adc0_ad1: adc0_ad1 { 415 pinctrl_adc0_ad1: adc0_ad1 {
413 atmel,pins = 416 atmel,pins =
414 <3 21 0x1 0x0>; /* PD21 periph A AD1 */ 417 <AT91_PIOD 21 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD21 periph A AD1 */
415 }; 418 };
416 pinctrl_adc0_ad2: adc0_ad2 { 419 pinctrl_adc0_ad2: adc0_ad2 {
417 atmel,pins = 420 atmel,pins =
418 <3 22 0x1 0x0>; /* PD22 periph A AD2 */ 421 <AT91_PIOD 22 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD22 periph A AD2 */
419 }; 422 };
420 pinctrl_adc0_ad3: adc0_ad3 { 423 pinctrl_adc0_ad3: adc0_ad3 {
421 atmel,pins = 424 atmel,pins =
422 <3 23 0x1 0x0>; /* PD23 periph A AD3 */ 425 <AT91_PIOD 23 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD23 periph A AD3 */
423 }; 426 };
424 pinctrl_adc0_ad4: adc0_ad4 { 427 pinctrl_adc0_ad4: adc0_ad4 {
425 atmel,pins = 428 atmel,pins =
426 <3 24 0x1 0x0>; /* PD24 periph A AD4 */ 429 <AT91_PIOD 24 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD24 periph A AD4 */
427 }; 430 };
428 pinctrl_adc0_ad5: adc0_ad5 { 431 pinctrl_adc0_ad5: adc0_ad5 {
429 atmel,pins = 432 atmel,pins =
430 <3 25 0x1 0x0>; /* PD25 periph A AD5 */ 433 <AT91_PIOD 25 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD25 periph A AD5 */
431 }; 434 };
432 pinctrl_adc0_ad6: adc0_ad6 { 435 pinctrl_adc0_ad6: adc0_ad6 {
433 atmel,pins = 436 atmel,pins =
434 <3 26 0x1 0x0>; /* PD26 periph A AD6 */ 437 <AT91_PIOD 26 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD26 periph A AD6 */
435 }; 438 };
436 pinctrl_adc0_ad7: adc0_ad7 { 439 pinctrl_adc0_ad7: adc0_ad7 {
437 atmel,pins = 440 atmel,pins =
438 <3 27 0x1 0x0>; /* PD27 periph A AD7 */ 441 <AT91_PIOD 27 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD27 periph A AD7 */
439 }; 442 };
440 pinctrl_adc0_ad8: adc0_ad8 { 443 pinctrl_adc0_ad8: adc0_ad8 {
441 atmel,pins = 444 atmel,pins =
442 <3 28 0x1 0x0>; /* PD28 periph A AD8 */ 445 <AT91_PIOD 28 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD28 periph A AD8 */
443 }; 446 };
444 pinctrl_adc0_ad9: adc0_ad9 { 447 pinctrl_adc0_ad9: adc0_ad9 {
445 atmel,pins = 448 atmel,pins =
446 <3 29 0x1 0x0>; /* PD29 periph A AD9 */ 449 <AT91_PIOD 29 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD29 periph A AD9 */
447 }; 450 };
448 pinctrl_adc0_ad10: adc0_ad10 { 451 pinctrl_adc0_ad10: adc0_ad10 {
449 atmel,pins = 452 atmel,pins =
450 <3 30 0x1 0x0>; /* PD30 periph A AD10, conflicts with PCK0 */ 453 <AT91_PIOD 30 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD30 periph A AD10, conflicts with PCK0 */
451 }; 454 };
452 pinctrl_adc0_ad11: adc0_ad11 { 455 pinctrl_adc0_ad11: adc0_ad11 {
453 atmel,pins = 456 atmel,pins =
454 <3 31 0x1 0x0>; /* PD31 periph A AD11, conflicts with PCK1 */ 457 <AT91_PIOD 31 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD31 periph A AD11, conflicts with PCK1 */
455 }; 458 };
456 }; 459 };
457 460
458 can0 { 461 can0 {
459 pinctrl_can0_rx_tx: can0_rx_tx { 462 pinctrl_can0_rx_tx: can0_rx_tx {
460 atmel,pins = 463 atmel,pins =
461 <3 14 0x3 0x0 /* PD14 periph C RX, conflicts with SCK0, SPI0_NPCS1 */ 464 <AT91_PIOD 14 AT91_PERIPH_C AT91_PINCTRL_NONE /* PD14 periph C RX, conflicts with SCK0, SPI0_NPCS1 */
462 3 15 0x3 0x0>; /* PD15 periph C TX, conflicts with CTS0, SPI0_NPCS2 */ 465 AT91_PIOD 15 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* PD15 periph C TX, conflicts with CTS0, SPI0_NPCS2 */
463 }; 466 };
464 }; 467 };
465 468
466 can1 { 469 can1 {
467 pinctrl_can1_rx_tx: can1_rx_tx { 470 pinctrl_can1_rx_tx: can1_rx_tx {
468 atmel,pins = 471 atmel,pins =
469 <1 14 0x2 0x0 /* PB14 periph B RX, conflicts with GCRS */ 472 <AT91_PIOB 14 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB14 periph B RX, conflicts with GCRS */
470 1 15 0x2 0x0>; /* PB15 periph B TX, conflicts with GCOL */ 473 AT91_PIOB 15 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PB15 periph B TX, conflicts with GCOL */
471 }; 474 };
472 }; 475 };
473 476
474 dbgu { 477 dbgu {
475 pinctrl_dbgu: dbgu-0 { 478 pinctrl_dbgu: dbgu-0 {
476 atmel,pins = 479 atmel,pins =
477 <1 30 0x1 0x0 /* PB30 periph A */ 480 <AT91_PIOB 30 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB30 periph A */
478 1 31 0x1 0x1>; /* PB31 periph A with pullup */ 481 AT91_PIOB 31 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PB31 periph A with pullup */
479 }; 482 };
480 }; 483 };
481 484
482 i2c0 { 485 i2c0 {
483 pinctrl_i2c0: i2c0-0 { 486 pinctrl_i2c0: i2c0-0 {
484 atmel,pins = 487 atmel,pins =
485 <0 30 0x1 0x0 /* PA30 periph A TWD0 pin, conflicts with URXD1, ISI_VSYNC */ 488 <AT91_PIOA 30 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA30 periph A TWD0 pin, conflicts with URXD1, ISI_VSYNC */
486 0 31 0x1 0x0>; /* PA31 periph A TWCK0 pin, conflicts with UTXD1, ISI_HSYNC */ 489 AT91_PIOA 31 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA31 periph A TWCK0 pin, conflicts with UTXD1, ISI_HSYNC */
487 }; 490 };
488 }; 491 };
489 492
490 i2c1 { 493 i2c1 {
491 pinctrl_i2c1: i2c1-0 { 494 pinctrl_i2c1: i2c1-0 {
492 atmel,pins = 495 atmel,pins =
493 <2 26 0x2 0x0 /* PC26 periph B TWD1 pin, conflicts with SPI1_NPCS1, ISI_D11 */ 496 <AT91_PIOC 26 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC26 periph B TWD1 pin, conflicts with SPI1_NPCS1, ISI_D11 */
494 2 27 0x2 0x0>; /* PC27 periph B TWCK1 pin, conflicts with SPI1_NPCS2, ISI_D10 */ 497 AT91_PIOC 27 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC27 periph B TWCK1 pin, conflicts with SPI1_NPCS2, ISI_D10 */
495 }; 498 };
496 }; 499 };
497 500
498 isi { 501 isi {
499 pinctrl_isi: isi-0 { 502 pinctrl_isi: isi-0 {
500 atmel,pins = 503 atmel,pins =
501 <0 16 0x3 0x0 /* PA16 periph C ISI_D0, conflicts with LCDDAT16 */ 504 <AT91_PIOA 16 AT91_PERIPH_C AT91_PINCTRL_NONE /* PA16 periph C ISI_D0, conflicts with LCDDAT16 */
502 0 17 0x3 0x0 /* PA17 periph C ISI_D1, conflicts with LCDDAT17 */ 505 AT91_PIOA 17 AT91_PERIPH_C AT91_PINCTRL_NONE /* PA17 periph C ISI_D1, conflicts with LCDDAT17 */
503 0 18 0x3 0x0 /* PA18 periph C ISI_D2, conflicts with LCDDAT18, TWD2 */ 506 AT91_PIOA 18 AT91_PERIPH_C AT91_PINCTRL_NONE /* PA18 periph C ISI_D2, conflicts with LCDDAT18, TWD2 */
504 0 19 0x3 0x0 /* PA19 periph C ISI_D3, conflicts with LCDDAT19, TWCK2 */ 507 AT91_PIOA 19 AT91_PERIPH_C AT91_PINCTRL_NONE /* PA19 periph C ISI_D3, conflicts with LCDDAT19, TWCK2 */
505 0 20 0x3 0x0 /* PA20 periph C ISI_D4, conflicts with LCDDAT20, PWMH0 */ 508 AT91_PIOA 20 AT91_PERIPH_C AT91_PINCTRL_NONE /* PA20 periph C ISI_D4, conflicts with LCDDAT20, PWMH0 */
506 0 21 0x3 0x0 /* PA21 periph C ISI_D5, conflicts with LCDDAT21, PWML0 */ 509 AT91_PIOA 21 AT91_PERIPH_C AT91_PINCTRL_NONE /* PA21 periph C ISI_D5, conflicts with LCDDAT21, PWML0 */
507 0 22 0x3 0x0 /* PA22 periph C ISI_D6, conflicts with LCDDAT22, PWMH1 */ 510 AT91_PIOA 22 AT91_PERIPH_C AT91_PINCTRL_NONE /* PA22 periph C ISI_D6, conflicts with LCDDAT22, PWMH1 */
508 0 23 0x3 0x0 /* PA23 periph C ISI_D7, conflicts with LCDDAT23, PWML1 */ 511 AT91_PIOA 23 AT91_PERIPH_C AT91_PINCTRL_NONE /* PA23 periph C ISI_D7, conflicts with LCDDAT23, PWML1 */
509 2 30 0x3 0x0 /* PC30 periph C ISI_PCK, conflicts with UTXD0 */ 512 AT91_PIOC 30 AT91_PERIPH_C AT91_PINCTRL_NONE /* PC30 periph C ISI_PCK, conflicts with UTXD0 */
510 0 31 0x3 0x0 /* PA31 periph C ISI_HSYNC, conflicts with TWCK0, UTXD1 */ 513 AT91_PIOA 31 AT91_PERIPH_C AT91_PINCTRL_NONE /* PA31 periph C ISI_HSYNC, conflicts with TWCK0, UTXD1 */
511 0 30 0x3 0x0 /* PA30 periph C ISI_VSYNC, conflicts with TWD0, URXD1 */ 514 AT91_PIOA 30 AT91_PERIPH_C AT91_PINCTRL_NONE /* PA30 periph C ISI_VSYNC, conflicts with TWD0, URXD1 */
512 2 29 0x3 0x0 /* PC29 periph C ISI_PD8, conflicts with URXD0, PWMFI2 */ 515 AT91_PIOC 29 AT91_PERIPH_C AT91_PINCTRL_NONE /* PC29 periph C ISI_PD8, conflicts with URXD0, PWMFI2 */
513 2 28 0x3 0x0>; /* PC28 periph C ISI_PD9, conflicts with SPI1_NPCS3, PWMFI0 */ 516 AT91_PIOC 28 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* PC28 periph C ISI_PD9, conflicts with SPI1_NPCS3, PWMFI0 */
514 }; 517 };
515 pinctrl_isi_pck_as_mck: isi_pck_as_mck-0 { 518 pinctrl_isi_pck_as_mck: isi_pck_as_mck-0 {
516 atmel,pins = 519 atmel,pins =
517 <3 31 0x2 0x0>; /* PD31 periph B ISI_MCK */ 520 <AT91_PIOD 31 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PD31 periph B ISI_MCK */
518 }; 521 };
519 }; 522 };
520 523
521 lcd { 524 lcd {
522 pinctrl_lcd: lcd-0 { 525 pinctrl_lcd: lcd-0 {
523 atmel,pins = 526 atmel,pins =
524 <0 24 0x1 0x0 /* PA24 periph A LCDPWM */ 527 <AT91_PIOA 24 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA24 periph A LCDPWM */
525 0 26 0x1 0x0 /* PA26 periph A LCDVSYNC */ 528 AT91_PIOA 26 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA26 periph A LCDVSYNC */
526 0 27 0x1 0x0 /* PA27 periph A LCDHSYNC */ 529 AT91_PIOA 27 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA27 periph A LCDHSYNC */
527 0 25 0x1 0x0 /* PA25 periph A LCDDISP */ 530 AT91_PIOA 25 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA25 periph A LCDDISP */
528 0 29 0x1 0x0 /* PA29 periph A LCDDEN */ 531 AT91_PIOA 29 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA29 periph A LCDDEN */
529 0 28 0x1 0x0 /* PA28 periph A LCDPCK */ 532 AT91_PIOA 28 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA28 periph A LCDPCK */
530 0 0 0x1 0x0 /* PA0 periph A LCDD0 pin */ 533 AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA0 periph A LCDD0 pin */
531 0 1 0x1 0x0 /* PA1 periph A LCDD1 pin */ 534 AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA1 periph A LCDD1 pin */
532 0 2 0x1 0x0 /* PA2 periph A LCDD2 pin */ 535 AT91_PIOA 2 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA2 periph A LCDD2 pin */
533 0 3 0x1 0x0 /* PA3 periph A LCDD3 pin */ 536 AT91_PIOA 3 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA3 periph A LCDD3 pin */
534 0 4 0x1 0x0 /* PA4 periph A LCDD4 pin */ 537 AT91_PIOA 4 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA4 periph A LCDD4 pin */
535 0 5 0x1 0x0 /* PA5 periph A LCDD5 pin */ 538 AT91_PIOA 5 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA5 periph A LCDD5 pin */
536 0 6 0x1 0x0 /* PA6 periph A LCDD6 pin */ 539 AT91_PIOA 6 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA6 periph A LCDD6 pin */
537 0 7 0x1 0x0 /* PA7 periph A LCDD7 pin */ 540 AT91_PIOA 7 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA7 periph A LCDD7 pin */
538 0 8 0x1 0x0 /* PA8 periph A LCDD8 pin */ 541 AT91_PIOA 8 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA8 periph A LCDD8 pin */
539 0 9 0x1 0x0 /* PA9 periph A LCDD9 pin */ 542 AT91_PIOA 9 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA9 periph A LCDD9 pin */
540 0 10 0x1 0x0 /* PA10 periph A LCDD10 pin */ 543 AT91_PIOA 10 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA10 periph A LCDD10 pin */
541 0 11 0x1 0x0 /* PA11 periph A LCDD11 pin */ 544 AT91_PIOA 11 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA11 periph A LCDD11 pin */
542 0 12 0x1 0x0 /* PA12 periph A LCDD12 pin */ 545 AT91_PIOA 12 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA12 periph A LCDD12 pin */
543 0 13 0x1 0x0 /* PA13 periph A LCDD13 pin */ 546 AT91_PIOA 13 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA13 periph A LCDD13 pin */
544 0 14 0x1 0x0 /* PA14 periph A LCDD14 pin */ 547 AT91_PIOA 14 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA14 periph A LCDD14 pin */
545 0 15 0x1 0x0 /* PA15 periph A LCDD15 pin */ 548 AT91_PIOA 15 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA15 periph A LCDD15 pin */
546 2 14 0x3 0x0 /* PC14 periph C LCDD16 pin */ 549 AT91_PIOC 14 AT91_PERIPH_C AT91_PINCTRL_NONE /* PC14 periph C LCDD16 pin */
547 2 13 0x3 0x0 /* PC13 periph C LCDD17 pin */ 550 AT91_PIOC 13 AT91_PERIPH_C AT91_PINCTRL_NONE /* PC13 periph C LCDD17 pin */
548 2 12 0x3 0x0 /* PC12 periph C LCDD18 pin */ 551 AT91_PIOC 12 AT91_PERIPH_C AT91_PINCTRL_NONE /* PC12 periph C LCDD18 pin */
549 2 11 0x3 0x0 /* PC11 periph C LCDD19 pin */ 552 AT91_PIOC 11 AT91_PERIPH_C AT91_PINCTRL_NONE /* PC11 periph C LCDD19 pin */
550 2 10 0x3 0x0 /* PC10 periph C LCDD20 pin */ 553 AT91_PIOC 10 AT91_PERIPH_C AT91_PINCTRL_NONE /* PC10 periph C LCDD20 pin */
551 2 15 0x3 0x0 /* PC15 periph C LCDD21 pin */ 554 AT91_PIOC 15 AT91_PERIPH_C AT91_PINCTRL_NONE /* PC15 periph C LCDD21 pin */
552 4 27 0x3 0x0 /* PE27 periph C LCDD22 pin */ 555 AT91_PIOE 27 AT91_PERIPH_C AT91_PINCTRL_NONE /* PE27 periph C LCDD22 pin */
553 4 28 0x3 0x0>; /* PE28 periph C LCDD23 pin */ 556 AT91_PIOE 28 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* PE28 periph C LCDD23 pin */
554 }; 557 };
555 }; 558 };
556 559
557 macb0 { 560 macb0 {
558 pinctrl_macb0_data_rgmii: macb0_data_rgmii { 561 pinctrl_macb0_data_rgmii: macb0_data_rgmii {
559 atmel,pins = 562 atmel,pins =
560 <1 0 0x1 0x0 /* PB0 periph A GTX0, conflicts with PWMH0 */ 563 <AT91_PIOB 0 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB0 periph A GTX0, conflicts with PWMH0 */
561 1 1 0x1 0x0 /* PB1 periph A GTX1, conflicts with PWML0 */ 564 AT91_PIOB 1 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB1 periph A GTX1, conflicts with PWML0 */
562 1 2 0x1 0x0 /* PB2 periph A GTX2, conflicts with TK1 */ 565 AT91_PIOB 2 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB2 periph A GTX2, conflicts with TK1 */
563 1 3 0x1 0x0 /* PB3 periph A GTX3, conflicts with TF1 */ 566 AT91_PIOB 3 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB3 periph A GTX3, conflicts with TF1 */
564 1 4 0x1 0x0 /* PB4 periph A GRX0, conflicts with PWMH1 */ 567 AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB4 periph A GRX0, conflicts with PWMH1 */
565 1 5 0x1 0x0 /* PB5 periph A GRX1, conflicts with PWML1 */ 568 AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB5 periph A GRX1, conflicts with PWML1 */
566 1 6 0x1 0x0 /* PB6 periph A GRX2, conflicts with TD1 */ 569 AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB6 periph A GRX2, conflicts with TD1 */
567 1 7 0x1 0x0>; /* PB7 periph A GRX3, conflicts with RK1 */ 570 AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB7 periph A GRX3, conflicts with RK1 */
568 }; 571 };
569 pinctrl_macb0_data_gmii: macb0_data_gmii { 572 pinctrl_macb0_data_gmii: macb0_data_gmii {
570 atmel,pins = 573 atmel,pins =
571 <1 19 0x2 0x0 /* PB19 periph B GTX4, conflicts with MCI1_CDA */ 574 <AT91_PIOB 19 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB19 periph B GTX4, conflicts with MCI1_CDA */
572 1 20 0x2 0x0 /* PB20 periph B GTX5, conflicts with MCI1_DA0 */ 575 AT91_PIOB 20 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB20 periph B GTX5, conflicts with MCI1_DA0 */
573 1 21 0x2 0x0 /* PB21 periph B GTX6, conflicts with MCI1_DA1 */ 576 AT91_PIOB 21 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB21 periph B GTX6, conflicts with MCI1_DA1 */
574 1 22 0x2 0x0 /* PB22 periph B GTX7, conflicts with MCI1_DA2 */ 577 AT91_PIOB 22 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB22 periph B GTX7, conflicts with MCI1_DA2 */
575 1 23 0x2 0x0 /* PB23 periph B GRX4, conflicts with MCI1_DA3 */ 578 AT91_PIOB 23 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB23 periph B GRX4, conflicts with MCI1_DA3 */
576 1 24 0x2 0x0 /* PB24 periph B GRX5, conflicts with MCI1_CK */ 579 AT91_PIOB 24 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB24 periph B GRX5, conflicts with MCI1_CK */
577 1 25 0x2 0x0 /* PB25 periph B GRX6, conflicts with SCK1 */ 580 AT91_PIOB 25 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB25 periph B GRX6, conflicts with SCK1 */
578 1 26 0x2 0x0>; /* PB26 periph B GRX7, conflicts with CTS1 */ 581 AT91_PIOB 26 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PB26 periph B GRX7, conflicts with CTS1 */
579 }; 582 };
580 pinctrl_macb0_signal_rgmii: macb0_signal_rgmii { 583 pinctrl_macb0_signal_rgmii: macb0_signal_rgmii {
581 atmel,pins = 584 atmel,pins =
582 <1 8 0x1 0x0 /* PB8 periph A GTXCK, conflicts with PWMH2 */ 585 <AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB8 periph A GTXCK, conflicts with PWMH2 */
583 1 9 0x1 0x0 /* PB9 periph A GTXEN, conflicts with PWML2 */ 586 AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB9 periph A GTXEN, conflicts with PWML2 */
584 1 11 0x1 0x0 /* PB11 periph A GRXCK, conflicts with RD1 */ 587 AT91_PIOB 11 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB11 periph A GRXCK, conflicts with RD1 */
585 1 13 0x1 0x0 /* PB13 periph A GRXER, conflicts with PWML3 */ 588 AT91_PIOB 13 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB13 periph A GRXER, conflicts with PWML3 */
586 1 16 0x1 0x0 /* PB16 periph A GMDC */ 589 AT91_PIOB 16 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB16 periph A GMDC */
587 1 17 0x1 0x0 /* PB17 periph A GMDIO */ 590 AT91_PIOB 17 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB17 periph A GMDIO */
588 1 18 0x1 0x0>; /* PB18 periph A G125CK */ 591 AT91_PIOB 18 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB18 periph A G125CK */
589 }; 592 };
590 pinctrl_macb0_signal_gmii: macb0_signal_gmii { 593 pinctrl_macb0_signal_gmii: macb0_signal_gmii {
591 atmel,pins = 594 atmel,pins =
592 <1 9 0x1 0x0 /* PB9 periph A GTXEN, conflicts with PWML2 */ 595 <AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB9 periph A GTXEN, conflicts with PWML2 */
593 1 10 0x1 0x0 /* PB10 periph A GTXER, conflicts with RF1 */ 596 AT91_PIOB 10 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB10 periph A GTXER, conflicts with RF1 */
594 1 11 0x1 0x0 /* PB11 periph A GRXCK, conflicts with RD1 */ 597 AT91_PIOB 11 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB11 periph A GRXCK, conflicts with RD1 */
595 1 12 0x1 0x0 /* PB12 periph A GRXDV, conflicts with PWMH3 */ 598 AT91_PIOB 12 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB12 periph A GRXDV, conflicts with PWMH3 */
596 1 13 0x1 0x0 /* PB13 periph A GRXER, conflicts with PWML3 */ 599 AT91_PIOB 13 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB13 periph A GRXER, conflicts with PWML3 */
597 1 14 0x1 0x0 /* PB14 periph A GCRS, conflicts with CANRX1 */ 600 AT91_PIOB 14 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB14 periph A GCRS, conflicts with CANRX1 */
598 1 15 0x1 0x0 /* PB15 periph A GCOL, conflicts with CANTX1 */ 601 AT91_PIOB 15 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB15 periph A GCOL, conflicts with CANTX1 */
599 1 16 0x1 0x0 /* PB16 periph A GMDC */ 602 AT91_PIOB 16 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB16 periph A GMDC */
600 1 17 0x1 0x0 /* PB17 periph A GMDIO */ 603 AT91_PIOB 17 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB17 periph A GMDIO */
601 1 27 0x2 0x0>; /* PB27 periph B G125CKO */ 604 AT91_PIOB 27 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PB27 periph B G125CKO */
602 }; 605 };
603 606
604 }; 607 };
@@ -606,252 +609,251 @@
606 macb1 { 609 macb1 {
607 pinctrl_macb1_rmii: macb1_rmii-0 { 610 pinctrl_macb1_rmii: macb1_rmii-0 {
608 atmel,pins = 611 atmel,pins =
609 <2 0 0x1 0x0 /* PC0 periph A ETX0, conflicts with TIOA3 */ 612 <AT91_PIOC 0 AT91_PERIPH_A AT91_PINCTRL_NONE /* PC0 periph A ETX0, conflicts with TIOA3 */
610 2 1 0x1 0x0 /* PC1 periph A ETX1, conflicts with TIOB3 */ 613 AT91_PIOC 1 AT91_PERIPH_A AT91_PINCTRL_NONE /* PC1 periph A ETX1, conflicts with TIOB3 */
611 2 2 0x1 0x0 /* PC2 periph A ERX0, conflicts with TCLK3 */ 614 AT91_PIOC 2 AT91_PERIPH_A AT91_PINCTRL_NONE /* PC2 periph A ERX0, conflicts with TCLK3 */
612 2 3 0x1 0x0 /* PC3 periph A ERX1, conflicts with TIOA4 */ 615 AT91_PIOC 3 AT91_PERIPH_A AT91_PINCTRL_NONE /* PC3 periph A ERX1, conflicts with TIOA4 */
613 2 4 0x1 0x0 /* PC4 periph A ETXEN, conflicts with TIOB4 */ 616 AT91_PIOC 4 AT91_PERIPH_A AT91_PINCTRL_NONE /* PC4 periph A ETXEN, conflicts with TIOB4 */
614 2 5 0x1 0x0 /* PC5 periph A ECRSDV,conflicts with TCLK4 */ 617 AT91_PIOC 5 AT91_PERIPH_A AT91_PINCTRL_NONE /* PC5 periph A ECRSDV,conflicts with TCLK4 */
615 2 6 0x1 0x0 /* PC6 periph A ERXER, conflicts with TIOA5 */ 618 AT91_PIOC 6 AT91_PERIPH_A AT91_PINCTRL_NONE /* PC6 periph A ERXER, conflicts with TIOA5 */
616 2 7 0x1 0x0 /* PC7 periph A EREFCK, conflicts with TIOB5 */ 619 AT91_PIOC 7 AT91_PERIPH_A AT91_PINCTRL_NONE /* PC7 periph A EREFCK, conflicts with TIOB5 */
617 2 8 0x1 0x0 /* PC8 periph A EMDC, conflicts with TCLK5 */ 620 AT91_PIOC 8 AT91_PERIPH_A AT91_PINCTRL_NONE /* PC8 periph A EMDC, conflicts with TCLK5 */
618 2 9 0x1 0x0>; /* PC9 periph A EMDIO */ 621 AT91_PIOC 9 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PC9 periph A EMDIO */
619 }; 622 };
620 }; 623 };
621 624
622 mmc0 { 625 mmc0 {
623 pinctrl_mmc0_clk_cmd_dat0: mmc0_clk_cmd_dat0 { 626 pinctrl_mmc0_clk_cmd_dat0: mmc0_clk_cmd_dat0 {
624 atmel,pins = 627 atmel,pins =
625 <3 9 0x1 0x0 /* PD9 periph A MCI0_CK */ 628 <AT91_PIOD 9 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD9 periph A MCI0_CK */
626 3 0 0x1 0x1 /* PD0 periph A MCI0_CDA with pullup */ 629 AT91_PIOD 0 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD0 periph A MCI0_CDA with pullup */
627 3 1 0x1 0x1>; /* PD1 periph A MCI0_DA0 with pullup */ 630 AT91_PIOD 1 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PD1 periph A MCI0_DA0 with pullup */
628 }; 631 };
629 pinctrl_mmc0_dat1_3: mmc0_dat1_3 { 632 pinctrl_mmc0_dat1_3: mmc0_dat1_3 {
630 atmel,pins = 633 atmel,pins =
631 <3 2 0x1 0x1 /* PD2 periph A MCI0_DA1 with pullup */ 634 <AT91_PIOD 2 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD2 periph A MCI0_DA1 with pullup */
632 3 3 0x1 0x1 /* PD3 periph A MCI0_DA2 with pullup */ 635 AT91_PIOD 3 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD3 periph A MCI0_DA2 with pullup */
633 3 4 0x1 0x1>; /* PD4 periph A MCI0_DA3 with pullup */ 636 AT91_PIOD 4 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PD4 periph A MCI0_DA3 with pullup */
634 }; 637 };
635 pinctrl_mmc0_dat4_7: mmc0_dat4_7 { 638 pinctrl_mmc0_dat4_7: mmc0_dat4_7 {
636 atmel,pins = 639 atmel,pins =
637 <3 5 0x1 0x1 /* PD5 periph A MCI0_DA4 with pullup, conflicts with TIOA0, PWMH2 */ 640 <AT91_PIOD 5 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD5 periph A MCI0_DA4 with pullup, conflicts with TIOA0, PWMH2 */
638 3 6 0x1 0x1 /* PD6 periph A MCI0_DA5 with pullup, conflicts with TIOB0, PWML2 */ 641 AT91_PIOD 6 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD6 periph A MCI0_DA5 with pullup, conflicts with TIOB0, PWML2 */
639 3 7 0x1 0x1 /* PD7 periph A MCI0_DA6 with pullup, conlicts with TCLK0, PWMH3 */ 642 AT91_PIOD 7 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD7 periph A MCI0_DA6 with pullup, conlicts with TCLK0, PWMH3 */
640 3 8 0x1 0x1>; /* PD8 periph A MCI0_DA7 with pullup, conflicts with PWML3 */ 643 AT91_PIOD 8 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PD8 periph A MCI0_DA7 with pullup, conflicts with PWML3 */
641 }; 644 };
642 }; 645 };
643 646
644 mmc1 { 647 mmc1 {
645 pinctrl_mmc1_clk_cmd_dat0: mmc1_clk_cmd_dat0 { 648 pinctrl_mmc1_clk_cmd_dat0: mmc1_clk_cmd_dat0 {
646 atmel,pins = 649 atmel,pins =
647 <1 24 0x1 0x0 /* PB24 periph A MCI1_CK, conflicts with GRX5 */ 650 <AT91_PIOB 24 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB24 periph A MCI1_CK, conflicts with GRX5 */
648 1 19 0x1 0x1 /* PB19 periph A MCI1_CDA with pullup, conflicts with GTX4 */ 651 AT91_PIOB 19 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB19 periph A MCI1_CDA with pullup, conflicts with GTX4 */
649 1 20 0x1 0x1>; /* PB20 periph A MCI1_DA0 with pullup, conflicts with GTX5 */ 652 AT91_PIOB 20 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PB20 periph A MCI1_DA0 with pullup, conflicts with GTX5 */
650 }; 653 };
651 pinctrl_mmc1_dat1_3: mmc1_dat1_3 { 654 pinctrl_mmc1_dat1_3: mmc1_dat1_3 {
652 atmel,pins = 655 atmel,pins =
653 <1 21 0x1 0x1 /* PB21 periph A MCI1_DA1 with pullup, conflicts with GTX6 */ 656 <AT91_PIOB 21 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB21 periph A MCI1_DA1 with pullup, conflicts with GTX6 */
654 1 22 0x1 0x1 /* PB22 periph A MCI1_DA2 with pullup, conflicts with GTX7 */ 657 AT91_PIOB 22 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB22 periph A MCI1_DA2 with pullup, conflicts with GTX7 */
655 1 23 0x1 0x1>; /* PB23 periph A MCI1_DA3 with pullup, conflicts with GRX4 */ 658 AT91_PIOB 23 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PB23 periph A MCI1_DA3 with pullup, conflicts with GRX4 */
656 }; 659 };
657 }; 660 };
658 661
659 mmc2 { 662 mmc2 {
660 pinctrl_mmc2_clk_cmd_dat0: mmc2_clk_cmd_dat0 { 663 pinctrl_mmc2_clk_cmd_dat0: mmc2_clk_cmd_dat0 {
661 atmel,pins = 664 atmel,pins =
662 <2 15 0x1 0x0 /* PC15 periph A MCI2_CK, conflicts with PCK2 */ 665 <AT91_PIOC 15 AT91_PERIPH_A AT91_PINCTRL_NONE /* PC15 periph A MCI2_CK, conflicts with PCK2 */
663 2 10 0x1 0x1 /* PC10 periph A MCI2_CDA with pullup */ 666 AT91_PIOC 10 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PC10 periph A MCI2_CDA with pullup */
664 2 11 0x1 0x1>; /* PC11 periph A MCI2_DA0 with pullup */ 667 AT91_PIOC 11 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PC11 periph A MCI2_DA0 with pullup */
665 }; 668 };
666 pinctrl_mmc2_dat1_3: mmc2_dat1_3 { 669 pinctrl_mmc2_dat1_3: mmc2_dat1_3 {
667 atmel,pins = 670 atmel,pins =
668 <2 12 0x1 0x0 /* PC12 periph A MCI2_DA1 with pullup, conflicts with TIOA1 */ 671 <AT91_PIOC 12 AT91_PERIPH_A AT91_PINCTRL_NONE /* PC12 periph A MCI2_DA1 with pullup, conflicts with TIOA1 */
669 2 13 0x1 0x0 /* PC13 periph A MCI2_DA2 with pullup, conflicts with TIOB1 */ 672 AT91_PIOC 13 AT91_PERIPH_A AT91_PINCTRL_NONE /* PC13 periph A MCI2_DA2 with pullup, conflicts with TIOB1 */
670 2 14 0x1 0x0>; /* PC14 periph A MCI2_DA3 with pullup, conflicts with TCLK1 */ 673 AT91_PIOC 14 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PC14 periph A MCI2_DA3 with pullup, conflicts with TCLK1 */
671 }; 674 };
672 }; 675 };
673 676
674 nand0 { 677 nand0 {
675 pinctrl_nand0_ale_cle: nand0_ale_cle-0 { 678 pinctrl_nand0_ale_cle: nand0_ale_cle-0 {
676 atmel,pins = 679 atmel,pins =
677 <4 21 0x1 0x1 /* PE21 periph A with pullup */ 680 <AT91_PIOE 21 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PE21 periph A with pullup */
678 4 22 0x1 0x1>; /* PE22 periph A with pullup */ 681 AT91_PIOE 22 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PE22 periph A with pullup */
679 }; 682 };
680 }; 683 };
681 684
682 pioA: gpio@fffff200 {
683 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
684 reg = <0xfffff200 0x100>;
685 interrupts = <6 4 1>;
686 #gpio-cells = <2>;
687 gpio-controller;
688 interrupt-controller;
689 #interrupt-cells = <2>;
690 };
691
692 pioB: gpio@fffff400 {
693 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
694 reg = <0xfffff400 0x100>;
695 interrupts = <7 4 1>;
696 #gpio-cells = <2>;
697 gpio-controller;
698 interrupt-controller;
699 #interrupt-cells = <2>;
700 };
701
702 pioC: gpio@fffff600 {
703 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
704 reg = <0xfffff600 0x100>;
705 interrupts = <8 4 1>;
706 #gpio-cells = <2>;
707 gpio-controller;
708 interrupt-controller;
709 #interrupt-cells = <2>;
710 };
711
712 pioD: gpio@fffff800 {
713 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
714 reg = <0xfffff800 0x100>;
715 interrupts = <9 4 1>;
716 #gpio-cells = <2>;
717 gpio-controller;
718 interrupt-controller;
719 #interrupt-cells = <2>;
720 };
721
722 pioE: gpio@fffffa00 {
723 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
724 reg = <0xfffffa00 0x100>;
725 interrupts = <10 4 1>;
726 #gpio-cells = <2>;
727 gpio-controller;
728 interrupt-controller;
729 #interrupt-cells = <2>;
730 };
731
732 spi0 { 685 spi0 {
733 pinctrl_spi0: spi0-0 { 686 pinctrl_spi0: spi0-0 {
734 atmel,pins = 687 atmel,pins =
735 <3 10 0x1 0x0 /* PD10 periph A SPI0_MISO pin */ 688 <AT91_PIOD 10 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD10 periph A SPI0_MISO pin */
736 3 11 0x1 0x0 /* PD11 periph A SPI0_MOSI pin */ 689 AT91_PIOD 11 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD11 periph A SPI0_MOSI pin */
737 3 12 0x1 0x0 /* PD12 periph A SPI0_SPCK pin */ 690 AT91_PIOD 12 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD12 periph A SPI0_SPCK pin */
738 3 13 0x0 0x0>; /* PD13 GPIO SPI0_NPCS0 pin */
739 }; 691 };
740 }; 692 };
741 693
742 spi1 { 694 spi1 {
743 pinctrl_spi1: spi1-0 { 695 pinctrl_spi1: spi1-0 {
744 atmel,pins = 696 atmel,pins =
745 <2 22 0x1 0x0 /* PC22 periph A SPI1_MISO pin */ 697 <AT91_PIOC 22 AT91_PERIPH_A AT91_PINCTRL_NONE /* PC22 periph A SPI1_MISO pin */
746 2 23 0x1 0x0 /* PC23 periph A SPI1_MOSI pin */ 698 AT91_PIOC 23 AT91_PERIPH_A AT91_PINCTRL_NONE /* PC23 periph A SPI1_MOSI pin */
747 2 24 0x1 0x0 /* PC24 periph A SPI1_SPCK pin */ 699 AT91_PIOC 24 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PC24 periph A SPI1_SPCK pin */
748 2 25 0x0 0x0>; /* PC25 GPIO SPI1_NPCS0 pin */
749 }; 700 };
750 }; 701 };
751 702
752 ssc0 { 703 ssc0 {
753 pinctrl_ssc0_tx: ssc0_tx { 704 pinctrl_ssc0_tx: ssc0_tx {
754 atmel,pins = 705 atmel,pins =
755 <2 16 0x1 0x0 /* PC16 periph A TK0 */ 706 <AT91_PIOC 16 AT91_PERIPH_A AT91_PINCTRL_NONE /* PC16 periph A TK0 */
756 2 17 0x1 0x0 /* PC17 periph A TF0 */ 707 AT91_PIOC 17 AT91_PERIPH_A AT91_PINCTRL_NONE /* PC17 periph A TF0 */
757 2 18 0x1 0x0>; /* PC18 periph A TD0 */ 708 AT91_PIOC 18 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PC18 periph A TD0 */
758 }; 709 };
759 710
760 pinctrl_ssc0_rx: ssc0_rx { 711 pinctrl_ssc0_rx: ssc0_rx {
761 atmel,pins = 712 atmel,pins =
762 <2 19 0x1 0x0 /* PC19 periph A RK0 */ 713 <AT91_PIOC 19 AT91_PERIPH_A AT91_PINCTRL_NONE /* PC19 periph A RK0 */
763 2 20 0x1 0x0 /* PC20 periph A RF0 */ 714 AT91_PIOC 20 AT91_PERIPH_A AT91_PINCTRL_NONE /* PC20 periph A RF0 */
764 2 21 0x1 0x0>; /* PC21 periph A RD0 */ 715 AT91_PIOC 21 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PC21 periph A RD0 */
765 }; 716 };
766 }; 717 };
767 718
768 ssc1 { 719 ssc1 {
769 pinctrl_ssc1_tx: ssc1_tx { 720 pinctrl_ssc1_tx: ssc1_tx {
770 atmel,pins = 721 atmel,pins =
771 <1 2 0x2 0x0 /* PB2 periph B TK1, conflicts with GTX2 */ 722 <AT91_PIOB 2 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB2 periph B TK1, conflicts with GTX2 */
772 1 3 0x2 0x0 /* PB3 periph B TF1, conflicts with GTX3 */ 723 AT91_PIOB 3 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB3 periph B TF1, conflicts with GTX3 */
773 1 6 0x2 0x0>; /* PB6 periph B TD1, conflicts with TD1 */ 724 AT91_PIOB 6 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PB6 periph B TD1, conflicts with TD1 */
774 }; 725 };
775 726
776 pinctrl_ssc1_rx: ssc1_rx { 727 pinctrl_ssc1_rx: ssc1_rx {
777 atmel,pins = 728 atmel,pins =
778 <1 7 0x2 0x0 /* PB7 periph B RK1, conflicts with EREFCK */ 729 <AT91_PIOB 7 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB7 periph B RK1, conflicts with EREFCK */
779 1 10 0x2 0x0 /* PB10 periph B RF1, conflicts with GTXER */ 730 AT91_PIOB 10 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB10 periph B RF1, conflicts with GTXER */
780 1 11 0x2 0x0>; /* PB11 periph B RD1, conflicts with GRXCK */ 731 AT91_PIOB 11 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PB11 periph B RD1, conflicts with GRXCK */
781 }; 732 };
782 }; 733 };
783 734
784 uart0 { 735 uart0 {
785 pinctrl_uart0: uart0-0 { 736 pinctrl_uart0: uart0-0 {
786 atmel,pins = 737 atmel,pins =
787 <2 29 0x1 0x0 /* PC29 periph A, conflicts with PWMFI2, ISI_D8 */ 738 <AT91_PIOC 29 AT91_PERIPH_A AT91_PINCTRL_NONE /* PC29 periph A, conflicts with PWMFI2, ISI_D8 */
788 2 30 0x1 0x1>; /* PC30 periph A with pullup, conflicts with ISI_PCK */ 739 AT91_PIOC 30 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PC30 periph A with pullup, conflicts with ISI_PCK */
789 }; 740 };
790 }; 741 };
791 742
792 uart1 { 743 uart1 {
793 pinctrl_uart1: uart1-0 { 744 pinctrl_uart1: uart1-0 {
794 atmel,pins = 745 atmel,pins =
795 <0 30 0x2 0x0 /* PA30 periph B, conflicts with TWD0, ISI_VSYNC */ 746 <AT91_PIOA 30 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA30 periph B, conflicts with TWD0, ISI_VSYNC */
796 0 31 0x2 0x1>; /* PA31 periph B with pullup, conflicts with TWCK0, ISI_HSYNC */ 747 AT91_PIOA 31 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>; /* PA31 periph B with pullup, conflicts with TWCK0, ISI_HSYNC */
797 }; 748 };
798 }; 749 };
799 750
800 usart0 { 751 usart0 {
801 pinctrl_usart0: usart0-0 { 752 pinctrl_usart0: usart0-0 {
802 atmel,pins = 753 atmel,pins =
803 <3 17 0x1 0x0 /* PD17 periph A */ 754 <AT91_PIOD 17 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD17 periph A */
804 3 18 0x1 0x1>; /* PD18 periph A with pullup */ 755 AT91_PIOD 18 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PD18 periph A with pullup */
805 }; 756 };
806 757
807 pinctrl_usart0_rts_cts: usart0_rts_cts-0 { 758 pinctrl_usart0_rts_cts: usart0_rts_cts-0 {
808 atmel,pins = 759 atmel,pins =
809 <3 15 0x1 0x0 /* PD15 periph A, conflicts with SPI0_NPCS2, CANTX0 */ 760 <AT91_PIOD 15 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD15 periph A, conflicts with SPI0_NPCS2, CANTX0 */
810 3 16 0x1 0x0>; /* PD16 periph A, conflicts with SPI0_NPCS3, PWMFI3 */ 761 AT91_PIOD 16 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD16 periph A, conflicts with SPI0_NPCS3, PWMFI3 */
811 }; 762 };
812 }; 763 };
813 764
814 usart1 { 765 usart1 {
815 pinctrl_usart1: usart1-0 { 766 pinctrl_usart1: usart1-0 {
816 atmel,pins = 767 atmel,pins =
817 <1 28 0x1 0x0 /* PB28 periph A */ 768 <AT91_PIOB 28 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB28 periph A */
818 1 29 0x1 0x1>; /* PB29 periph A with pullup */ 769 AT91_PIOB 29 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PB29 periph A with pullup */
819 }; 770 };
820 771
821 pinctrl_usart1_rts_cts: usart1_rts_cts-0 { 772 pinctrl_usart1_rts_cts: usart1_rts_cts-0 {
822 atmel,pins = 773 atmel,pins =
823 <1 26 0x1 0x0 /* PB26 periph A, conflicts with GRX7 */ 774 <AT91_PIOB 26 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB26 periph A, conflicts with GRX7 */
824 1 27 0x1 0x0>; /* PB27 periph A, conflicts with G125CKO */ 775 AT91_PIOB 27 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB27 periph A, conflicts with G125CKO */
825 }; 776 };
826 }; 777 };
827 778
828 usart2 { 779 usart2 {
829 pinctrl_usart2: usart2-0 { 780 pinctrl_usart2: usart2-0 {
830 atmel,pins = 781 atmel,pins =
831 <4 25 0x2 0x0 /* PE25 periph B, conflicts with A25 */ 782 <AT91_PIOE 25 AT91_PERIPH_B AT91_PINCTRL_NONE /* PE25 periph B, conflicts with A25 */
832 4 26 0x2 0x1>; /* PE26 periph B with pullup, conflicts NCS0 */ 783 AT91_PIOE 26 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>; /* PE26 periph B with pullup, conflicts NCS0 */
833 }; 784 };
834 785
835 pinctrl_usart2_rts_cts: usart2_rts_cts-0 { 786 pinctrl_usart2_rts_cts: usart2_rts_cts-0 {
836 atmel,pins = 787 atmel,pins =
837 <4 23 0x2 0x0 /* PE23 periph B, conflicts with A23 */ 788 <AT91_PIOE 23 AT91_PERIPH_B AT91_PINCTRL_NONE /* PE23 periph B, conflicts with A23 */
838 4 24 0x2 0x0>; /* PE24 periph B, conflicts with A24 */ 789 AT91_PIOE 24 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PE24 periph B, conflicts with A24 */
839 }; 790 };
840 }; 791 };
841 792
842 usart3 { 793 usart3 {
843 pinctrl_usart3: usart3-0 { 794 pinctrl_usart3: usart3-0 {
844 atmel,pins = 795 atmel,pins =
845 <4 18 0x2 0x0 /* PE18 periph B, conflicts with A18 */ 796 <AT91_PIOE 18 AT91_PERIPH_B AT91_PINCTRL_NONE /* PE18 periph B, conflicts with A18 */
846 4 19 0x2 0x1>; /* PE19 periph B with pullup, conflicts with A19 */ 797 AT91_PIOE 19 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>; /* PE19 periph B with pullup, conflicts with A19 */
847 }; 798 };
848 799
849 pinctrl_usart3_rts_cts: usart3_rts_cts-0 { 800 pinctrl_usart3_rts_cts: usart3_rts_cts-0 {
850 atmel,pins = 801 atmel,pins =
851 <4 16 0x2 0x0 /* PE16 periph B, conflicts with A16 */ 802 <AT91_PIOE 16 AT91_PERIPH_B AT91_PINCTRL_NONE /* PE16 periph B, conflicts with A16 */
852 4 17 0x2 0x0>; /* PE17 periph B, conflicts with A17 */ 803 AT91_PIOE 17 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PE17 periph B, conflicts with A17 */
853 }; 804 };
854 }; 805 };
806
807
808 pioA: gpio@fffff200 {
809 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
810 reg = <0xfffff200 0x100>;
811 interrupts = <6 IRQ_TYPE_LEVEL_HIGH 1>;
812 #gpio-cells = <2>;
813 gpio-controller;
814 interrupt-controller;
815 #interrupt-cells = <2>;
816 };
817
818 pioB: gpio@fffff400 {
819 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
820 reg = <0xfffff400 0x100>;
821 interrupts = <7 IRQ_TYPE_LEVEL_HIGH 1>;
822 #gpio-cells = <2>;
823 gpio-controller;
824 interrupt-controller;
825 #interrupt-cells = <2>;
826 };
827
828 pioC: gpio@fffff600 {
829 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
830 reg = <0xfffff600 0x100>;
831 interrupts = <8 IRQ_TYPE_LEVEL_HIGH 1>;
832 #gpio-cells = <2>;
833 gpio-controller;
834 interrupt-controller;
835 #interrupt-cells = <2>;
836 };
837
838 pioD: gpio@fffff800 {
839 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
840 reg = <0xfffff800 0x100>;
841 interrupts = <9 IRQ_TYPE_LEVEL_HIGH 1>;
842 #gpio-cells = <2>;
843 gpio-controller;
844 interrupt-controller;
845 #interrupt-cells = <2>;
846 };
847
848 pioE: gpio@fffffa00 {
849 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
850 reg = <0xfffffa00 0x100>;
851 interrupts = <10 IRQ_TYPE_LEVEL_HIGH 1>;
852 #gpio-cells = <2>;
853 gpio-controller;
854 interrupt-controller;
855 #interrupt-cells = <2>;
856 };
855 }; 857 };
856 858
857 pmc: pmc@fffffc00 { 859 pmc: pmc@fffffc00 {
@@ -867,7 +869,7 @@
867 pit: timer@fffffe30 { 869 pit: timer@fffffe30 {
868 compatible = "atmel,at91sam9260-pit"; 870 compatible = "atmel,at91sam9260-pit";
869 reg = <0xfffffe30 0xf>; 871 reg = <0xfffffe30 0xf>;
870 interrupts = <3 4 5>; 872 interrupts = <3 IRQ_TYPE_LEVEL_HIGH 5>;
871 }; 873 };
872 874
873 watchdog@fffffe40 { 875 watchdog@fffffe40 {
@@ -879,7 +881,7 @@
879 rtc@fffffeb0 { 881 rtc@fffffeb0 {
880 compatible = "atmel,at91rm9200-rtc"; 882 compatible = "atmel,at91rm9200-rtc";
881 reg = <0xfffffeb0 0x30>; 883 reg = <0xfffffeb0 0x30>;
882 interrupts = <1 4 7>; 884 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
883 }; 885 };
884 }; 886 };
885 887
@@ -889,7 +891,7 @@
889 compatible = "atmel,at91sam9rl-udc"; 891 compatible = "atmel,at91sam9rl-udc";
890 reg = <0x00500000 0x100000 892 reg = <0x00500000 0x100000
891 0xf8030000 0x4000>; 893 0xf8030000 0x4000>;
892 interrupts = <33 4 2>; 894 interrupts = <33 IRQ_TYPE_LEVEL_HIGH 2>;
893 status = "disabled"; 895 status = "disabled";
894 896
895 ep0 { 897 ep0 {
@@ -1001,14 +1003,14 @@
1001 usb1: ohci@00600000 { 1003 usb1: ohci@00600000 {
1002 compatible = "atmel,at91rm9200-ohci", "usb-ohci"; 1004 compatible = "atmel,at91rm9200-ohci", "usb-ohci";
1003 reg = <0x00600000 0x100000>; 1005 reg = <0x00600000 0x100000>;
1004 interrupts = <32 4 2>; 1006 interrupts = <32 IRQ_TYPE_LEVEL_HIGH 2>;
1005 status = "disabled"; 1007 status = "disabled";
1006 }; 1008 };
1007 1009
1008 usb2: ehci@00700000 { 1010 usb2: ehci@00700000 {
1009 compatible = "atmel,at91sam9g45-ehci", "usb-ehci"; 1011 compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
1010 reg = <0x00700000 0x100000>; 1012 reg = <0x00700000 0x100000>;
1011 interrupts = <32 4 2>; 1013 interrupts = <32 IRQ_TYPE_LEVEL_HIGH 2>;
1012 status = "disabled"; 1014 status = "disabled";
1013 }; 1015 };
1014 1016
@@ -1024,7 +1026,7 @@
1024 0xffffc000 0x00000070 /* NFC HSMC regs */ 1026 0xffffc000 0x00000070 /* NFC HSMC regs */
1025 0x00200000 0x00100000 /* NFC SRAM banks */ 1027 0x00200000 0x00100000 /* NFC SRAM banks */
1026 >; 1028 >;
1027 interrupts = <5 4 6>; 1029 interrupts = <5 IRQ_TYPE_LEVEL_HIGH 6>;
1028 atmel,nand-addr-offset = <21>; 1030 atmel,nand-addr-offset = <21>;
1029 atmel,nand-cmd-offset = <22>; 1031 atmel,nand-cmd-offset = <22>;
1030 pinctrl-names = "default"; 1032 pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/sama5d31ek.dts b/arch/arm/boot/dts/sama5d31ek.dts
index fa5d216f1db7..027bac7510b6 100644
--- a/arch/arm/boot/dts/sama5d31ek.dts
+++ b/arch/arm/boot/dts/sama5d31ek.dts
@@ -7,8 +7,8 @@
7 * Licensed under GPLv2 or later. 7 * Licensed under GPLv2 or later.
8 */ 8 */
9/dts-v1/; 9/dts-v1/;
10/include/ "sama5d3xmb.dtsi" 10#include "sama5d3xmb.dtsi"
11/include/ "sama5d3xdm.dtsi" 11#include "sama5d3xdm.dtsi"
12 12
13/ { 13/ {
14 model = "Atmel SAMA5D31-EK"; 14 model = "Atmel SAMA5D31-EK";
@@ -41,7 +41,7 @@
41 leds { 41 leds {
42 d3 { 42 d3 {
43 label = "d3"; 43 label = "d3";
44 gpios = <&pioE 24 0>; 44 gpios = <&pioE 24 GPIO_ACTIVE_HIGH>;
45 }; 45 };
46 }; 46 };
47 47
diff --git a/arch/arm/boot/dts/sama5d33ek.dts b/arch/arm/boot/dts/sama5d33ek.dts
index c38c9433d7a5..99bd0c8e0471 100644
--- a/arch/arm/boot/dts/sama5d33ek.dts
+++ b/arch/arm/boot/dts/sama5d33ek.dts
@@ -7,8 +7,8 @@
7 * Licensed under GPLv2 or later. 7 * Licensed under GPLv2 or later.
8 */ 8 */
9/dts-v1/; 9/dts-v1/;
10/include/ "sama5d3xmb.dtsi" 10#include "sama5d3xmb.dtsi"
11/include/ "sama5d3xdm.dtsi" 11#include "sama5d3xdm.dtsi"
12 12
13/ { 13/ {
14 model = "Atmel SAMA5D33-EK"; 14 model = "Atmel SAMA5D33-EK";
diff --git a/arch/arm/boot/dts/sama5d34ek.dts b/arch/arm/boot/dts/sama5d34ek.dts
index 6bebfcdcb1d1..fb8ee11cf282 100644
--- a/arch/arm/boot/dts/sama5d34ek.dts
+++ b/arch/arm/boot/dts/sama5d34ek.dts
@@ -7,8 +7,8 @@
7 * Licensed under GPLv2 or later. 7 * Licensed under GPLv2 or later.
8 */ 8 */
9/dts-v1/; 9/dts-v1/;
10/include/ "sama5d3xmb.dtsi" 10#include "sama5d3xmb.dtsi"
11/include/ "sama5d3xdm.dtsi" 11#include "sama5d3xdm.dtsi"
12 12
13/ { 13/ {
14 model = "Atmel SAMA5D34-EK"; 14 model = "Atmel SAMA5D34-EK";
@@ -51,7 +51,7 @@
51 leds { 51 leds {
52 d3 { 52 d3 {
53 label = "d3"; 53 label = "d3";
54 gpios = <&pioE 24 0>; 54 gpios = <&pioE 24 GPIO_ACTIVE_HIGH>;
55 }; 55 };
56 }; 56 };
57 57
diff --git a/arch/arm/boot/dts/sama5d35ek.dts b/arch/arm/boot/dts/sama5d35ek.dts
index a488fc4e9777..509a53d9cc7b 100644
--- a/arch/arm/boot/dts/sama5d35ek.dts
+++ b/arch/arm/boot/dts/sama5d35ek.dts
@@ -7,7 +7,7 @@
7 * Licensed under GPLv2 or later. 7 * Licensed under GPLv2 or later.
8 */ 8 */
9/dts-v1/; 9/dts-v1/;
10/include/ "sama5d3xmb.dtsi" 10#include "sama5d3xmb.dtsi"
11 11
12/ { 12/ {
13 model = "Atmel SAMA5D35-EK"; 13 model = "Atmel SAMA5D35-EK";
@@ -48,7 +48,7 @@
48 48
49 pb_user1 { 49 pb_user1 {
50 label = "pb_user1"; 50 label = "pb_user1";
51 gpios = <&pioE 27 0>; 51 gpios = <&pioE 27 GPIO_ACTIVE_HIGH>;
52 linux,code = <0x100>; 52 linux,code = <0x100>;
53 gpio-key,wakeup; 53 gpio-key,wakeup;
54 }; 54 };
diff --git a/arch/arm/boot/dts/sama5d3xcm.dtsi b/arch/arm/boot/dts/sama5d3xcm.dtsi
index b336e7787cb3..1f8050813a54 100644
--- a/arch/arm/boot/dts/sama5d3xcm.dtsi
+++ b/arch/arm/boot/dts/sama5d3xcm.dtsi
@@ -6,7 +6,7 @@
6 * 6 *
7 * Licensed under GPLv2 or later. 7 * Licensed under GPLv2 or later.
8 */ 8 */
9/include/ "sama5d3.dtsi" 9#include "sama5d3.dtsi"
10 10
11/ { 11/ {
12 compatible = "atmel,samad3xcm", "atmel,sama5d3", "atmel,sama5"; 12 compatible = "atmel,samad3xcm", "atmel,sama5d3", "atmel,sama5";
@@ -89,7 +89,7 @@
89 89
90 d2 { 90 d2 {
91 label = "d2"; 91 label = "d2";
92 gpios = <&pioE 25 1>; /* PE25, conflicts with A25, RXD2 */ 92 gpios = <&pioE 25 GPIO_ACTIVE_LOW>; /* PE25, conflicts with A25, RXD2 */
93 }; 93 };
94 }; 94 };
95}; 95};
diff --git a/arch/arm/boot/dts/sama5d3xdm.dtsi b/arch/arm/boot/dts/sama5d3xdm.dtsi
index 4b8830eb2060..1c296d6b2f2a 100644
--- a/arch/arm/boot/dts/sama5d3xdm.dtsi
+++ b/arch/arm/boot/dts/sama5d3xdm.dtsi
@@ -33,7 +33,7 @@
33 board { 33 board {
34 pinctrl_qt1070_irq: qt1070_irq { 34 pinctrl_qt1070_irq: qt1070_irq {
35 atmel,pins = 35 atmel,pins =
36 <4 31 0x0 0x5>; /* PE31 GPIO with pull up deglith */ 36 <AT91_PIOE 31 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PE31 GPIO with pull up deglith */
37 }; 37 };
38 }; 38 };
39 }; 39 };
diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi
index 661d7ca9c309..8a9e05d8a4b8 100644
--- a/arch/arm/boot/dts/sama5d3xmb.dtsi
+++ b/arch/arm/boot/dts/sama5d3xmb.dtsi
@@ -6,7 +6,7 @@
6 * 6 *
7 * Licensed under GPLv2 or later. 7 * Licensed under GPLv2 or later.
8 */ 8 */
9/include/ "sama5d3xcm.dtsi" 9#include "sama5d3xcm.dtsi"
10 10
11/ { 11/ {
12 compatible = "atmel,sama5d3xmb", "atmel,sama5d3xcm", "atmel,sama5d3", "atmel,sama5"; 12 compatible = "atmel,sama5d3xmb", "atmel,sama5d3xcm", "atmel,sama5d3", "atmel,sama5";
@@ -20,7 +20,7 @@
20 slot@0 { 20 slot@0 {
21 reg = <0>; 21 reg = <0>;
22 bus-width = <4>; 22 bus-width = <4>;
23 cd-gpios = <&pioD 17 0>; 23 cd-gpios = <&pioD 17 GPIO_ACTIVE_HIGH>;
24 }; 24 };
25 }; 25 };
26 26
@@ -62,7 +62,7 @@
62 slot@0 { 62 slot@0 {
63 reg = <0>; 63 reg = <0>;
64 bus-width = <4>; 64 bus-width = <4>;
65 cd-gpios = <&pioD 18 0>; 65 cd-gpios = <&pioD 18 GPIO_ACTIVE_HIGH>;
66 }; 66 };
67 }; 67 };
68 68
@@ -87,32 +87,32 @@
87 board { 87 board {
88 pinctrl_mmc0_cd: mmc0_cd { 88 pinctrl_mmc0_cd: mmc0_cd {
89 atmel,pins = 89 atmel,pins =
90 <3 17 0x0 0x5>; /* PD17 GPIO with pullup deglitch */ 90 <AT91_PIOD 17 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PD17 GPIO with pullup deglitch */
91 }; 91 };
92 92
93 pinctrl_mmc1_cd: mmc1_cd { 93 pinctrl_mmc1_cd: mmc1_cd {
94 atmel,pins = 94 atmel,pins =
95 <3 18 0x0 0x5>; /* PD18 GPIO with pullup deglitch */ 95 <AT91_PIOD 18 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PD18 GPIO with pullup deglitch */
96 }; 96 };
97 97
98 pinctrl_pck0_as_audio_mck: pck0_as_audio_mck { 98 pinctrl_pck0_as_audio_mck: pck0_as_audio_mck {
99 atmel,pins = 99 atmel,pins =
100 <3 30 0x2 0x0>; /* PD30 periph B */ 100 <AT91_PIOD 30 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PD30 periph B */
101 }; 101 };
102 102
103 pinctrl_isi_reset: isi_reset-0 { 103 pinctrl_isi_reset: isi_reset-0 {
104 atmel,pins = 104 atmel,pins =
105 <4 24 0x0 0x0>; /* PE24 gpio */ 105 <AT91_PIOE 24 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>; /* PE24 gpio */
106 }; 106 };
107 107
108 pinctrl_isi_power: isi_power-0 { 108 pinctrl_isi_power: isi_power-0 {
109 atmel,pins = 109 atmel,pins =
110 <4 29 0x0 0x0>; /* PE29 gpio */ 110 <AT91_PIOE 29 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>; /* PE29 gpio */
111 }; 111 };
112 112
113 pinctrl_usba_vbus: usba_vbus { 113 pinctrl_usba_vbus: usba_vbus {
114 atmel,pins = 114 atmel,pins =
115 <3 29 0x0 0x4>; /* PD29 GPIO with deglitch */ 115 <AT91_PIOD 29 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>; /* PD29 GPIO with deglitch */
116 }; 116 };
117 }; 117 };
118 }; 118 };
@@ -127,7 +127,7 @@
127 }; 127 };
128 128
129 usb0: gadget@00500000 { 129 usb0: gadget@00500000 {
130 atmel,vbus-gpio = <&pioD 29 0>; 130 atmel,vbus-gpio = <&pioD 29 GPIO_ACTIVE_HIGH>;
131 pinctrl-names = "default"; 131 pinctrl-names = "default";
132 pinctrl-0 = <&pinctrl_usba_vbus>; 132 pinctrl-0 = <&pinctrl_usba_vbus>;
133 status = "okay"; 133 status = "okay";
@@ -135,9 +135,9 @@
135 135
136 usb1: ohci@00600000 { 136 usb1: ohci@00600000 {
137 num-ports = <3>; 137 num-ports = <3>;
138 atmel,vbus-gpio = <&pioD 25 0 138 atmel,vbus-gpio = <&pioD 25 GPIO_ACTIVE_HIGH
139 &pioD 26 1 139 &pioD 26 GPIO_ACTIVE_LOW
140 &pioD 27 1 140 &pioD 27 GPIO_ACTIVE_LOW
141 >; 141 >;
142 status = "okay"; 142 status = "okay";
143 }; 143 };
diff --git a/arch/arm/boot/dts/tny_a9260.dts b/arch/arm/boot/dts/tny_a9260.dts
index 367a16dcd5ef..dabe232216b4 100644
--- a/arch/arm/boot/dts/tny_a9260.dts
+++ b/arch/arm/boot/dts/tny_a9260.dts
@@ -6,8 +6,8 @@
6 * Licensed under GPLv2. 6 * Licensed under GPLv2.
7 */ 7 */
8/dts-v1/; 8/dts-v1/;
9/include/ "at91sam9260.dtsi" 9#include "at91sam9260.dtsi"
10/include/ "tny_a9260_common.dtsi" 10#include "tny_a9260_common.dtsi"
11 11
12/ { 12/ {
13 model = "Calao TNY A9260"; 13 model = "Calao TNY A9260";
diff --git a/arch/arm/boot/dts/tny_a9263.dts b/arch/arm/boot/dts/tny_a9263.dts
index dee9c571306b..0751a6a979a8 100644
--- a/arch/arm/boot/dts/tny_a9263.dts
+++ b/arch/arm/boot/dts/tny_a9263.dts
@@ -6,7 +6,7 @@
6 * Licensed under GPLv2 only 6 * Licensed under GPLv2 only
7 */ 7 */
8/dts-v1/; 8/dts-v1/;
9/include/ "at91sam9263.dtsi" 9#include "at91sam9263.dtsi"
10 10
11/ { 11/ {
12 model = "Calao TNY A9263"; 12 model = "Calao TNY A9263";
@@ -38,7 +38,7 @@
38 }; 38 };
39 39
40 usb1: gadget@fff78000 { 40 usb1: gadget@fff78000 {
41 atmel,vbus-gpio = <&pioB 11 0>; 41 atmel,vbus-gpio = <&pioB 11 GPIO_ACTIVE_HIGH>;
42 status = "okay"; 42 status = "okay";
43 }; 43 };
44 }; 44 };
diff --git a/arch/arm/boot/dts/tny_a9g20.dts b/arch/arm/boot/dts/tny_a9g20.dts
index e1ab64c72dba..8456d70bb42b 100644
--- a/arch/arm/boot/dts/tny_a9g20.dts
+++ b/arch/arm/boot/dts/tny_a9g20.dts
@@ -6,8 +6,8 @@
6 * Licensed under GPLv2. 6 * Licensed under GPLv2.
7 */ 7 */
8/dts-v1/; 8/dts-v1/;
9/include/ "at91sam9g20.dtsi" 9#include "at91sam9g20.dtsi"
10/include/ "tny_a9260_common.dtsi" 10#include "tny_a9260_common.dtsi"
11 11
12/ { 12/ {
13 model = "Calao TNY A9G20"; 13 model = "Calao TNY A9G20";
diff --git a/arch/arm/boot/dts/usb_a9260.dts b/arch/arm/boot/dts/usb_a9260.dts
index 296216058c11..a604107eb474 100644
--- a/arch/arm/boot/dts/usb_a9260.dts
+++ b/arch/arm/boot/dts/usb_a9260.dts
@@ -6,8 +6,8 @@
6 * Licensed under GPLv2 or later. 6 * Licensed under GPLv2 or later.
7 */ 7 */
8/dts-v1/; 8/dts-v1/;
9/include/ "at91sam9260.dtsi" 9#include "at91sam9260.dtsi"
10/include/ "usb_a9260_common.dtsi" 10#include "usb_a9260_common.dtsi"
11 11
12/ { 12/ {
13 model = "Calao USB A9260"; 13 model = "Calao USB A9260";
diff --git a/arch/arm/boot/dts/usb_a9260_common.dtsi b/arch/arm/boot/dts/usb_a9260_common.dtsi
index e70d229baef5..285977682cf3 100644
--- a/arch/arm/boot/dts/usb_a9260_common.dtsi
+++ b/arch/arm/boot/dts/usb_a9260_common.dtsi
@@ -30,7 +30,7 @@
30 }; 30 };
31 31
32 usb1: gadget@fffa4000 { 32 usb1: gadget@fffa4000 {
33 atmel,vbus-gpio = <&pioC 5 0>; 33 atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>;
34 status = "okay"; 34 status = "okay";
35 }; 35 };
36 }; 36 };
@@ -93,7 +93,7 @@
93 93
94 user_led { 94 user_led {
95 label = "user_led"; 95 label = "user_led";
96 gpios = <&pioB 21 1>; 96 gpios = <&pioB 21 GPIO_ACTIVE_LOW>;
97 linux,default-trigger = "heartbeat"; 97 linux,default-trigger = "heartbeat";
98 }; 98 };
99 }; 99 };
@@ -105,7 +105,7 @@
105 105
106 user_pb { 106 user_pb {
107 label = "user_pb"; 107 label = "user_pb";
108 gpios = <&pioB 10 1>; 108 gpios = <&pioB 10 GPIO_ACTIVE_LOW>;
109 linux,code = <28>; 109 linux,code = <28>;
110 gpio-key,wakeup; 110 gpio-key,wakeup;
111 }; 111 };
diff --git a/arch/arm/boot/dts/usb_a9263.dts b/arch/arm/boot/dts/usb_a9263.dts
index 6fe05ccb6203..f8ec36cb036b 100644
--- a/arch/arm/boot/dts/usb_a9263.dts
+++ b/arch/arm/boot/dts/usb_a9263.dts
@@ -6,7 +6,7 @@
6 * Licensed under GPLv2 only 6 * Licensed under GPLv2 only
7 */ 7 */
8/dts-v1/; 8/dts-v1/;
9/include/ "at91sam9263.dtsi" 9#include "at91sam9263.dtsi"
10 10
11/ { 11/ {
12 model = "Calao USB A9263"; 12 model = "Calao USB A9263";
@@ -43,7 +43,7 @@
43 }; 43 };
44 44
45 usb1: gadget@fff78000 { 45 usb1: gadget@fff78000 {
46 atmel,vbus-gpio = <&pioB 11 0>; 46 atmel,vbus-gpio = <&pioB 11 GPIO_ACTIVE_HIGH>;
47 status = "okay"; 47 status = "okay";
48 }; 48 };
49 49
@@ -107,7 +107,7 @@
107 107
108 user_led { 108 user_led {
109 label = "user_led"; 109 label = "user_led";
110 gpios = <&pioB 21 0>; 110 gpios = <&pioB 21 GPIO_ACTIVE_HIGH>;
111 linux,default-trigger = "heartbeat"; 111 linux,default-trigger = "heartbeat";
112 }; 112 };
113 }; 113 };
@@ -119,7 +119,7 @@
119 119
120 user_pb { 120 user_pb {
121 label = "user_pb"; 121 label = "user_pb";
122 gpios = <&pioB 10 1>; 122 gpios = <&pioB 10 GPIO_ACTIVE_LOW>;
123 linux,code = <28>; 123 linux,code = <28>;
124 gpio-key,wakeup; 124 gpio-key,wakeup;
125 }; 125 };
diff --git a/arch/arm/boot/dts/usb_a9g20-dab-mmx.dtsi b/arch/arm/boot/dts/usb_a9g20-dab-mmx.dtsi
index ad3eca17c436..5b0ffc1a0b24 100644
--- a/arch/arm/boot/dts/usb_a9g20-dab-mmx.dtsi
+++ b/arch/arm/boot/dts/usb_a9g20-dab-mmx.dtsi
@@ -28,39 +28,39 @@
28 28
29 user_led1 { 29 user_led1 {
30 label = "user_led1"; 30 label = "user_led1";
31 gpios = <&pioB 20 1>; 31 gpios = <&pioB 20 GPIO_ACTIVE_LOW>;
32 }; 32 };
33 33
34/* 34/*
35* led already used by mother board but active as high 35* led already used by mother board but active as high
36* user_led2 { 36* user_led2 {
37* label = "user_led2"; 37* label = "user_led2";
38* gpios = <&pioB 21 1>; 38* gpios = <&pioB 21 GPIO_ACTIVE_LOW>;
39* }; 39* };
40*/ 40*/
41 user_led3 { 41 user_led3 {
42 label = "user_led3"; 42 label = "user_led3";
43 gpios = <&pioB 22 1>; 43 gpios = <&pioB 22 GPIO_ACTIVE_LOW>;
44 }; 44 };
45 45
46 user_led4 { 46 user_led4 {
47 label = "user_led4"; 47 label = "user_led4";
48 gpios = <&pioB 23 1>; 48 gpios = <&pioB 23 GPIO_ACTIVE_LOW>;
49 }; 49 };
50 50
51 red { 51 red {
52 label = "red"; 52 label = "red";
53 gpios = <&pioB 24 1>; 53 gpios = <&pioB 24 GPIO_ACTIVE_LOW>;
54 }; 54 };
55 55
56 orange { 56 orange {
57 label = "orange"; 57 label = "orange";
58 gpios = <&pioB 30 1>; 58 gpios = <&pioB 30 GPIO_ACTIVE_LOW>;
59 }; 59 };
60 60
61 green { 61 green {
62 label = "green"; 62 label = "green";
63 gpios = <&pioB 31 1>; 63 gpios = <&pioB 31 GPIO_ACTIVE_LOW>;
64 }; 64 };
65 }; 65 };
66 66
@@ -71,25 +71,25 @@
71 71
72 user_pb1 { 72 user_pb1 {
73 label = "user_pb1"; 73 label = "user_pb1";
74 gpios = <&pioB 25 1>; 74 gpios = <&pioB 25 GPIO_ACTIVE_LOW>;
75 linux,code = <0x100>; 75 linux,code = <0x100>;
76 }; 76 };
77 77
78 user_pb2 { 78 user_pb2 {
79 label = "user_pb2"; 79 label = "user_pb2";
80 gpios = <&pioB 13 1>; 80 gpios = <&pioB 13 GPIO_ACTIVE_LOW>;
81 linux,code = <0x101>; 81 linux,code = <0x101>;
82 }; 82 };
83 83
84 user_pb3 { 84 user_pb3 {
85 label = "user_pb3"; 85 label = "user_pb3";
86 gpios = <&pioA 26 1>; 86 gpios = <&pioA 26 GPIO_ACTIVE_LOW>;
87 linux,code = <0x102>; 87 linux,code = <0x102>;
88 }; 88 };
89 89
90 user_pb4 { 90 user_pb4 {
91 label = "user_pb4"; 91 label = "user_pb4";
92 gpios = <&pioC 9 1>; 92 gpios = <&pioC 9 GPIO_ACTIVE_LOW>;
93 linux,code = <0x103>; 93 linux,code = <0x103>;
94 }; 94 };
95 }; 95 };
diff --git a/arch/arm/boot/dts/usb_a9g20.dts b/arch/arm/boot/dts/usb_a9g20.dts
index 2dacb16ce4ae..c979c06cf697 100644
--- a/arch/arm/boot/dts/usb_a9g20.dts
+++ b/arch/arm/boot/dts/usb_a9g20.dts
@@ -6,8 +6,8 @@
6 * Licensed under GPLv2 or later. 6 * Licensed under GPLv2 or later.
7 */ 7 */
8/dts-v1/; 8/dts-v1/;
9/include/ "at91sam9g20.dtsi" 9#include "at91sam9g20.dtsi"
10/include/ "usb_a9260_common.dtsi" 10#include "usb_a9260_common.dtsi"
11 11
12/ { 12/ {
13 model = "Calao USB A9G20"; 13 model = "Calao USB A9G20";
diff --git a/arch/arm/configs/at91_dt_defconfig b/arch/arm/configs/at91_dt_defconfig
index 047f2a415309..a8800d361805 100644
--- a/arch/arm/configs/at91_dt_defconfig
+++ b/arch/arm/configs/at91_dt_defconfig
@@ -1,4 +1,3 @@
1CONFIG_EXPERIMENTAL=y
2# CONFIG_LOCALVERSION_AUTO is not set 1# CONFIG_LOCALVERSION_AUTO is not set
3# CONFIG_SWAP is not set 2# CONFIG_SWAP is not set
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
@@ -25,8 +24,6 @@ CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
25CONFIG_AT91_TIMER_HZ=128 24CONFIG_AT91_TIMER_HZ=128
26CONFIG_AEABI=y 25CONFIG_AEABI=y
27# CONFIG_OABI_COMPAT is not set 26# CONFIG_OABI_COMPAT is not set
28CONFIG_LEDS=y
29CONFIG_LEDS_CPU=y
30CONFIG_UACCESS_WITH_MEMCPY=y 27CONFIG_UACCESS_WITH_MEMCPY=y
31CONFIG_ZBOOT_ROM_TEXT=0x0 28CONFIG_ZBOOT_ROM_TEXT=0x0
32CONFIG_ZBOOT_ROM_BSS=0x0 29CONFIG_ZBOOT_ROM_BSS=0x0
@@ -42,6 +39,9 @@ CONFIG_UNIX=y
42CONFIG_INET=y 39CONFIG_INET=y
43CONFIG_IP_MULTICAST=y 40CONFIG_IP_MULTICAST=y
44CONFIG_IP_PNP=y 41CONFIG_IP_PNP=y
42CONFIG_IP_PNP_DHCP=y
43CONFIG_IP_PNP_BOOTP=y
44CONFIG_IP_PNP_RARP=y
45# CONFIG_INET_XFRM_MODE_TRANSPORT is not set 45# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
46# CONFIG_INET_XFRM_MODE_TUNNEL is not set 46# CONFIG_INET_XFRM_MODE_TUNNEL is not set
47# CONFIG_INET_XFRM_MODE_BEET is not set 47# CONFIG_INET_XFRM_MODE_BEET is not set
@@ -51,7 +51,8 @@ CONFIG_IPV6=y
51# CONFIG_INET6_XFRM_MODE_TUNNEL is not set 51# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
52# CONFIG_INET6_XFRM_MODE_BEET is not set 52# CONFIG_INET6_XFRM_MODE_BEET is not set
53CONFIG_IPV6_SIT_6RD=y 53CONFIG_IPV6_SIT_6RD=y
54# CONFIG_WIRELESS is not set 54CONFIG_CFG80211=y
55CONFIG_MAC80211=y
55CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 56CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
56CONFIG_DEVTMPFS=y 57CONFIG_DEVTMPFS=y
57CONFIG_DEVTMPFS_MOUNT=y 58CONFIG_DEVTMPFS_MOUNT=y
@@ -72,7 +73,6 @@ CONFIG_BLK_DEV_RAM_COUNT=4
72CONFIG_BLK_DEV_RAM_SIZE=8192 73CONFIG_BLK_DEV_RAM_SIZE=8192
73CONFIG_ATMEL_PWM=y 74CONFIG_ATMEL_PWM=y
74CONFIG_ATMEL_TCLIB=y 75CONFIG_ATMEL_TCLIB=y
75CONFIG_EEPROM_93CX6=m
76CONFIG_SCSI=y 76CONFIG_SCSI=y
77CONFIG_BLK_DEV_SD=y 77CONFIG_BLK_DEV_SD=y
78CONFIG_SCSI_MULTI_LUN=y 78CONFIG_SCSI_MULTI_LUN=y
@@ -81,7 +81,6 @@ CONFIG_NETDEVICES=y
81CONFIG_MII=y 81CONFIG_MII=y
82CONFIG_MACB=y 82CONFIG_MACB=y
83# CONFIG_NET_VENDOR_BROADCOM is not set 83# CONFIG_NET_VENDOR_BROADCOM is not set
84# CONFIG_NET_VENDOR_CHELSIO is not set
85# CONFIG_NET_VENDOR_FARADAY is not set 84# CONFIG_NET_VENDOR_FARADAY is not set
86# CONFIG_NET_VENDOR_INTEL is not set 85# CONFIG_NET_VENDOR_INTEL is not set
87# CONFIG_NET_VENDOR_MARVELL is not set 86# CONFIG_NET_VENDOR_MARVELL is not set
@@ -92,7 +91,23 @@ CONFIG_MACB=y
92# CONFIG_NET_VENDOR_STMICRO is not set 91# CONFIG_NET_VENDOR_STMICRO is not set
93CONFIG_DAVICOM_PHY=y 92CONFIG_DAVICOM_PHY=y
94CONFIG_MICREL_PHY=y 93CONFIG_MICREL_PHY=y
95# CONFIG_WLAN is not set 94CONFIG_RTL8187=m
95CONFIG_LIBERTAS=m
96CONFIG_LIBERTAS_SDIO=m
97CONFIG_LIBERTAS_SPI=m
98CONFIG_RT2X00=m
99CONFIG_RT2500USB=m
100CONFIG_RT73USB=m
101CONFIG_RT2800USB=m
102CONFIG_RT2800USB_RT53XX=y
103CONFIG_RT2800USB_RT55XX=y
104CONFIG_RT2800USB_UNKNOWN=y
105CONFIG_RTLWIFI=m
106# CONFIG_RTLWIFI_DEBUG is not set
107CONFIG_RTL8192CU=m
108CONFIG_MWIFIEX=m
109CONFIG_MWIFIEX_SDIO=m
110CONFIG_MWIFIEX_USB=m
96CONFIG_INPUT_POLLDEV=y 111CONFIG_INPUT_POLLDEV=y
97# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 112# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
98CONFIG_INPUT_MOUSEDEV_SCREEN_X=480 113CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
@@ -112,13 +127,11 @@ CONFIG_I2C=y
112CONFIG_I2C_GPIO=y 127CONFIG_I2C_GPIO=y
113CONFIG_SPI=y 128CONFIG_SPI=y
114CONFIG_SPI_ATMEL=y 129CONFIG_SPI_ATMEL=y
115CONFIG_PINCTRL_AT91=y
116# CONFIG_HWMON is not set 130# CONFIG_HWMON is not set
117CONFIG_WATCHDOG=y 131CONFIG_WATCHDOG=y
118CONFIG_AT91SAM9X_WATCHDOG=y 132CONFIG_AT91SAM9X_WATCHDOG=y
119CONFIG_SSB=m 133CONFIG_SSB=m
120CONFIG_FB=y 134CONFIG_FB=y
121CONFIG_FB_MODE_HELPERS=y
122CONFIG_FB_ATMEL=y 135CONFIG_FB_ATMEL=y
123CONFIG_BACKLIGHT_LCD_SUPPORT=y 136CONFIG_BACKLIGHT_LCD_SUPPORT=y
124# CONFIG_LCD_CLASS_DEVICE is not set 137# CONFIG_LCD_CLASS_DEVICE is not set
@@ -132,11 +145,8 @@ CONFIG_FONT_8x8=y
132CONFIG_FONT_ACORN_8x8=y 145CONFIG_FONT_ACORN_8x8=y
133CONFIG_FONT_MINI_4x6=y 146CONFIG_FONT_MINI_4x6=y
134CONFIG_LOGO=y 147CONFIG_LOGO=y
135# CONFIG_HID_SUPPORT is not set
136CONFIG_USB=y 148CONFIG_USB=y
137CONFIG_USB_ANNOUNCE_NEW_DEVICES=y 149CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
138CONFIG_USB_DEVICEFS=y
139# CONFIG_USB_DEVICE_CLASS is not set
140CONFIG_USB_EHCI_HCD=y 150CONFIG_USB_EHCI_HCD=y
141CONFIG_USB_OHCI_HCD=y 151CONFIG_USB_OHCI_HCD=y
142CONFIG_USB_ACM=y 152CONFIG_USB_ACM=y
@@ -146,14 +156,9 @@ CONFIG_USB_SERIAL_GENERIC=y
146CONFIG_USB_SERIAL_FTDI_SIO=y 156CONFIG_USB_SERIAL_FTDI_SIO=y
147CONFIG_USB_SERIAL_PL2303=y 157CONFIG_USB_SERIAL_PL2303=y
148CONFIG_USB_GADGET=y 158CONFIG_USB_GADGET=y
149CONFIG_USB_AT91=m 159CONFIG_USB_AT91=y
150CONFIG_USB_ATMEL_USBA=m 160CONFIG_USB_ATMEL_USBA=y
151CONFIG_USB_ETH=m 161CONFIG_USB_G_SERIAL=y
152CONFIG_USB_GADGETFS=m
153CONFIG_USB_CDC_COMPOSITE=m
154CONFIG_USB_G_ACM_MS=m
155CONFIG_USB_G_MULTI=m
156CONFIG_USB_G_MULTI_CDC=y
157CONFIG_MMC=y 162CONFIG_MMC=y
158CONFIG_MMC_ATMELMCI=y 163CONFIG_MMC_ATMELMCI=y
159CONFIG_NEW_LEDS=y 164CONFIG_NEW_LEDS=y
@@ -168,16 +173,18 @@ CONFIG_RTC_DRV_AT91RM9200=y
168CONFIG_RTC_DRV_AT91SAM9=y 173CONFIG_RTC_DRV_AT91SAM9=y
169CONFIG_DMADEVICES=y 174CONFIG_DMADEVICES=y
170# CONFIG_IOMMU_SUPPORT is not set 175# CONFIG_IOMMU_SUPPORT is not set
171CONFIG_EXT2_FS=y 176CONFIG_EXT4_FS=y
172CONFIG_FANOTIFY=y 177CONFIG_FANOTIFY=y
173CONFIG_VFAT_FS=y 178CONFIG_VFAT_FS=y
174CONFIG_TMPFS=y 179CONFIG_TMPFS=y
180CONFIG_UBIFS_FS=y
181CONFIG_UBIFS_FS_ADVANCED_COMPR=y
175CONFIG_NFS_FS=y 182CONFIG_NFS_FS=y
176CONFIG_NFS_V3=y
177CONFIG_ROOT_NFS=y 183CONFIG_ROOT_NFS=y
178CONFIG_NLS_CODEPAGE_437=y 184CONFIG_NLS_CODEPAGE_437=y
179CONFIG_NLS_CODEPAGE_850=y 185CONFIG_NLS_CODEPAGE_850=y
180CONFIG_NLS_ISO8859_1=y 186CONFIG_NLS_ISO8859_1=y
187CONFIG_NLS_UTF8=y
181CONFIG_STRIP_ASM_SYMS=y 188CONFIG_STRIP_ASM_SYMS=y
182CONFIG_DEBUG_FS=y 189CONFIG_DEBUG_FS=y
183# CONFIG_SCHED_DEBUG is not set 190# CONFIG_SCHED_DEBUG is not set
@@ -192,7 +199,7 @@ CONFIG_CRYPTO_ARC4=y
192CONFIG_CRYPTO_USER_API_HASH=m 199CONFIG_CRYPTO_USER_API_HASH=m
193CONFIG_CRYPTO_USER_API_SKCIPHER=m 200CONFIG_CRYPTO_USER_API_SKCIPHER=m
194# CONFIG_CRYPTO_HW is not set 201# CONFIG_CRYPTO_HW is not set
195CONFIG_CRC_CCITT=m 202CONFIG_CRC_CCITT=y
196CONFIG_CRC_ITU_T=m 203CONFIG_CRC_ITU_T=y
197CONFIG_CRC7=m 204CONFIG_CRC7=m
198CONFIG_AVERAGE=y 205CONFIG_AVERAGE=y
diff --git a/arch/arm/configs/at91rm9200_defconfig b/arch/arm/configs/at91rm9200_defconfig
index 4ae57a34a582..8b099349c4b1 100644
--- a/arch/arm/configs/at91rm9200_defconfig
+++ b/arch/arm/configs/at91rm9200_defconfig
@@ -1,10 +1,12 @@
1CONFIG_EXPERIMENTAL=y
2# CONFIG_LOCALVERSION_AUTO is not set 1# CONFIG_LOCALVERSION_AUTO is not set
3# CONFIG_SWAP is not set 2# CONFIG_SWAP is not set
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
4CONFIG_NO_HZ=y
5CONFIG_HIGH_RES_TIMERS=y
5CONFIG_IKCONFIG=y 6CONFIG_IKCONFIG=y
6CONFIG_IKCONFIG_PROC=y 7CONFIG_IKCONFIG_PROC=y
7CONFIG_LOG_BUF_SHIFT=14 8CONFIG_LOG_BUF_SHIFT=14
9CONFIG_USER_NS=y
8CONFIG_BLK_DEV_INITRD=y 10CONFIG_BLK_DEV_INITRD=y
9CONFIG_MODULES=y 11CONFIG_MODULES=y
10CONFIG_MODULE_FORCE_LOAD=y 12CONFIG_MODULE_FORCE_LOAD=y
@@ -35,49 +37,37 @@ CONFIG_AT91_TIMER_HZ=100
35# CONFIG_ARM_THUMB is not set 37# CONFIG_ARM_THUMB is not set
36CONFIG_PCCARD=y 38CONFIG_PCCARD=y
37CONFIG_AT91_CF=y 39CONFIG_AT91_CF=y
38CONFIG_NO_HZ=y
39CONFIG_HIGH_RES_TIMERS=y
40CONFIG_PREEMPT=y
41CONFIG_AEABI=y 40CONFIG_AEABI=y
42CONFIG_LEDS=y 41# CONFIG_COMPACTION is not set
43CONFIG_LEDS_CPU=y
44CONFIG_ZBOOT_ROM_TEXT=0x10000000 42CONFIG_ZBOOT_ROM_TEXT=0x10000000
45CONFIG_ZBOOT_ROM_BSS=0x20040000 43CONFIG_ZBOOT_ROM_BSS=0x20040000
46CONFIG_KEXEC=y 44CONFIG_KEXEC=y
45CONFIG_AUTO_ZRELADDR=y
47CONFIG_FPE_NWFPE=y 46CONFIG_FPE_NWFPE=y
48CONFIG_BINFMT_MISC=y 47CONFIG_BINFMT_MISC=y
49CONFIG_NET=y 48CONFIG_NET=y
50CONFIG_PACKET=y 49CONFIG_PACKET=y
51CONFIG_UNIX=y 50CONFIG_UNIX=y
52CONFIG_XFRM_USER=m
53CONFIG_INET=y 51CONFIG_INET=y
54CONFIG_IP_MULTICAST=y 52CONFIG_IP_MULTICAST=y
55CONFIG_IP_PNP=y 53CONFIG_IP_PNP=y
56CONFIG_IP_PNP_DHCP=y 54CONFIG_IP_PNP_DHCP=y
57CONFIG_IP_PNP_BOOTP=y 55CONFIG_IP_PNP_BOOTP=y
58CONFIG_NET_IPIP=m 56# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
59CONFIG_INET_AH=m 57# CONFIG_INET_XFRM_MODE_TUNNEL is not set
60CONFIG_INET_ESP=m 58# CONFIG_INET_XFRM_MODE_BEET is not set
61CONFIG_INET_IPCOMP=m 59# CONFIG_INET_DIAG is not set
62CONFIG_INET_XFRM_MODE_TRANSPORT=m 60CONFIG_IPV6=y
63CONFIG_INET_XFRM_MODE_TUNNEL=m
64CONFIG_INET_XFRM_MODE_BEET=m
65CONFIG_IPV6_PRIVACY=y 61CONFIG_IPV6_PRIVACY=y
66CONFIG_IPV6_ROUTER_PREF=y 62CONFIG_IPV6_ROUTER_PREF=y
67CONFIG_IPV6_ROUTE_INFO=y 63CONFIG_IPV6_ROUTE_INFO=y
68CONFIG_INET6_AH=m
69CONFIG_INET6_ESP=m
70CONFIG_INET6_IPCOMP=m
71CONFIG_IPV6_MIP6=m
72CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
73CONFIG_IPV6_TUNNEL=m
74CONFIG_BRIDGE=m
75CONFIG_VLAN_8021Q=m
76CONFIG_BT=m
77CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 64CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
65CONFIG_DEVTMPFS=y
66CONFIG_DEVTMPFS_MOUNT=y
67# CONFIG_STANDALONE is not set
68# CONFIG_PREVENT_FIRMWARE_BUILD is not set
78CONFIG_MTD=y 69CONFIG_MTD=y
79CONFIG_MTD_CMDLINE_PARTS=y 70CONFIG_MTD_CMDLINE_PARTS=y
80CONFIG_MTD_AFS_PARTS=y
81CONFIG_MTD_CHAR=y 71CONFIG_MTD_CHAR=y
82CONFIG_MTD_BLOCK=y 72CONFIG_MTD_BLOCK=y
83CONFIG_MTD_CFI=y 73CONFIG_MTD_CFI=y
@@ -94,55 +84,21 @@ CONFIG_MTD_NAND_PLATFORM=y
94CONFIG_MTD_UBI=y 84CONFIG_MTD_UBI=y
95CONFIG_MTD_UBI_GLUEBI=y 85CONFIG_MTD_UBI_GLUEBI=y
96CONFIG_BLK_DEV_LOOP=y 86CONFIG_BLK_DEV_LOOP=y
97CONFIG_BLK_DEV_NBD=y
98CONFIG_BLK_DEV_RAM=y 87CONFIG_BLK_DEV_RAM=y
99CONFIG_BLK_DEV_RAM_SIZE=8192 88CONFIG_BLK_DEV_RAM_SIZE=8192
100CONFIG_SCSI=y
101CONFIG_BLK_DEV_SD=y
102CONFIG_BLK_DEV_SR=m
103CONFIG_BLK_DEV_SR_VENDOR=y
104CONFIG_CHR_DEV_SG=m
105CONFIG_SCSI_MULTI_LUN=y
106# CONFIG_SCSI_LOWLEVEL is not set
107CONFIG_NETDEVICES=y 89CONFIG_NETDEVICES=y
108CONFIG_TUN=m 90CONFIG_MII=y
109CONFIG_ARM_AT91_ETHER=y 91CONFIG_ARM_AT91_ETHER=y
110CONFIG_PHYLIB=y
111CONFIG_DAVICOM_PHY=y 92CONFIG_DAVICOM_PHY=y
112CONFIG_SMSC_PHY=y 93CONFIG_SMSC_PHY=y
113CONFIG_MICREL_PHY=y 94CONFIG_MICREL_PHY=y
114CONFIG_PPP=y 95# CONFIG_WLAN is not set
115CONFIG_PPP_BSDCOMP=y 96# CONFIG_INPUT_MOUSEDEV is not set
116CONFIG_PPP_DEFLATE=y
117CONFIG_PPP_FILTER=y
118CONFIG_PPP_MPPE=m
119CONFIG_PPP_MULTILINK=y
120CONFIG_PPPOE=m
121CONFIG_PPP_ASYNC=y
122CONFIG_SLIP=m
123CONFIG_SLIP_COMPRESSED=y
124CONFIG_SLIP_SMART=y
125CONFIG_SLIP_MODE_SLIP6=y
126CONFIG_USB_CATC=m
127CONFIG_USB_KAWETH=m
128CONFIG_USB_PEGASUS=m
129CONFIG_USB_RTL8150=m
130CONFIG_USB_USBNET=m
131CONFIG_USB_NET_DM9601=m
132CONFIG_USB_NET_GL620A=m
133CONFIG_USB_NET_PLUSB=m
134CONFIG_USB_NET_RNDIS_HOST=m
135CONFIG_USB_ALI_M5632=y
136CONFIG_USB_AN2720=y
137CONFIG_USB_EPSON2888=y
138# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
139CONFIG_INPUT_MOUSEDEV_SCREEN_X=640
140CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480
141CONFIG_INPUT_EVDEV=y 97CONFIG_INPUT_EVDEV=y
142CONFIG_KEYBOARD_GPIO=y 98CONFIG_KEYBOARD_GPIO=y
143# CONFIG_INPUT_MOUSE is not set 99# CONFIG_INPUT_MOUSE is not set
144CONFIG_INPUT_TOUCHSCREEN=y 100CONFIG_INPUT_TOUCHSCREEN=y
145CONFIG_LEGACY_PTY_COUNT=32 101# CONFIG_LEGACY_PTYS is not set
146CONFIG_SERIAL_ATMEL=y 102CONFIG_SERIAL_ATMEL=y
147CONFIG_SERIAL_ATMEL_CONSOLE=y 103CONFIG_SERIAL_ATMEL_CONSOLE=y
148CONFIG_HW_RANDOM=y 104CONFIG_HW_RANDOM=y
@@ -151,38 +107,8 @@ CONFIG_I2C_CHARDEV=y
151CONFIG_I2C_GPIO=y 107CONFIG_I2C_GPIO=y
152CONFIG_SPI=y 108CONFIG_SPI=y
153CONFIG_SPI_ATMEL=y 109CONFIG_SPI_ATMEL=y
154CONFIG_SPI_BITBANG=y
155CONFIG_GPIO_SYSFS=y 110CONFIG_GPIO_SYSFS=y
156CONFIG_HWMON=m 111# CONFIG_HWMON is not set
157CONFIG_SENSORS_ADM1021=m
158CONFIG_SENSORS_ADM1025=m
159CONFIG_SENSORS_ADM1026=m
160CONFIG_SENSORS_ADM1029=m
161CONFIG_SENSORS_ADM1031=m
162CONFIG_SENSORS_ADM9240=m
163CONFIG_SENSORS_DS1621=m
164CONFIG_SENSORS_GL518SM=m
165CONFIG_SENSORS_GL520SM=m
166CONFIG_SENSORS_IT87=m
167CONFIG_SENSORS_LM63=m
168CONFIG_SENSORS_LM73=m
169CONFIG_SENSORS_LM75=m
170CONFIG_SENSORS_LM77=m
171CONFIG_SENSORS_LM78=m
172CONFIG_SENSORS_LM80=m
173CONFIG_SENSORS_LM83=m
174CONFIG_SENSORS_LM85=m
175CONFIG_SENSORS_LM87=m
176CONFIG_SENSORS_LM90=m
177CONFIG_SENSORS_LM92=m
178CONFIG_SENSORS_MAX1619=m
179CONFIG_SENSORS_PCF8591=m
180CONFIG_SENSORS_SMSC47B397=m
181CONFIG_SENSORS_W83781D=m
182CONFIG_SENSORS_W83791D=m
183CONFIG_SENSORS_W83792D=m
184CONFIG_SENSORS_W83793=m
185CONFIG_SENSORS_W83L785TS=m
186CONFIG_WATCHDOG=y 112CONFIG_WATCHDOG=y
187CONFIG_WATCHDOG_NOWAYOUT=y 113CONFIG_WATCHDOG_NOWAYOUT=y
188CONFIG_AT91RM9200_WATCHDOG=y 114CONFIG_AT91RM9200_WATCHDOG=y
@@ -194,43 +120,14 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
194CONFIG_LCD_CLASS_DEVICE=y 120CONFIG_LCD_CLASS_DEVICE=y
195CONFIG_BACKLIGHT_CLASS_DEVICE=y 121CONFIG_BACKLIGHT_CLASS_DEVICE=y
196# CONFIG_BACKLIGHT_GENERIC is not set 122# CONFIG_BACKLIGHT_GENERIC is not set
197CONFIG_DISPLAY_SUPPORT=y
198CONFIG_FRAMEBUFFER_CONSOLE=y 123CONFIG_FRAMEBUFFER_CONSOLE=y
199CONFIG_FONTS=y 124CONFIG_FONTS=y
200CONFIG_FONT_MINI_4x6=y
201CONFIG_LOGO=y 125CONFIG_LOGO=y
202# CONFIG_LOGO_LINUX_MONO is not set
203# CONFIG_LOGO_LINUX_VGA16 is not set
204CONFIG_USB=y 126CONFIG_USB=y
205CONFIG_USB_DEVICEFS=y
206# CONFIG_USB_DEVICE_CLASS is not set
207CONFIG_USB_MON=y
208CONFIG_USB_OHCI_HCD=y 127CONFIG_USB_OHCI_HCD=y
209CONFIG_USB_ACM=m
210CONFIG_USB_PRINTER=m
211CONFIG_USB_STORAGE=y
212CONFIG_USB_SERIAL=y
213CONFIG_USB_SERIAL_CONSOLE=y
214CONFIG_USB_SERIAL_GENERIC=y
215CONFIG_USB_SERIAL_FTDI_SIO=y
216CONFIG_USB_SERIAL_KEYSPAN=y
217CONFIG_USB_SERIAL_KEYSPAN_MPR=y
218CONFIG_USB_SERIAL_KEYSPAN_USA28=y
219CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
220CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
221CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
222CONFIG_USB_SERIAL_KEYSPAN_USA19=y
223CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
224CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
225CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
226CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
227CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
228CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
229CONFIG_USB_SERIAL_MCT_U232=y
230CONFIG_USB_SERIAL_PL2303=y
231CONFIG_USB_GADGET=y 128CONFIG_USB_GADGET=y
232CONFIG_USB_ETH=m 129CONFIG_USB_AT91=y
233CONFIG_USB_MASS_STORAGE=m 130CONFIG_USB_G_SERIAL=y
234CONFIG_MMC=y 131CONFIG_MMC=y
235CONFIG_MMC_ATMELMCI=y 132CONFIG_MMC_ATMELMCI=y
236CONFIG_NEW_LEDS=y 133CONFIG_NEW_LEDS=y
@@ -240,84 +137,27 @@ CONFIG_LEDS_TRIGGERS=y
240CONFIG_LEDS_TRIGGER_TIMER=y 137CONFIG_LEDS_TRIGGER_TIMER=y
241CONFIG_LEDS_TRIGGER_HEARTBEAT=y 138CONFIG_LEDS_TRIGGER_HEARTBEAT=y
242CONFIG_LEDS_TRIGGER_GPIO=y 139CONFIG_LEDS_TRIGGER_GPIO=y
243CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
244CONFIG_RTC_CLASS=y 140CONFIG_RTC_CLASS=y
245# CONFIG_RTC_HCTOSYS is not set
246CONFIG_RTC_DRV_DS1307=y
247CONFIG_RTC_DRV_PCF8563=y
248CONFIG_RTC_DRV_AT91RM9200=y 141CONFIG_RTC_DRV_AT91RM9200=y
249CONFIG_EXT2_FS=y 142CONFIG_EXT4_FS=y
250CONFIG_EXT2_FS_XATTR=y
251CONFIG_EXT3_FS=y
252# CONFIG_EXT3_FS_XATTR is not set
253CONFIG_REISERFS_FS=y
254CONFIG_AUTOFS4_FS=y 143CONFIG_AUTOFS4_FS=y
255CONFIG_ISO9660_FS=y
256CONFIG_JOLIET=y
257CONFIG_ZISOFS=y
258CONFIG_UDF_FS=y
259CONFIG_MSDOS_FS=y
260CONFIG_VFAT_FS=y 144CONFIG_VFAT_FS=y
261CONFIG_NTFS_FS=m
262CONFIG_TMPFS=y 145CONFIG_TMPFS=y
263CONFIG_CONFIGFS_FS=y 146CONFIG_UBIFS_FS=y
264CONFIG_JFFS2_FS=y 147CONFIG_UBIFS_FS_ADVANCED_COMPR=y
265CONFIG_JFFS2_SUMMARY=y
266CONFIG_JFFS2_COMPRESSION_OPTIONS=y
267CONFIG_JFFS2_LZO=y
268CONFIG_JFFS2_RUBIN=y
269CONFIG_CRAMFS=y
270CONFIG_MINIX_FS=y
271CONFIG_NFS_FS=y 148CONFIG_NFS_FS=y
272CONFIG_NFS_V3=y
273CONFIG_NFS_V3_ACL=y
274CONFIG_NFS_V4=y
275CONFIG_ROOT_NFS=y 149CONFIG_ROOT_NFS=y
276CONFIG_NFSD=y
277CONFIG_CIFS=m
278CONFIG_PARTITION_ADVANCED=y
279CONFIG_MAC_PARTITION=y
280CONFIG_NLS_CODEPAGE_437=y 150CONFIG_NLS_CODEPAGE_437=y
281CONFIG_NLS_CODEPAGE_737=m 151CONFIG_NLS_CODEPAGE_850=y
282CONFIG_NLS_CODEPAGE_775=m
283CONFIG_NLS_CODEPAGE_850=m
284CONFIG_NLS_CODEPAGE_852=m
285CONFIG_NLS_CODEPAGE_855=m
286CONFIG_NLS_CODEPAGE_857=m
287CONFIG_NLS_CODEPAGE_860=m
288CONFIG_NLS_CODEPAGE_861=m
289CONFIG_NLS_CODEPAGE_862=m
290CONFIG_NLS_CODEPAGE_863=m
291CONFIG_NLS_CODEPAGE_864=m
292CONFIG_NLS_CODEPAGE_865=m
293CONFIG_NLS_CODEPAGE_866=m
294CONFIG_NLS_CODEPAGE_869=m
295CONFIG_NLS_CODEPAGE_936=m
296CONFIG_NLS_CODEPAGE_950=m
297CONFIG_NLS_CODEPAGE_932=m
298CONFIG_NLS_CODEPAGE_949=m
299CONFIG_NLS_CODEPAGE_874=m
300CONFIG_NLS_ISO8859_8=m
301CONFIG_NLS_CODEPAGE_1250=m
302CONFIG_NLS_CODEPAGE_1251=m
303CONFIG_NLS_ASCII=m
304CONFIG_NLS_ISO8859_1=y 152CONFIG_NLS_ISO8859_1=y
305CONFIG_NLS_ISO8859_2=m
306CONFIG_NLS_ISO8859_3=m
307CONFIG_NLS_ISO8859_4=m
308CONFIG_NLS_ISO8859_5=m
309CONFIG_NLS_ISO8859_6=m
310CONFIG_NLS_ISO8859_7=m
311CONFIG_NLS_ISO8859_9=m
312CONFIG_NLS_ISO8859_13=m
313CONFIG_NLS_ISO8859_14=m
314CONFIG_NLS_ISO8859_15=m
315CONFIG_NLS_KOI8_R=m
316CONFIG_NLS_KOI8_U=m
317CONFIG_NLS_UTF8=y 153CONFIG_NLS_UTF8=y
318CONFIG_MAGIC_SYSRQ=y 154CONFIG_MAGIC_SYSRQ=y
319CONFIG_DEBUG_FS=y 155CONFIG_DEBUG_FS=y
320CONFIG_DEBUG_KERNEL=y 156CONFIG_DEBUG_KERNEL=y
321# CONFIG_FTRACE is not set 157# CONFIG_FTRACE is not set
158CONFIG_DEBUG_USER=y
159CONFIG_DEBUG_LL=y
160CONFIG_EARLY_PRINTK=y
322CONFIG_CRYPTO_PCBC=y 161CONFIG_CRYPTO_PCBC=y
323CONFIG_CRYPTO_SHA1=y 162CONFIG_CRYPTO_SHA1=y
163CONFIG_XZ_DEC_ARMTHUMB=y
diff --git a/arch/arm/configs/at91sam9g20_defconfig b/arch/arm/configs/at91sam9260_9g20_defconfig
index 892e8287ed73..f50c404f0d3f 100644
--- a/arch/arm/configs/at91sam9g20_defconfig
+++ b/arch/arm/configs/at91sam9260_9g20_defconfig
@@ -1,4 +1,3 @@
1CONFIG_EXPERIMENTAL=y
2# CONFIG_LOCALVERSION_AUTO is not set 1# CONFIG_LOCALVERSION_AUTO is not set
3# CONFIG_SWAP is not set 2# CONFIG_SWAP is not set
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
@@ -11,7 +10,15 @@ CONFIG_MODULE_UNLOAD=y
11# CONFIG_IOSCHED_DEADLINE is not set 10# CONFIG_IOSCHED_DEADLINE is not set
12# CONFIG_IOSCHED_CFQ is not set 11# CONFIG_IOSCHED_CFQ is not set
13CONFIG_ARCH_AT91=y 12CONFIG_ARCH_AT91=y
14CONFIG_ARCH_AT91SAM9G20=y 13CONFIG_ARCH_AT91SAM9260=y
14CONFIG_MACH_AT91SAM9260EK=y
15CONFIG_MACH_CAM60=y
16CONFIG_MACH_SAM9_L9260=y
17CONFIG_MACH_AFEB9260=y
18CONFIG_MACH_USB_A9260=y
19CONFIG_MACH_QIL_A9260=y
20CONFIG_MACH_CPU9260=y
21CONFIG_MACH_FLEXIBITY=y
15CONFIG_MACH_AT91SAM9G20EK=y 22CONFIG_MACH_AT91SAM9G20EK=y
16CONFIG_MACH_AT91SAM9G20EK_2MMC=y 23CONFIG_MACH_AT91SAM9G20EK_2MMC=y
17CONFIG_MACH_CPU9G20=y 24CONFIG_MACH_CPU9G20=y
@@ -20,10 +27,10 @@ CONFIG_MACH_PORTUXG20=y
20CONFIG_MACH_STAMP9G20=y 27CONFIG_MACH_STAMP9G20=y
21CONFIG_MACH_PCONTROL_G20=y 28CONFIG_MACH_PCONTROL_G20=y
22CONFIG_MACH_GSIA18S=y 29CONFIG_MACH_GSIA18S=y
23CONFIG_MACH_USB_A9G20=y
24CONFIG_MACH_SNAPPER_9260=y 30CONFIG_MACH_SNAPPER_9260=y
25CONFIG_MACH_AT91SAM9_DT=y 31CONFIG_MACH_AT91SAM9_DT=y
26CONFIG_AT91_PROGRAMMABLE_CLOCKS=y 32CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
33CONFIG_AT91_SLOW_CLOCK=y
27# CONFIG_ARM_THUMB is not set 34# CONFIG_ARM_THUMB is not set
28CONFIG_AEABI=y 35CONFIG_AEABI=y
29CONFIG_LEDS=y 36CONFIG_LEDS=y
@@ -33,12 +40,14 @@ CONFIG_ZBOOT_ROM_BSS=0x0
33CONFIG_ARM_APPENDED_DTB=y 40CONFIG_ARM_APPENDED_DTB=y
34CONFIG_ARM_ATAG_DTB_COMPAT=y 41CONFIG_ARM_ATAG_DTB_COMPAT=y
35CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw" 42CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw"
43CONFIG_AUTO_ZRELADDR=y
36CONFIG_FPE_NWFPE=y 44CONFIG_FPE_NWFPE=y
37CONFIG_NET=y 45CONFIG_NET=y
38CONFIG_PACKET=y 46CONFIG_PACKET=y
39CONFIG_UNIX=y 47CONFIG_UNIX=y
40CONFIG_INET=y 48CONFIG_INET=y
41CONFIG_IP_PNP=y 49CONFIG_IP_PNP=y
50CONFIG_IP_PNP_DHCP=y
42CONFIG_IP_PNP_BOOTP=y 51CONFIG_IP_PNP_BOOTP=y
43# CONFIG_INET_XFRM_MODE_TRANSPORT is not set 52# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
44# CONFIG_INET_XFRM_MODE_TUNNEL is not set 53# CONFIG_INET_XFRM_MODE_TUNNEL is not set
@@ -46,8 +55,11 @@ CONFIG_IP_PNP_BOOTP=y
46# CONFIG_INET_LRO is not set 55# CONFIG_INET_LRO is not set
47# CONFIG_IPV6 is not set 56# CONFIG_IPV6 is not set
48CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 57CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
58CONFIG_DEVTMPFS=y
59CONFIG_DEVTMPFS_MOUNT=y
49CONFIG_MTD=y 60CONFIG_MTD=y
50CONFIG_MTD_CMDLINE_PARTS=y 61CONFIG_MTD_CMDLINE_PARTS=y
62CONFIG_MTD_OF_PARTS=y
51CONFIG_MTD_CHAR=y 63CONFIG_MTD_CHAR=y
52CONFIG_MTD_BLOCK=y 64CONFIG_MTD_BLOCK=y
53CONFIG_MTD_DATAFLASH=y 65CONFIG_MTD_DATAFLASH=y
@@ -56,6 +68,8 @@ CONFIG_MTD_NAND_ATMEL=y
56CONFIG_BLK_DEV_LOOP=y 68CONFIG_BLK_DEV_LOOP=y
57CONFIG_BLK_DEV_RAM=y 69CONFIG_BLK_DEV_RAM=y
58CONFIG_BLK_DEV_RAM_SIZE=8192 70CONFIG_BLK_DEV_RAM_SIZE=8192
71CONFIG_MISC_DEVICES=y
72CONFIG_EEPROM_AT25=y
59CONFIG_SCSI=y 73CONFIG_SCSI=y
60CONFIG_BLK_DEV_SD=y 74CONFIG_BLK_DEV_SD=y
61CONFIG_SCSI_MULTI_LUN=y 75CONFIG_SCSI_MULTI_LUN=y
@@ -63,23 +77,36 @@ CONFIG_SCSI_MULTI_LUN=y
63CONFIG_NETDEVICES=y 77CONFIG_NETDEVICES=y
64CONFIG_MII=y 78CONFIG_MII=y
65CONFIG_MACB=y 79CONFIG_MACB=y
80# CONFIG_NET_VENDOR_BROADCOM is not set
81# CONFIG_NET_VENDOR_CHELSIO is not set
82# CONFIG_NET_VENDOR_FARADAY is not set
83# CONFIG_NET_VENDOR_INTEL is not set
84# CONFIG_NET_VENDOR_MARVELL is not set
85# CONFIG_NET_VENDOR_MICREL is not set
86# CONFIG_NET_VENDOR_MICROCHIP is not set
87# CONFIG_NET_VENDOR_NATSEMI is not set
88# CONFIG_NET_VENDOR_SEEQ is not set
89# CONFIG_NET_VENDOR_SMSC is not set
90# CONFIG_NET_VENDOR_STMICRO is not set
91CONFIG_SMSC_PHY=y
66# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 92# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
67CONFIG_INPUT_MOUSEDEV_SCREEN_X=320
68CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240
69CONFIG_INPUT_EVDEV=y
70# CONFIG_KEYBOARD_ATKBD is not set
71CONFIG_KEYBOARD_GPIO=y 93CONFIG_KEYBOARD_GPIO=y
72# CONFIG_INPUT_MOUSE is not set 94# CONFIG_INPUT_MOUSE is not set
73CONFIG_LEGACY_PTY_COUNT=16 95# CONFIG_SERIO is not set
74CONFIG_SERIAL_ATMEL=y 96CONFIG_SERIAL_ATMEL=y
75CONFIG_SERIAL_ATMEL_CONSOLE=y 97CONFIG_SERIAL_ATMEL_CONSOLE=y
76CONFIG_HW_RANDOM=y 98CONFIG_HW_RANDOM=y
77CONFIG_I2C=y 99CONFIG_I2C=y
100CONFIG_I2C_CHARDEV=y
78CONFIG_I2C_GPIO=y 101CONFIG_I2C_GPIO=y
79CONFIG_SPI=y 102CONFIG_SPI=y
80CONFIG_SPI_ATMEL=y 103CONFIG_SPI_ATMEL=y
81CONFIG_SPI_SPIDEV=y 104CONFIG_SPI_SPIDEV=y
105CONFIG_GPIO_SYSFS=y
82# CONFIG_HWMON is not set 106# CONFIG_HWMON is not set
107CONFIG_WATCHDOG=y
108CONFIG_WATCHDOG_NOWAYOUT=y
109CONFIG_AT91SAM9X_WATCHDOG=y
83CONFIG_SOUND=y 110CONFIG_SOUND=y
84CONFIG_SND=y 111CONFIG_SND=y
85CONFIG_SND_SEQUENCER=y 112CONFIG_SND_SEQUENCER=y
@@ -94,12 +121,11 @@ CONFIG_USB_MON=y
94CONFIG_USB_OHCI_HCD=y 121CONFIG_USB_OHCI_HCD=y
95CONFIG_USB_STORAGE=y 122CONFIG_USB_STORAGE=y
96CONFIG_USB_GADGET=y 123CONFIG_USB_GADGET=y
97CONFIG_USB_ZERO=m 124CONFIG_USB_AT91=y
98CONFIG_USB_GADGETFS=m 125CONFIG_USB_G_SERIAL=y
99CONFIG_USB_MASS_STORAGE=m
100CONFIG_USB_G_SERIAL=m
101CONFIG_MMC=y 126CONFIG_MMC=y
102CONFIG_MMC_ATMELMCI=m 127CONFIG_MMC_ATMELMCI=y
128CONFIG_MMC_SPI=y
103CONFIG_NEW_LEDS=y 129CONFIG_NEW_LEDS=y
104CONFIG_LEDS_CLASS=y 130CONFIG_LEDS_CLASS=y
105CONFIG_LEDS_GPIO=y 131CONFIG_LEDS_GPIO=y
@@ -109,15 +135,12 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y
109CONFIG_RTC_CLASS=y 135CONFIG_RTC_CLASS=y
110CONFIG_RTC_DRV_RV3029C2=y 136CONFIG_RTC_DRV_RV3029C2=y
111CONFIG_RTC_DRV_AT91SAM9=y 137CONFIG_RTC_DRV_AT91SAM9=y
112CONFIG_EXT2_FS=y 138CONFIG_EXT4_FS=y
113CONFIG_MSDOS_FS=y
114CONFIG_VFAT_FS=y 139CONFIG_VFAT_FS=y
115CONFIG_TMPFS=y 140CONFIG_TMPFS=y
116CONFIG_JFFS2_FS=y 141CONFIG_UBIFS_FS=y
117CONFIG_JFFS2_SUMMARY=y 142CONFIG_UBIFS_FS_ADVANCED_COMPR=y
118CONFIG_CRAMFS=y
119CONFIG_NFS_FS=y 143CONFIG_NFS_FS=y
120CONFIG_NFS_V3=y
121CONFIG_ROOT_NFS=y 144CONFIG_ROOT_NFS=y
122CONFIG_NLS_CODEPAGE_437=y 145CONFIG_NLS_CODEPAGE_437=y
123CONFIG_NLS_CODEPAGE_850=y 146CONFIG_NLS_CODEPAGE_850=y
@@ -125,3 +148,9 @@ CONFIG_NLS_ISO8859_1=y
125CONFIG_NLS_ISO8859_15=y 148CONFIG_NLS_ISO8859_15=y
126CONFIG_NLS_UTF8=y 149CONFIG_NLS_UTF8=y
127# CONFIG_ENABLE_WARN_DEPRECATED is not set 150# CONFIG_ENABLE_WARN_DEPRECATED is not set
151CONFIG_DEBUG_KERNEL=y
152CONFIG_DEBUG_INFO=y
153# CONFIG_FTRACE is not set
154CONFIG_DEBUG_LL=y
155CONFIG_AT91_DEBUG_LL_DBGU0=y
156CONFIG_EARLY_PRINTK=y
diff --git a/arch/arm/configs/at91sam9260_defconfig b/arch/arm/configs/at91sam9260_defconfig
deleted file mode 100644
index 05618eb694f8..000000000000
--- a/arch/arm/configs/at91sam9260_defconfig
+++ /dev/null
@@ -1,91 +0,0 @@
1CONFIG_EXPERIMENTAL=y
2# CONFIG_LOCALVERSION_AUTO is not set
3# CONFIG_SWAP is not set
4CONFIG_SYSVIPC=y
5CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y
7CONFIG_SLAB=y
8CONFIG_MODULES=y
9CONFIG_MODULE_UNLOAD=y
10# CONFIG_BLK_DEV_BSG is not set
11# CONFIG_IOSCHED_DEADLINE is not set
12# CONFIG_IOSCHED_CFQ is not set
13CONFIG_ARCH_AT91=y
14CONFIG_ARCH_AT91SAM9260=y
15CONFIG_ARCH_AT91SAM9260_SAM9XE=y
16CONFIG_MACH_AT91SAM9260EK=y
17CONFIG_MACH_CAM60=y
18CONFIG_MACH_SAM9_L9260=y
19CONFIG_MACH_AFEB9260=y
20CONFIG_MACH_USB_A9260=y
21CONFIG_MACH_QIL_A9260=y
22CONFIG_MACH_CPU9260=y
23CONFIG_MACH_FLEXIBITY=y
24CONFIG_MACH_SNAPPER_9260=y
25CONFIG_MACH_AT91SAM9_DT=y
26CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
27# CONFIG_ARM_THUMB is not set
28CONFIG_ZBOOT_ROM_TEXT=0x0
29CONFIG_ZBOOT_ROM_BSS=0x0
30CONFIG_ARM_APPENDED_DTB=y
31CONFIG_ARM_ATAG_DTB_COMPAT=y
32CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw"
33CONFIG_FPE_NWFPE=y
34CONFIG_NET=y
35CONFIG_PACKET=y
36CONFIG_UNIX=y
37CONFIG_INET=y
38CONFIG_IP_PNP=y
39CONFIG_IP_PNP_BOOTP=y
40# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
41# CONFIG_INET_XFRM_MODE_TUNNEL is not set
42# CONFIG_INET_XFRM_MODE_BEET is not set
43# CONFIG_INET_LRO is not set
44# CONFIG_IPV6 is not set
45CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
46CONFIG_BLK_DEV_RAM=y
47CONFIG_BLK_DEV_RAM_SIZE=8192
48CONFIG_SCSI=y
49CONFIG_BLK_DEV_SD=y
50CONFIG_SCSI_MULTI_LUN=y
51CONFIG_NETDEVICES=y
52CONFIG_MII=y
53CONFIG_MACB=y
54# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
55# CONFIG_INPUT_KEYBOARD is not set
56# CONFIG_INPUT_MOUSE is not set
57# CONFIG_SERIO is not set
58CONFIG_SERIAL_ATMEL=y
59CONFIG_SERIAL_ATMEL_CONSOLE=y
60# CONFIG_HW_RANDOM is not set
61CONFIG_I2C=y
62CONFIG_I2C_CHARDEV=y
63CONFIG_I2C_GPIO=y
64# CONFIG_HWMON is not set
65CONFIG_WATCHDOG=y
66CONFIG_WATCHDOG_NOWAYOUT=y
67CONFIG_AT91SAM9X_WATCHDOG=y
68# CONFIG_USB_HID is not set
69CONFIG_USB=y
70CONFIG_USB_DEVICEFS=y
71CONFIG_USB_MON=y
72CONFIG_USB_OHCI_HCD=y
73CONFIG_USB_STORAGE=y
74CONFIG_USB_STORAGE_DEBUG=y
75CONFIG_USB_GADGET=y
76CONFIG_USB_ZERO=m
77CONFIG_USB_GADGETFS=m
78CONFIG_USB_MASS_STORAGE=m
79CONFIG_USB_G_SERIAL=m
80CONFIG_RTC_CLASS=y
81CONFIG_RTC_DRV_AT91SAM9=y
82CONFIG_EXT2_FS=y
83CONFIG_VFAT_FS=y
84CONFIG_TMPFS=y
85CONFIG_CRAMFS=y
86CONFIG_NLS_CODEPAGE_437=y
87CONFIG_NLS_CODEPAGE_850=y
88CONFIG_NLS_ISO8859_1=y
89CONFIG_DEBUG_KERNEL=y
90CONFIG_DEBUG_USER=y
91CONFIG_DEBUG_LL=y
diff --git a/arch/arm/configs/at91sam9261_defconfig b/arch/arm/configs/at91sam9261_9g10_defconfig
index c87beb973b37..9d35cd81c611 100644
--- a/arch/arm/configs/at91sam9261_defconfig
+++ b/arch/arm/configs/at91sam9261_9g10_defconfig
@@ -17,6 +17,7 @@ CONFIG_MODULE_UNLOAD=y
17CONFIG_ARCH_AT91=y 17CONFIG_ARCH_AT91=y
18CONFIG_ARCH_AT91SAM9261=y 18CONFIG_ARCH_AT91SAM9261=y
19CONFIG_MACH_AT91SAM9261EK=y 19CONFIG_MACH_AT91SAM9261EK=y
20CONFIG_MACH_AT91SAM9G10EK=y
20CONFIG_AT91_PROGRAMMABLE_CLOCKS=y 21CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
21# CONFIG_ARM_THUMB is not set 22# CONFIG_ARM_THUMB is not set
22CONFIG_AEABI=y 23CONFIG_AEABI=y
@@ -38,11 +39,11 @@ CONFIG_IP_PNP_BOOTP=y
38# CONFIG_INET_LRO is not set 39# CONFIG_INET_LRO is not set
39# CONFIG_IPV6 is not set 40# CONFIG_IPV6 is not set
40CONFIG_CFG80211=y 41CONFIG_CFG80211=y
41CONFIG_LIB80211=y
42CONFIG_MAC80211=y 42CONFIG_MAC80211=y
43CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 43CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
44CONFIG_DEVTMPFS=y
45CONFIG_DEVTMPFS_MOUNT=y
44CONFIG_MTD=y 46CONFIG_MTD=y
45CONFIG_MTD_PARTITIONS=y
46CONFIG_MTD_CMDLINE_PARTS=y 47CONFIG_MTD_CMDLINE_PARTS=y
47CONFIG_MTD_BLOCK=y 48CONFIG_MTD_BLOCK=y
48CONFIG_MTD_NAND=y 49CONFIG_MTD_NAND=y
@@ -51,17 +52,13 @@ CONFIG_MTD_UBI=y
51CONFIG_MTD_UBI_GLUEBI=y 52CONFIG_MTD_UBI_GLUEBI=y
52CONFIG_BLK_DEV_RAM=y 53CONFIG_BLK_DEV_RAM=y
53CONFIG_BLK_DEV_RAM_SIZE=8192 54CONFIG_BLK_DEV_RAM_SIZE=8192
54CONFIG_MISC_DEVICES=y
55CONFIG_ATMEL_TCLIB=y 55CONFIG_ATMEL_TCLIB=y
56CONFIG_ATMEL_SSC=y 56CONFIG_ATMEL_SSC=y
57CONFIG_SCSI=y 57CONFIG_SCSI=y
58CONFIG_BLK_DEV_SD=y 58CONFIG_BLK_DEV_SD=y
59CONFIG_SCSI_MULTI_LUN=y 59CONFIG_SCSI_MULTI_LUN=y
60CONFIG_NETDEVICES=y 60CONFIG_NETDEVICES=y
61CONFIG_NET_ETHERNET=y
62CONFIG_DM9000=y 61CONFIG_DM9000=y
63# CONFIG_NETDEV_1000 is not set
64# CONFIG_NETDEV_10000 is not set
65CONFIG_USB_ZD1201=m 62CONFIG_USB_ZD1201=m
66CONFIG_RTL8187=m 63CONFIG_RTL8187=m
67CONFIG_LIBERTAS=m 64CONFIG_LIBERTAS=m
@@ -118,15 +115,11 @@ CONFIG_SND_AT73C213=y
118CONFIG_SND_USB_AUDIO=m 115CONFIG_SND_USB_AUDIO=m
119# CONFIG_USB_HID is not set 116# CONFIG_USB_HID is not set
120CONFIG_USB=y 117CONFIG_USB=y
121CONFIG_USB_DEVICEFS=y
122CONFIG_USB_OHCI_HCD=y 118CONFIG_USB_OHCI_HCD=y
123CONFIG_USB_STORAGE=y 119CONFIG_USB_STORAGE=y
124CONFIG_USB_GADGET=y 120CONFIG_USB_GADGET=y
125CONFIG_USB_ZERO=m 121CONFIG_USB_AT91=y
126CONFIG_USB_ETH=m 122CONFIG_USB_G_SERIAL=y
127CONFIG_USB_GADGETFS=m
128CONFIG_USB_MASS_STORAGE=m
129CONFIG_USB_G_SERIAL=m
130CONFIG_MMC=y 123CONFIG_MMC=y
131CONFIG_MMC_ATMELMCI=m 124CONFIG_MMC_ATMELMCI=m
132CONFIG_NEW_LEDS=y 125CONFIG_NEW_LEDS=y
@@ -147,12 +140,10 @@ CONFIG_SQUASHFS=y
147CONFIG_SQUASHFS_LZO=y 140CONFIG_SQUASHFS_LZO=y
148CONFIG_SQUASHFS_XZ=y 141CONFIG_SQUASHFS_XZ=y
149CONFIG_NFS_FS=y 142CONFIG_NFS_FS=y
150CONFIG_NFS_V3=y
151CONFIG_ROOT_NFS=y 143CONFIG_ROOT_NFS=y
152CONFIG_NLS_CODEPAGE_437=y 144CONFIG_NLS_CODEPAGE_437=y
153CONFIG_NLS_CODEPAGE_850=y 145CONFIG_NLS_CODEPAGE_850=y
154CONFIG_NLS_ISO8859_1=y 146CONFIG_NLS_ISO8859_1=y
155CONFIG_NLS_ISO8859_15=y 147CONFIG_NLS_ISO8859_15=y
156CONFIG_NLS_UTF8=y 148CONFIG_NLS_UTF8=y
157CONFIG_FTRACE=y
158CONFIG_CRC_CCITT=m 149CONFIG_CRC_CCITT=m
diff --git a/arch/arm/configs/at91sam9263_defconfig b/arch/arm/configs/at91sam9263_defconfig
index 36fed66bd4b5..9d72ab684829 100644
--- a/arch/arm/configs/at91sam9263_defconfig
+++ b/arch/arm/configs/at91sam9263_defconfig
@@ -1,6 +1,4 @@
1CONFIG_EXPERIMENTAL=y
2# CONFIG_LOCALVERSION_AUTO is not set 1# CONFIG_LOCALVERSION_AUTO is not set
3CONFIG_KERNEL_LZMA=y
4# CONFIG_SWAP is not set 2# CONFIG_SWAP is not set
5CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
6CONFIG_IKCONFIG=y 4CONFIG_IKCONFIG=y
@@ -48,9 +46,11 @@ CONFIG_IP_PIMSM_V2=y
48# CONFIG_INET_LRO is not set 46# CONFIG_INET_LRO is not set
49# CONFIG_INET_DIAG is not set 47# CONFIG_INET_DIAG is not set
50CONFIG_IPV6=y 48CONFIG_IPV6=y
49# CONFIG_WIRELESS is not set
51CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 50CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
51CONFIG_DEVTMPFS=y
52CONFIG_DEVTMPFS_MOUNT=y
52CONFIG_MTD=y 53CONFIG_MTD=y
53CONFIG_MTD_PARTITIONS=y
54CONFIG_MTD_CMDLINE_PARTS=y 54CONFIG_MTD_CMDLINE_PARTS=y
55CONFIG_MTD_CHAR=y 55CONFIG_MTD_CHAR=y
56CONFIG_MTD_BLOCK=y 56CONFIG_MTD_BLOCK=y
@@ -65,7 +65,6 @@ CONFIG_MTD_UBI_GLUEBI=y
65CONFIG_BLK_DEV_LOOP=y 65CONFIG_BLK_DEV_LOOP=y
66CONFIG_BLK_DEV_RAM=y 66CONFIG_BLK_DEV_RAM=y
67CONFIG_BLK_DEV_RAM_SIZE=8192 67CONFIG_BLK_DEV_RAM_SIZE=8192
68CONFIG_MISC_DEVICES=y
69CONFIG_ATMEL_PWM=y 68CONFIG_ATMEL_PWM=y
70CONFIG_ATMEL_TCLIB=y 69CONFIG_ATMEL_TCLIB=y
71CONFIG_SCSI=y 70CONFIG_SCSI=y
@@ -73,23 +72,18 @@ CONFIG_BLK_DEV_SD=y
73CONFIG_SCSI_MULTI_LUN=y 72CONFIG_SCSI_MULTI_LUN=y
74CONFIG_NETDEVICES=y 73CONFIG_NETDEVICES=y
75CONFIG_MII=y 74CONFIG_MII=y
76CONFIG_SMSC_PHY=y
77CONFIG_NET_ETHERNET=y
78CONFIG_MACB=y 75CONFIG_MACB=y
79# CONFIG_NETDEV_1000 is not set 76CONFIG_SMSC_PHY=y
80# CONFIG_NETDEV_10000 is not set 77# CONFIG_WLAN is not set
81CONFIG_USB_ZD1201=m
82CONFIG_INPUT_POLLDEV=m 78CONFIG_INPUT_POLLDEV=m
83# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 79# CONFIG_INPUT_MOUSEDEV is not set
84CONFIG_INPUT_MOUSEDEV_SCREEN_X=240
85CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320
86CONFIG_INPUT_EVDEV=y 80CONFIG_INPUT_EVDEV=y
87# CONFIG_KEYBOARD_ATKBD is not set 81# CONFIG_KEYBOARD_ATKBD is not set
88CONFIG_KEYBOARD_GPIO=y 82CONFIG_KEYBOARD_GPIO=y
89# CONFIG_INPUT_MOUSE is not set 83# CONFIG_INPUT_MOUSE is not set
90CONFIG_INPUT_TOUCHSCREEN=y 84CONFIG_INPUT_TOUCHSCREEN=y
91CONFIG_TOUCHSCREEN_ADS7846=y 85CONFIG_TOUCHSCREEN_ADS7846=y
92CONFIG_LEGACY_PTY_COUNT=4 86# CONFIG_LEGACY_PTYS is not set
93CONFIG_SERIAL_ATMEL=y 87CONFIG_SERIAL_ATMEL=y
94CONFIG_SERIAL_ATMEL_CONSOLE=y 88CONFIG_SERIAL_ATMEL_CONSOLE=y
95CONFIG_HW_RANDOM=y 89CONFIG_HW_RANDOM=y
@@ -98,6 +92,7 @@ CONFIG_I2C_CHARDEV=y
98CONFIG_I2C_GPIO=y 92CONFIG_I2C_GPIO=y
99CONFIG_SPI=y 93CONFIG_SPI=y
100CONFIG_SPI_ATMEL=y 94CONFIG_SPI_ATMEL=y
95CONFIG_GPIO_SYSFS=y
101# CONFIG_HWMON is not set 96# CONFIG_HWMON is not set
102CONFIG_WATCHDOG=y 97CONFIG_WATCHDOG=y
103CONFIG_WATCHDOG_NOWAYOUT=y 98CONFIG_WATCHDOG_NOWAYOUT=y
@@ -107,9 +102,9 @@ CONFIG_FB_ATMEL=y
107CONFIG_BACKLIGHT_LCD_SUPPORT=y 102CONFIG_BACKLIGHT_LCD_SUPPORT=y
108CONFIG_LCD_CLASS_DEVICE=y 103CONFIG_LCD_CLASS_DEVICE=y
109CONFIG_BACKLIGHT_CLASS_DEVICE=y 104CONFIG_BACKLIGHT_CLASS_DEVICE=y
110CONFIG_BACKLIGHT_ATMEL_LCDC=y
111CONFIG_FRAMEBUFFER_CONSOLE=y 105CONFIG_FRAMEBUFFER_CONSOLE=y
112CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y 106CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
107CONFIG_FONTS=y
113CONFIG_LOGO=y 108CONFIG_LOGO=y
114CONFIG_SOUND=y 109CONFIG_SOUND=y
115CONFIG_SND=y 110CONFIG_SND=y
@@ -124,16 +119,12 @@ CONFIG_SND_ATMEL_AC97C=y
124# CONFIG_SND_SPI is not set 119# CONFIG_SND_SPI is not set
125CONFIG_SND_USB_AUDIO=m 120CONFIG_SND_USB_AUDIO=m
126CONFIG_USB=y 121CONFIG_USB=y
127CONFIG_USB_DEVICEFS=y
128CONFIG_USB_MON=y 122CONFIG_USB_MON=y
129CONFIG_USB_OHCI_HCD=y 123CONFIG_USB_OHCI_HCD=y
130CONFIG_USB_STORAGE=y 124CONFIG_USB_STORAGE=y
131CONFIG_USB_GADGET=y 125CONFIG_USB_GADGET=y
132CONFIG_USB_ZERO=m 126CONFIG_USB_ATMEL_USBA=y
133CONFIG_USB_ETH=m 127CONFIG_USB_G_SERIAL=y
134CONFIG_USB_GADGETFS=m
135CONFIG_USB_MASS_STORAGE=m
136CONFIG_USB_G_SERIAL=m
137CONFIG_MMC=y 128CONFIG_MMC=y
138CONFIG_SDIO_UART=m 129CONFIG_SDIO_UART=m
139CONFIG_MMC_ATMELMCI=m 130CONFIG_MMC_ATMELMCI=m
@@ -145,22 +136,18 @@ CONFIG_LEDS_TRIGGERS=y
145CONFIG_LEDS_TRIGGER_HEARTBEAT=y 136CONFIG_LEDS_TRIGGER_HEARTBEAT=y
146CONFIG_RTC_CLASS=y 137CONFIG_RTC_CLASS=y
147CONFIG_RTC_DRV_AT91SAM9=y 138CONFIG_RTC_DRV_AT91SAM9=y
148CONFIG_EXT2_FS=y 139CONFIG_EXT4_FS=y
149CONFIG_FUSE_FS=m
150CONFIG_VFAT_FS=y 140CONFIG_VFAT_FS=y
151CONFIG_TMPFS=y 141CONFIG_TMPFS=y
152CONFIG_JFFS2_FS=y
153CONFIG_UBIFS_FS=y 142CONFIG_UBIFS_FS=y
154CONFIG_UBIFS_FS_ADVANCED_COMPR=y 143CONFIG_UBIFS_FS_ADVANCED_COMPR=y
155CONFIG_CRAMFS=y
156CONFIG_NFS_FS=y 144CONFIG_NFS_FS=y
157CONFIG_NFS_V3=y
158CONFIG_NFS_V3_ACL=y 145CONFIG_NFS_V3_ACL=y
159CONFIG_NFS_V4=y 146CONFIG_NFS_V4=y
160CONFIG_ROOT_NFS=y 147CONFIG_ROOT_NFS=y
161CONFIG_NLS_CODEPAGE_437=y 148CONFIG_NLS_CODEPAGE_437=y
162CONFIG_NLS_CODEPAGE_850=y 149CONFIG_NLS_CODEPAGE_850=y
163CONFIG_NLS_ISO8859_1=y 150CONFIG_NLS_ISO8859_1=y
164CONFIG_FTRACE=y 151CONFIG_NLS_UTF8=y
165CONFIG_DEBUG_USER=y 152CONFIG_DEBUG_USER=y
166CONFIG_XZ_DEC=y 153CONFIG_XZ_DEC=y
diff --git a/arch/arm/configs/at91sam9g45_defconfig b/arch/arm/configs/at91sam9g45_defconfig
index 18964cdacd68..08166cd4e7d6 100644
--- a/arch/arm/configs/at91sam9g45_defconfig
+++ b/arch/arm/configs/at91sam9g45_defconfig
@@ -1,4 +1,3 @@
1CONFIG_EXPERIMENTAL=y
2# CONFIG_LOCALVERSION_AUTO is not set 1# CONFIG_LOCALVERSION_AUTO is not set
3# CONFIG_SWAP is not set 2# CONFIG_SWAP is not set
4CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
@@ -23,8 +22,6 @@ CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
23CONFIG_AT91_SLOW_CLOCK=y 22CONFIG_AT91_SLOW_CLOCK=y
24CONFIG_AEABI=y 23CONFIG_AEABI=y
25# CONFIG_OABI_COMPAT is not set 24# CONFIG_OABI_COMPAT is not set
26CONFIG_LEDS=y
27CONFIG_LEDS_CPU=y
28CONFIG_UACCESS_WITH_MEMCPY=y 25CONFIG_UACCESS_WITH_MEMCPY=y
29CONFIG_ZBOOT_ROM_TEXT=0x0 26CONFIG_ZBOOT_ROM_TEXT=0x0
30CONFIG_ZBOOT_ROM_BSS=0x0 27CONFIG_ZBOOT_ROM_BSS=0x0
@@ -36,6 +33,9 @@ CONFIG_PACKET=y
36CONFIG_UNIX=y 33CONFIG_UNIX=y
37CONFIG_INET=y 34CONFIG_INET=y
38CONFIG_IP_MULTICAST=y 35CONFIG_IP_MULTICAST=y
36CONFIG_IP_PNP=y
37CONFIG_IP_PNP_DHCP=y
38CONFIG_IP_PNP_BOOTP=y
39# CONFIG_INET_XFRM_MODE_TRANSPORT is not set 39# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
40# CONFIG_INET_XFRM_MODE_TUNNEL is not set 40# CONFIG_INET_XFRM_MODE_TUNNEL is not set
41# CONFIG_INET_XFRM_MODE_BEET is not set 41# CONFIG_INET_XFRM_MODE_BEET is not set
@@ -45,9 +45,6 @@ CONFIG_IPV6=y
45# CONFIG_INET6_XFRM_MODE_TUNNEL is not set 45# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
46# CONFIG_INET6_XFRM_MODE_BEET is not set 46# CONFIG_INET6_XFRM_MODE_BEET is not set
47CONFIG_IPV6_SIT_6RD=y 47CONFIG_IPV6_SIT_6RD=y
48CONFIG_CFG80211=y
49CONFIG_LIB80211=y
50CONFIG_MAC80211=y
51CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 48CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
52CONFIG_DEVTMPFS=y 49CONFIG_DEVTMPFS=y
53CONFIG_DEVTMPFS_MOUNT=y 50CONFIG_DEVTMPFS_MOUNT=y
@@ -61,13 +58,14 @@ CONFIG_MTD_DATAFLASH=y
61CONFIG_MTD_NAND=y 58CONFIG_MTD_NAND=y
62CONFIG_MTD_NAND_ATMEL=y 59CONFIG_MTD_NAND_ATMEL=y
63CONFIG_MTD_UBI=y 60CONFIG_MTD_UBI=y
61CONFIG_MTD_UBI_GLUEBI=y
64CONFIG_BLK_DEV_LOOP=y 62CONFIG_BLK_DEV_LOOP=y
65CONFIG_BLK_DEV_RAM=y 63CONFIG_BLK_DEV_RAM=y
66CONFIG_BLK_DEV_RAM_COUNT=4 64CONFIG_BLK_DEV_RAM_COUNT=4
67CONFIG_BLK_DEV_RAM_SIZE=8192 65CONFIG_BLK_DEV_RAM_SIZE=8192
68CONFIG_MISC_DEVICES=y
69CONFIG_ATMEL_PWM=y 66CONFIG_ATMEL_PWM=y
70CONFIG_ATMEL_TCLIB=y 67CONFIG_ATMEL_TCLIB=y
68CONFIG_ATMEL_SSC=y
71CONFIG_SCSI=y 69CONFIG_SCSI=y
72CONFIG_BLK_DEV_SD=y 70CONFIG_BLK_DEV_SD=y
73CONFIG_SCSI_MULTI_LUN=y 71CONFIG_SCSI_MULTI_LUN=y
@@ -76,67 +74,40 @@ CONFIG_NETDEVICES=y
76CONFIG_MII=y 74CONFIG_MII=y
77CONFIG_MACB=y 75CONFIG_MACB=y
78CONFIG_DAVICOM_PHY=y 76CONFIG_DAVICOM_PHY=y
79CONFIG_LIBERTAS_THINFIRM=m 77# CONFIG_INPUT_MOUSEDEV is not set
80CONFIG_LIBERTAS_THINFIRM_USB=m
81CONFIG_AT76C50X_USB=m
82CONFIG_USB_ZD1201=m
83CONFIG_RTL8187=m
84CONFIG_ATH_COMMON=m
85CONFIG_ATH9K=m
86CONFIG_CARL9170=m
87CONFIG_B43=m
88CONFIG_B43_PHY_N=y
89CONFIG_LIBERTAS=m
90CONFIG_LIBERTAS_USB=m
91CONFIG_LIBERTAS_SDIO=m
92CONFIG_LIBERTAS_SPI=m
93CONFIG_RT2X00=m
94CONFIG_RT2500USB=m
95CONFIG_RT73USB=m
96CONFIG_RT2800USB=m
97CONFIG_RT2800USB_RT53XX=y
98CONFIG_RT2800USB_UNKNOWN=y
99CONFIG_RTL8192CU=m
100CONFIG_WL1251=m
101CONFIG_WL1251_SDIO=m
102CONFIG_WL12XX_MENU=m
103CONFIG_WL12XX=m
104CONFIG_WL12XX_SDIO=m
105CONFIG_ZD1211RW=m
106CONFIG_MWIFIEX=m
107CONFIG_MWIFIEX_SDIO=m
108CONFIG_INPUT_POLLDEV=m
109# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
110CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
111CONFIG_INPUT_MOUSEDEV_SCREEN_Y=272
112CONFIG_INPUT_JOYDEV=y 78CONFIG_INPUT_JOYDEV=y
113CONFIG_INPUT_EVDEV=y 79CONFIG_INPUT_EVDEV=y
114# CONFIG_KEYBOARD_ATKBD is not set 80# CONFIG_KEYBOARD_ATKBD is not set
115CONFIG_KEYBOARD_QT1070=m 81CONFIG_KEYBOARD_QT1070=y
116CONFIG_KEYBOARD_QT2160=m 82CONFIG_KEYBOARD_QT2160=y
117CONFIG_KEYBOARD_GPIO=y 83CONFIG_KEYBOARD_GPIO=y
118# CONFIG_INPUT_MOUSE is not set 84# CONFIG_INPUT_MOUSE is not set
119CONFIG_INPUT_TOUCHSCREEN=y 85CONFIG_INPUT_TOUCHSCREEN=y
120CONFIG_TOUCHSCREEN_ATMEL_MXT=m 86CONFIG_TOUCHSCREEN_ATMEL_MXT=m
121CONFIG_TOUCHSCREEN_ATMEL_TSADCC=y 87CONFIG_TOUCHSCREEN_ATMEL_TSADCC=y
122# CONFIG_SERIO is not set 88# CONFIG_SERIO is not set
123CONFIG_LEGACY_PTY_COUNT=4 89# CONFIG_LEGACY_PTYS is not set
124CONFIG_SERIAL_ATMEL=y 90CONFIG_SERIAL_ATMEL=y
125CONFIG_SERIAL_ATMEL_CONSOLE=y 91CONFIG_SERIAL_ATMEL_CONSOLE=y
126CONFIG_HW_RANDOM=y 92CONFIG_HW_RANDOM=y
127CONFIG_I2C=y 93CONFIG_I2C=y
94CONFIG_I2C_CHARDEV=y
128CONFIG_I2C_GPIO=y 95CONFIG_I2C_GPIO=y
129CONFIG_SPI=y 96CONFIG_SPI=y
130CONFIG_SPI_ATMEL=y 97CONFIG_SPI_ATMEL=y
131# CONFIG_HWMON is not set 98# CONFIG_HWMON is not set
132CONFIG_FB=y 99CONFIG_FB=y
133CONFIG_FB_ATMEL=y 100CONFIG_FB_ATMEL=y
134CONFIG_FB_UDL=m
135CONFIG_BACKLIGHT_LCD_SUPPORT=y 101CONFIG_BACKLIGHT_LCD_SUPPORT=y
136# CONFIG_LCD_CLASS_DEVICE is not set 102CONFIG_LCD_CLASS_DEVICE=y
137CONFIG_BACKLIGHT_CLASS_DEVICE=y 103CONFIG_BACKLIGHT_CLASS_DEVICE=y
138CONFIG_BACKLIGHT_ATMEL_LCDC=y 104CONFIG_BACKLIGHT_ATMEL_LCDC=y
105CONFIG_BACKLIGHT_ATMEL_PWM=y
139# CONFIG_BACKLIGHT_GENERIC is not set 106# CONFIG_BACKLIGHT_GENERIC is not set
107CONFIG_FRAMEBUFFER_CONSOLE=y
108CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
109CONFIG_FONTS=y
110CONFIG_LOGO=y
140CONFIG_SOUND=y 111CONFIG_SOUND=y
141CONFIG_SND=y 112CONFIG_SND=y
142CONFIG_SND_SEQUENCER=y 113CONFIG_SND_SEQUENCER=y
@@ -148,33 +119,25 @@ CONFIG_SND_PCM_OSS=y
148# CONFIG_SND_ARM is not set 119# CONFIG_SND_ARM is not set
149CONFIG_SND_ATMEL_AC97C=y 120CONFIG_SND_ATMEL_AC97C=y
150# CONFIG_SND_SPI is not set 121# CONFIG_SND_SPI is not set
151CONFIG_SND_USB_AUDIO=m 122# CONFIG_SND_USB is not set
152# CONFIG_USB_HID is not set 123# CONFIG_USB_HID is not set
153CONFIG_USB=y 124CONFIG_USB=y
154CONFIG_USB_ANNOUNCE_NEW_DEVICES=y 125CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
155CONFIG_USB_DEVICEFS=y
156# CONFIG_USB_DEVICE_CLASS is not set
157CONFIG_USB_EHCI_HCD=y 126CONFIG_USB_EHCI_HCD=y
158CONFIG_USB_OHCI_HCD=y 127CONFIG_USB_OHCI_HCD=y
159CONFIG_USB_ACM=y 128CONFIG_USB_ACM=y
160CONFIG_USB_STORAGE=y 129CONFIG_USB_STORAGE=y
161CONFIG_USB_GADGET=y 130CONFIG_USB_GADGET=y
162CONFIG_USB_ATMEL_USBA=m 131CONFIG_USB_ATMEL_USBA=y
163CONFIG_USB_ZERO=m 132CONFIG_USB_G_MULTI=y
164CONFIG_USB_AUDIO=m
165CONFIG_USB_ETH=m
166CONFIG_USB_ETH_EEM=y
167CONFIG_USB_MASS_STORAGE=m
168CONFIG_USB_G_SERIAL=m
169CONFIG_USB_CDC_COMPOSITE=m
170CONFIG_USB_G_MULTI=m
171CONFIG_USB_G_MULTI_CDC=y 133CONFIG_USB_G_MULTI_CDC=y
172CONFIG_MMC=y 134CONFIG_MMC=y
173# CONFIG_MMC_BLOCK_BOUNCE is not set 135# CONFIG_MMC_BLOCK_BOUNCE is not set
174CONFIG_SDIO_UART=m
175CONFIG_MMC_ATMELMCI=y 136CONFIG_MMC_ATMELMCI=y
176CONFIG_LEDS_ATMEL_PWM=y 137CONFIG_NEW_LEDS=y
138CONFIG_LEDS_CLASS=y
177CONFIG_LEDS_GPIO=y 139CONFIG_LEDS_GPIO=y
140CONFIG_LEDS_TRIGGERS=y
178CONFIG_LEDS_TRIGGER_TIMER=y 141CONFIG_LEDS_TRIGGER_TIMER=y
179CONFIG_LEDS_TRIGGER_HEARTBEAT=y 142CONFIG_LEDS_TRIGGER_HEARTBEAT=y
180CONFIG_LEDS_TRIGGER_GPIO=y 143CONFIG_LEDS_TRIGGER_GPIO=y
@@ -184,17 +147,14 @@ CONFIG_DMADEVICES=y
184CONFIG_AT_HDMAC=y 147CONFIG_AT_HDMAC=y
185CONFIG_DMATEST=m 148CONFIG_DMATEST=m
186# CONFIG_IOMMU_SUPPORT is not set 149# CONFIG_IOMMU_SUPPORT is not set
187CONFIG_EXT2_FS=y 150CONFIG_EXT4_FS=y
188CONFIG_FANOTIFY=y 151CONFIG_FANOTIFY=y
189CONFIG_VFAT_FS=y 152CONFIG_VFAT_FS=y
190CONFIG_TMPFS=y 153CONFIG_TMPFS=y
191CONFIG_JFFS2_FS=y 154CONFIG_UBIFS_FS=y
192CONFIG_JFFS2_SUMMARY=y 155CONFIG_UBIFS_FS_ADVANCED_COMPR=y
193CONFIG_CRAMFS=m
194CONFIG_SQUASHFS=m
195CONFIG_SQUASHFS_EMBEDDED=y
196CONFIG_NFS_FS=y 156CONFIG_NFS_FS=y
197CONFIG_NFS_V3=y 157CONFIG_ROOT_NFS=y
198CONFIG_NLS_CODEPAGE_437=y 158CONFIG_NLS_CODEPAGE_437=y
199CONFIG_NLS_CODEPAGE_850=y 159CONFIG_NLS_CODEPAGE_850=y
200CONFIG_NLS_ISO8859_1=y 160CONFIG_NLS_ISO8859_1=y
@@ -203,6 +163,8 @@ CONFIG_STRIP_ASM_SYMS=y
203CONFIG_DEBUG_MEMORY_INIT=y 163CONFIG_DEBUG_MEMORY_INIT=y
204# CONFIG_FTRACE is not set 164# CONFIG_FTRACE is not set
205CONFIG_DEBUG_USER=y 165CONFIG_DEBUG_USER=y
166CONFIG_DEBUG_LL=y
167CONFIG_EARLY_PRINTK=y
206CONFIG_CRYPTO_ECB=y 168CONFIG_CRYPTO_ECB=y
207# CONFIG_CRYPTO_ANSI_CPRNG is not set 169# CONFIG_CRYPTO_ANSI_CPRNG is not set
208CONFIG_CRYPTO_USER_API_HASH=m 170CONFIG_CRYPTO_USER_API_HASH=m
diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig
index 4d0dc3c16063..f6e78f83c3c3 100644
--- a/arch/arm/configs/sama5_defconfig
+++ b/arch/arm/configs/sama5_defconfig
@@ -26,7 +26,9 @@ CONFIG_AEABI=y
26CONFIG_UACCESS_WITH_MEMCPY=y 26CONFIG_UACCESS_WITH_MEMCPY=y
27CONFIG_ZBOOT_ROM_TEXT=0x0 27CONFIG_ZBOOT_ROM_TEXT=0x0
28CONFIG_ZBOOT_ROM_BSS=0x0 28CONFIG_ZBOOT_ROM_BSS=0x0
29CONFIG_ARM_APPENDED_DTB=y
29CONFIG_CMDLINE="console=ttyS0,115200 initrd=0x21100000,25165824 root=/dev/ram0 rw" 30CONFIG_CMDLINE="console=ttyS0,115200 initrd=0x21100000,25165824 root=/dev/ram0 rw"
31CONFIG_KEXEC=y
30CONFIG_AUTO_ZRELADDR=y 32CONFIG_AUTO_ZRELADDR=y
31CONFIG_VFP=y 33CONFIG_VFP=y
32# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 34# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
@@ -39,6 +41,9 @@ CONFIG_UNIX=y
39CONFIG_INET=y 41CONFIG_INET=y
40CONFIG_IP_MULTICAST=y 42CONFIG_IP_MULTICAST=y
41CONFIG_IP_PNP=y 43CONFIG_IP_PNP=y
44CONFIG_IP_PNP_DHCP=y
45CONFIG_IP_PNP_BOOTP=y
46CONFIG_IP_PNP_RARP=y
42# CONFIG_INET_XFRM_MODE_TRANSPORT is not set 47# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
43# CONFIG_INET_XFRM_MODE_TUNNEL is not set 48# CONFIG_INET_XFRM_MODE_TUNNEL is not set
44# CONFIG_INET_XFRM_MODE_BEET is not set 49# CONFIG_INET_XFRM_MODE_BEET is not set
@@ -68,6 +73,8 @@ CONFIG_MTD_M25P80=y
68CONFIG_MTD_NAND=y 73CONFIG_MTD_NAND=y
69CONFIG_MTD_NAND_ATMEL=y 74CONFIG_MTD_NAND_ATMEL=y
70CONFIG_MTD_UBI=y 75CONFIG_MTD_UBI=y
76CONFIG_MTD_UBI_GLUEBI=y
77CONFIG_PROC_DEVICETREE=y
71CONFIG_BLK_DEV_LOOP=y 78CONFIG_BLK_DEV_LOOP=y
72CONFIG_BLK_DEV_RAM=y 79CONFIG_BLK_DEV_RAM=y
73CONFIG_BLK_DEV_RAM_COUNT=4 80CONFIG_BLK_DEV_RAM_COUNT=4
@@ -95,7 +102,19 @@ CONFIG_MACB=y
95# CONFIG_NET_VENDOR_STMICRO is not set 102# CONFIG_NET_VENDOR_STMICRO is not set
96# CONFIG_NET_VENDOR_WIZNET is not set 103# CONFIG_NET_VENDOR_WIZNET is not set
97CONFIG_MICREL_PHY=y 104CONFIG_MICREL_PHY=y
98# CONFIG_WLAN is not set 105CONFIG_LIBERTAS_THINFIRM=m
106CONFIG_LIBERTAS_THINFIRM_USB=m
107CONFIG_RTL8187=m
108CONFIG_RT2X00=m
109CONFIG_RT2500USB=m
110CONFIG_RT73USB=m
111CONFIG_RT2800USB=m
112CONFIG_RT2800USB_RT53XX=y
113CONFIG_RT2800USB_RT55XX=y
114CONFIG_RT2800USB_UNKNOWN=y
115CONFIG_MWIFIEX=m
116CONFIG_MWIFIEX_SDIO=m
117CONFIG_MWIFIEX_USB=m
99# CONFIG_INPUT_MOUSEDEV is not set 118# CONFIG_INPUT_MOUSEDEV is not set
100CONFIG_INPUT_EVDEV=y 119CONFIG_INPUT_EVDEV=y
101# CONFIG_KEYBOARD_ATKBD is not set 120# CONFIG_KEYBOARD_ATKBD is not set
@@ -133,9 +152,13 @@ CONFIG_USB_EHCI_HCD=y
133CONFIG_USB_OHCI_HCD=y 152CONFIG_USB_OHCI_HCD=y
134CONFIG_USB_ACM=y 153CONFIG_USB_ACM=y
135CONFIG_USB_STORAGE=y 154CONFIG_USB_STORAGE=y
155CONFIG_USB_SERIAL=y
156CONFIG_USB_SERIAL_GENERIC=y
157CONFIG_USB_SERIAL_FTDI_SIO=y
158CONFIG_USB_SERIAL_PL2303=y
136CONFIG_USB_GADGET=y 159CONFIG_USB_GADGET=y
137CONFIG_USB_AT91=y 160CONFIG_USB_ATMEL_USBA=y
138CONFIG_USB_MASS_STORAGE=m 161CONFIG_USB_G_SERIAL=y
139CONFIG_MMC=y 162CONFIG_MMC=y
140# CONFIG_MMC_BLOCK_BOUNCE is not set 163# CONFIG_MMC_BLOCK_BOUNCE is not set
141CONFIG_MMC_ATMELMCI=y 164CONFIG_MMC_ATMELMCI=y
@@ -151,18 +174,18 @@ CONFIG_DMADEVICES=y
151# CONFIG_IOMMU_SUPPORT is not set 174# CONFIG_IOMMU_SUPPORT is not set
152CONFIG_IIO=y 175CONFIG_IIO=y
153CONFIG_AT91_ADC=y 176CONFIG_AT91_ADC=y
154CONFIG_EXT2_FS=y 177CONFIG_EXT4_FS=y
155CONFIG_FANOTIFY=y 178CONFIG_FANOTIFY=y
156CONFIG_VFAT_FS=y 179CONFIG_VFAT_FS=y
157CONFIG_TMPFS=y 180CONFIG_TMPFS=y
158CONFIG_JFFS2_FS=y
159CONFIG_JFFS2_SUMMARY=y
160CONFIG_UBIFS_FS=y 181CONFIG_UBIFS_FS=y
182CONFIG_UBIFS_FS_ADVANCED_COMPR=y
161CONFIG_NFS_FS=y 183CONFIG_NFS_FS=y
162CONFIG_ROOT_NFS=y 184CONFIG_ROOT_NFS=y
163CONFIG_NLS_CODEPAGE_437=y 185CONFIG_NLS_CODEPAGE_437=y
164CONFIG_NLS_CODEPAGE_850=y 186CONFIG_NLS_CODEPAGE_850=y
165CONFIG_NLS_ISO8859_1=y 187CONFIG_NLS_ISO8859_1=y
188CONFIG_NLS_UTF8=y
166CONFIG_STRIP_ASM_SYMS=y 189CONFIG_STRIP_ASM_SYMS=y
167CONFIG_DEBUG_FS=y 190CONFIG_DEBUG_FS=y
168# CONFIG_SCHED_DEBUG is not set 191# CONFIG_SCHED_DEBUG is not set
diff --git a/arch/arm/mach-at91/Kconfig.non_dt b/arch/arm/mach-at91/Kconfig.non_dt
index 6c24985515a2..1a2abd8ed407 100644
--- a/arch/arm/mach-at91/Kconfig.non_dt
+++ b/arch/arm/mach-at91/Kconfig.non_dt
@@ -14,15 +14,11 @@ config ARCH_AT91RM9200
14 select SOC_AT91RM9200 14 select SOC_AT91RM9200
15 15
16config ARCH_AT91SAM9260 16config ARCH_AT91SAM9260
17 bool "AT91SAM9260 or AT91SAM9XE" 17 bool "AT91SAM9260 or AT91SAM9XE or AT91SAM9G20"
18 select SOC_AT91SAM9260 18 select SOC_AT91SAM9260
19 19
20config ARCH_AT91SAM9261 20config ARCH_AT91SAM9261
21 bool "AT91SAM9261" 21 bool "AT91SAM9261 or AT91SAM9G10"
22 select SOC_AT91SAM9261
23
24config ARCH_AT91SAM9G10
25 bool "AT91SAM9G10"
26 select SOC_AT91SAM9261 22 select SOC_AT91SAM9261
27 23
28config ARCH_AT91SAM9263 24config ARCH_AT91SAM9263
@@ -33,10 +29,6 @@ config ARCH_AT91SAM9RL
33 bool "AT91SAM9RL" 29 bool "AT91SAM9RL"
34 select SOC_AT91SAM9RL 30 select SOC_AT91SAM9RL
35 31
36config ARCH_AT91SAM9G20
37 bool "AT91SAM9G20"
38 select SOC_AT91SAM9260
39
40config ARCH_AT91SAM9G45 32config ARCH_AT91SAM9G45
41 bool "AT91SAM9G45" 33 bool "AT91SAM9G45"
42 select SOC_AT91SAM9G45 34 select SOC_AT91SAM9G45
@@ -50,6 +42,14 @@ config ARCH_AT91X40
50 42
51endchoice 43endchoice
52 44
45config ARCH_AT91SAM9G20
46 bool
47 select ARCH_AT91SAM9260
48
49config ARCH_AT91SAM9G10
50 bool
51 select ARCH_AT91SAM9261
52
53# ---------------------------------------------------------- 53# ----------------------------------------------------------
54 54
55if ARCH_AT91RM9200 55if ARCH_AT91RM9200
@@ -207,76 +207,6 @@ config MACH_FLEXIBITY
207 Select this if you are using Flexibity Connect board 207 Select this if you are using Flexibity Connect board
208 <http://www.flexibity.com> 208 <http://www.flexibity.com>
209 209
210endif
211
212# ----------------------------------------------------------
213
214if ARCH_AT91SAM9261
215
216comment "AT91SAM9261 Board Type"
217
218config MACH_AT91SAM9261EK
219 bool "Atmel AT91SAM9261-EK Evaluation Kit"
220 select HAVE_AT91_DATAFLASH_CARD
221 help
222 Select this if you are using Atmel's AT91SAM9261-EK Evaluation Kit.
223 <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3820>
224
225endif
226
227# ----------------------------------------------------------
228
229if ARCH_AT91SAM9G10
230
231comment "AT91SAM9G10 Board Type"
232
233config MACH_AT91SAM9G10EK
234 bool "Atmel AT91SAM9G10-EK Evaluation Kit"
235 select HAVE_AT91_DATAFLASH_CARD
236 help
237 Select this if you are using Atmel's AT91SAM9G10-EK Evaluation Kit.
238 <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4588>
239
240endif
241
242# ----------------------------------------------------------
243
244if ARCH_AT91SAM9263
245
246comment "AT91SAM9263 Board Type"
247
248config MACH_AT91SAM9263EK
249 bool "Atmel AT91SAM9263-EK Evaluation Kit"
250 select HAVE_AT91_DATAFLASH_CARD
251 help
252 Select this if you are using Atmel's AT91SAM9263-EK Evaluation Kit.
253 <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4057>
254
255config MACH_USB_A9263
256 bool "CALAO USB-A9263"
257 help
258 Select this if you are using a Calao Systems USB-A9263.
259 <http://www.calao-systems.com>
260
261endif
262
263# ----------------------------------------------------------
264
265if ARCH_AT91SAM9RL
266
267comment "AT91SAM9RL Board Type"
268
269config MACH_AT91SAM9RLEK
270 bool "Atmel AT91SAM9RL-EK Evaluation Kit"
271 help
272 Select this if you are using Atmel's AT91SAM9RL-EK Evaluation Kit.
273
274endif
275
276# ----------------------------------------------------------
277
278if ARCH_AT91SAM9G20
279
280comment "AT91SAM9G20 Board Type" 210comment "AT91SAM9G20 Board Type"
281 211
282config MACH_AT91SAM9G20EK 212config MACH_AT91SAM9G20EK
@@ -341,17 +271,70 @@ config MACH_USB_A9G20
341 Select this if you are using a Calao Systems USB-A9G20. 271 Select this if you are using a Calao Systems USB-A9G20.
342 <http://www.calao-systems.com> 272 <http://www.calao-systems.com>
343 273
274config MACH_SNAPPER_9260
275 bool "Bluewater Systems Snapper 9260/9G20 module"
276 help
277 Select this if you are using the Bluewater Systems Snapper 9260 or
278 Snapper 9G20 modules.
279 <http://www.bluewatersys.com/>
344endif 280endif
345 281
346if (ARCH_AT91SAM9260 || ARCH_AT91SAM9G20) 282# ----------------------------------------------------------
347comment "AT91SAM9260/AT91SAM9G20 boards" 283
284if ARCH_AT91SAM9261
285
286comment "AT91SAM9261 Board Type"
287
288config MACH_AT91SAM9261EK
289 bool "Atmel AT91SAM9261-EK Evaluation Kit"
290 select HAVE_AT91_DATAFLASH_CARD
291 help
292 Select this if you are using Atmel's AT91SAM9261-EK Evaluation Kit.
293 <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3820>
294
295comment "AT91SAM9G10 Board Type"
296
297config MACH_AT91SAM9G10EK
298 bool "Atmel AT91SAM9G10-EK Evaluation Kit"
299 select HAVE_AT91_DATAFLASH_CARD
300 help
301 Select this if you are using Atmel's AT91SAM9G10-EK Evaluation Kit.
302 <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4588>
303
304endif
305
306# ----------------------------------------------------------
307
308if ARCH_AT91SAM9263
309
310comment "AT91SAM9263 Board Type"
311
312config MACH_AT91SAM9263EK
313 bool "Atmel AT91SAM9263-EK Evaluation Kit"
314 select HAVE_AT91_DATAFLASH_CARD
315 help
316 Select this if you are using Atmel's AT91SAM9263-EK Evaluation Kit.
317 <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4057>
318
319config MACH_USB_A9263
320 bool "CALAO USB-A9263"
321 help
322 Select this if you are using a Calao Systems USB-A9263.
323 <http://www.calao-systems.com>
324
325endif
326
327# ----------------------------------------------------------
328
329if ARCH_AT91SAM9RL
330
331comment "AT91SAM9RL Board Type"
332
333config MACH_AT91SAM9RLEK
334 bool "Atmel AT91SAM9RL-EK Evaluation Kit"
335 help
336 Select this if you are using Atmel's AT91SAM9RL-EK Evaluation Kit.
348 337
349config MACH_SNAPPER_9260
350 bool "Bluewater Systems Snapper 9260/9G20 module"
351 help
352 Select this if you are using the Bluewater Systems Snapper 9260 or
353 Snapper 9G20 modules.
354 <http://www.bluewatersys.com/>
355endif 338endif
356 339
357# ---------------------------------------------------------- 340# ----------------------------------------------------------
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
index 788562dccb43..f4a5f7998bd7 100644
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -27,10 +27,8 @@ obj-$(CONFIG_SOC_SAMA5D3) += sama5d3.o
27obj-$(CONFIG_ARCH_AT91RM9200) += at91rm9200_devices.o 27obj-$(CONFIG_ARCH_AT91RM9200) += at91rm9200_devices.o
28obj-$(CONFIG_ARCH_AT91SAM9260) += at91sam9260_devices.o 28obj-$(CONFIG_ARCH_AT91SAM9260) += at91sam9260_devices.o
29obj-$(CONFIG_ARCH_AT91SAM9261) += at91sam9261_devices.o 29obj-$(CONFIG_ARCH_AT91SAM9261) += at91sam9261_devices.o
30obj-$(CONFIG_ARCH_AT91SAM9G10) += at91sam9261_devices.o
31obj-$(CONFIG_ARCH_AT91SAM9263) += at91sam9263_devices.o 30obj-$(CONFIG_ARCH_AT91SAM9263) += at91sam9263_devices.o
32obj-$(CONFIG_ARCH_AT91SAM9RL) += at91sam9rl_devices.o 31obj-$(CONFIG_ARCH_AT91SAM9RL) += at91sam9rl_devices.o
33obj-$(CONFIG_ARCH_AT91SAM9G20) += at91sam9260_devices.o
34obj-$(CONFIG_ARCH_AT91SAM9G45) += at91sam9g45_devices.o 32obj-$(CONFIG_ARCH_AT91SAM9G45) += at91sam9g45_devices.o
35obj-$(CONFIG_ARCH_AT91X40) += at91x40.o at91x40_time.o 33obj-$(CONFIG_ARCH_AT91X40) += at91x40.o at91x40_time.o
36 34
diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c
index b446645c7727..d3437624ca4e 100644
--- a/arch/arm/mach-at91/board-sam9261ek.c
+++ b/arch/arm/mach-at91/board-sam9261ek.c
@@ -264,11 +264,7 @@ static void __init ek_add_device_ts(void) {}
264 */ 264 */
265static struct at73c213_board_info at73c213_data = { 265static struct at73c213_board_info at73c213_data = {
266 .ssc_id = 1, 266 .ssc_id = 1,
267#if defined(CONFIG_MACH_AT91SAM9261EK) 267 .shortname = "AT91SAM9261/9G10-EK external DAC",
268 .shortname = "AT91SAM9261-EK external DAC",
269#else
270 .shortname = "AT91SAM9G10-EK external DAC",
271#endif
272}; 268};
273 269
274#if defined(CONFIG_SND_AT73C213) || defined(CONFIG_SND_AT73C213_MODULE) 270#if defined(CONFIG_SND_AT73C213) || defined(CONFIG_SND_AT73C213_MODULE)
@@ -412,9 +408,6 @@ static struct atmel_lcdfb_info __initdata ek_lcdc_data = {
412 .default_monspecs = &at91fb_default_stn_monspecs, 408 .default_monspecs = &at91fb_default_stn_monspecs,
413 .atmel_lcdfb_power_control = at91_lcdc_stn_power_control, 409 .atmel_lcdfb_power_control = at91_lcdc_stn_power_control,
414 .guard_time = 1, 410 .guard_time = 1,
415#if defined(CONFIG_MACH_AT91SAM9G10EK)
416 .lcd_wiring_mode = ATMEL_LCDC_WIRING_RGB,
417#endif
418}; 411};
419 412
420#else 413#else
@@ -468,9 +461,6 @@ static struct atmel_lcdfb_info __initdata ek_lcdc_data = {
468 .default_monspecs = &at91fb_default_tft_monspecs, 461 .default_monspecs = &at91fb_default_tft_monspecs,
469 .atmel_lcdfb_power_control = at91_lcdc_tft_power_control, 462 .atmel_lcdfb_power_control = at91_lcdc_tft_power_control,
470 .guard_time = 1, 463 .guard_time = 1,
471#if defined(CONFIG_MACH_AT91SAM9G10EK)
472 .lcd_wiring_mode = ATMEL_LCDC_WIRING_RGB,
473#endif
474}; 464};
475#endif 465#endif
476 466
@@ -574,6 +564,10 @@ static void __init ek_board_init(void)
574 /* DBGU on ttyS0. (Rx & Tx only) */ 564 /* DBGU on ttyS0. (Rx & Tx only) */
575 at91_register_uart(0, 0, 0); 565 at91_register_uart(0, 0, 0);
576 at91_add_device_serial(); 566 at91_add_device_serial();
567
568 if (cpu_is_at91sam9g10())
569 ek_lcdc_data.lcd_wiring_mode = ATMEL_LCDC_WIRING_RGB;
570
577 /* USB Host */ 571 /* USB Host */
578 at91_add_device_usbh(&ek_usbh_data); 572 at91_add_device_usbh(&ek_usbh_data);
579 /* USB Device */ 573 /* USB Device */
@@ -606,11 +600,17 @@ static void __init ek_board_init(void)
606 at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds)); 600 at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds));
607} 601}
608 602
609#if defined(CONFIG_MACH_AT91SAM9261EK)
610MACHINE_START(AT91SAM9261EK, "Atmel AT91SAM9261-EK") 603MACHINE_START(AT91SAM9261EK, "Atmel AT91SAM9261-EK")
611#else 604 /* Maintainer: Atmel */
605 .init_time = at91sam926x_pit_init,
606 .map_io = at91_map_io,
607 .handle_irq = at91_aic_handle_irq,
608 .init_early = ek_init_early,
609 .init_irq = at91_init_irq_default,
610 .init_machine = ek_board_init,
611MACHINE_END
612
612MACHINE_START(AT91SAM9G10EK, "Atmel AT91SAM9G10-EK") 613MACHINE_START(AT91SAM9G10EK, "Atmel AT91SAM9G10-EK")
613#endif
614 /* Maintainer: Atmel */ 614 /* Maintainer: Atmel */
615 .init_time = at91sam926x_pit_init, 615 .init_time = at91sam926x_pit_init,
616 .map_io = at91_map_io, 616 .map_io = at91_map_io,
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-04 20:22:35 -0500