Commit 92f8629b authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD Committed by Nicolas Ferre

ARM: at91: dt: switch to standard GPIO flag defines.

Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent 6db64d29
...@@ -46,7 +46,7 @@ macb0: ethernet@fffc4000 { ...@@ -46,7 +46,7 @@ macb0: ethernet@fffc4000 {
}; };
usb1: gadget@fffa4000 { usb1: gadget@fffa4000 {
atmel,vbus-gpio = <&pioC 15 0>; atmel,vbus-gpio = <&pioC 15 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
}; };
...@@ -90,23 +90,23 @@ leds { ...@@ -90,23 +90,23 @@ leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
red { red {
gpios = <&pioC 10 0>; gpios = <&pioC 10 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "none"; linux,default-trigger = "none";
}; };
green { green {
gpios = <&pioA 5 1>; gpios = <&pioA 5 GPIO_ACTIVE_LOW>;
linux,default-trigger = "none"; linux,default-trigger = "none";
default-state = "on"; default-state = "on";
}; };
yellow { yellow {
gpios = <&pioB 20 1>; gpios = <&pioB 20 GPIO_ACTIVE_LOW>;
linux,default-trigger = "none"; linux,default-trigger = "none";
}; };
blue { blue {
gpios = <&pioB 21 1>; gpios = <&pioB 21 GPIO_ACTIVE_LOW>;
linux,default-trigger = "none"; linux,default-trigger = "none";
}; };
}; };
......
...@@ -123,7 +123,7 @@ root@2b0000 { ...@@ -123,7 +123,7 @@ root@2b0000 {
usb0: ohci@00500000 { usb0: ohci@00500000 {
num-ports = <2>; num-ports = <2>;
atmel,vbus-gpio = <&pioB 15 1>; atmel,vbus-gpio = <&pioB 15 GPIO_ACTIVE_LOW>;
status = "okay"; status = "okay";
}; };
}; };
...@@ -133,23 +133,23 @@ leds { ...@@ -133,23 +133,23 @@ leds {
power_green { power_green {
label = "power_green"; label = "power_green";
gpios = <&pioC 17 0>; gpios = <&pioC 17 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
power_red { power_red {
label = "power_red"; label = "power_red";
gpios = <&pioA 2 0>; gpios = <&pioA 2 GPIO_ACTIVE_HIGH>;
}; };
tx_green { tx_green {
label = "tx_green"; label = "tx_green";
gpios = <&pioC 19 0>; gpios = <&pioC 19 GPIO_ACTIVE_HIGH>;
}; };
tx_red { tx_red {
label = "tx_red"; label = "tx_red";
gpios = <&pioC 18 0>; gpios = <&pioC 18 GPIO_ACTIVE_HIGH>;
}; };
}; };
...@@ -160,21 +160,21 @@ gpio_keys { ...@@ -160,21 +160,21 @@ gpio_keys {
keyswitch_in { keyswitch_in {
label = "keyswitch_in"; label = "keyswitch_in";
gpios = <&pioB 1 0>; gpios = <&pioB 1 GPIO_ACTIVE_HIGH>;
linux,code = <28>; linux,code = <28>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
error_in { error_in {
label = "error_in"; label = "error_in";
gpios = <&pioB 2 0>; gpios = <&pioB 2 GPIO_ACTIVE_HIGH>;
linux,code = <29>; linux,code = <29>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
btn { btn {
label = "btn"; label = "btn";
gpios = <&pioC 23 0>; gpios = <&pioC 23 GPIO_ACTIVE_HIGH>;
linux,code = <31>; linux,code = <31>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
......
...@@ -156,7 +156,7 @@ leds { ...@@ -156,7 +156,7 @@ leds {
/* little green LED in middle of Aria G25 module */ /* little green LED in middle of Aria G25 module */
aria_led { aria_led {
label = "aria_led"; label = "aria_led";
gpios = <&pioB 8 0>; /* PB8 */ gpios = <&pioB 8 GPIO_ACTIVE_HIGH>; /* PB8 */
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
...@@ -164,7 +164,7 @@ aria_led { ...@@ -164,7 +164,7 @@ aria_led {
onewire@0 { onewire@0 {
compatible = "w1-gpio"; compatible = "w1-gpio";
gpios = <&pioA 21 1>; gpios = <&pioA 21 GPIO_ACTIVE_LOW>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_w1_0>; pinctrl-0 = <&pinctrl_w1_0>;
}; };
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
*/ */
#include "skeleton.dtsi" #include "skeleton.dtsi"
#include <dt-bindings/gpio/gpio.h>
/ { / {
model = "Atmel AT91RM9200 family SoC"; model = "Atmel AT91RM9200 family SoC";
...@@ -503,9 +504,9 @@ nand0: nand@40000000 { ...@@ -503,9 +504,9 @@ nand0: nand@40000000 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_nand>; pinctrl-0 = <&pinctrl_nand>;
nand-ecc-mode = "soft"; nand-ecc-mode = "soft";
gpios = <&pioC 2 0 gpios = <&pioC 2 GPIO_ACTIVE_HIGH
0 0
&pioB 1 0 &pioB 1 GPIO_ACTIVE_HIGH
>; >;
status = "disabled"; status = "disabled";
}; };
...@@ -520,8 +521,8 @@ usb0: ohci@00300000 { ...@@ -520,8 +521,8 @@ usb0: ohci@00300000 {
i2c@0 { i2c@0 {
compatible = "i2c-gpio"; compatible = "i2c-gpio";
gpios = <&pioA 25 0 /* sda */ gpios = <&pioA 25 GPIO_ACTIVE_HIGH /* sda */
&pioA 26 0 /* scl */ &pioA 26 GPIO_ACTIVE_HIGH /* scl */
>; >;
i2c-gpio,sda-open-drain; i2c-gpio,sda-open-drain;
i2c-gpio,scl-open-drain; i2c-gpio,scl-open-drain;
......
...@@ -50,7 +50,7 @@ macb0: ethernet@fffbc000 { ...@@ -50,7 +50,7 @@ macb0: ethernet@fffbc000 {
}; };
usb1: gadget@fffb0000 { usb1: gadget@fffb0000 {
atmel,vbus-gpio = <&pioD 4 0>; atmel,vbus-gpio = <&pioD 4 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
}; };
...@@ -66,19 +66,19 @@ leds { ...@@ -66,19 +66,19 @@ leds {
ds2 { ds2 {
label = "green"; label = "green";
gpios = <&pioB 0 0x1>; gpios = <&pioB 0 GPIO_ACTIVE_LOW>;
linux,default-trigger = "mmc0"; linux,default-trigger = "mmc0";
}; };
ds4 { ds4 {
label = "yellow"; label = "yellow";
gpios = <&pioB 1 0x1>; gpios = <&pioB 1 GPIO_ACTIVE_LOW>;
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
ds6 { ds6 {
label = "red"; label = "red";
gpios = <&pioB 2 0x1>; gpios = <&pioB 2 GPIO_ACTIVE_LOW>;
}; };
}; };
}; };
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
*/ */
#include "skeleton.dtsi" #include "skeleton.dtsi"
#include <dt-bindings/gpio/gpio.h>
/ { / {
model = "Atmel AT91SAM9260 family SoC"; model = "Atmel AT91SAM9260 family SoC";
...@@ -567,8 +568,8 @@ nand0: nand@40000000 { ...@@ -567,8 +568,8 @@ nand0: nand@40000000 {
atmel,nand-cmd-offset = <22>; atmel,nand-cmd-offset = <22>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_nand>; pinctrl-0 = <&pinctrl_nand>;
gpios = <&pioC 13 0 gpios = <&pioC 13 GPIO_ACTIVE_HIGH
&pioC 14 0 &pioC 14 GPIO_ACTIVE_HIGH
0 0
>; >;
status = "disabled"; status = "disabled";
...@@ -584,8 +585,8 @@ usb0: ohci@00500000 { ...@@ -584,8 +585,8 @@ usb0: ohci@00500000 {
i2c@0 { i2c@0 {
compatible = "i2c-gpio"; compatible = "i2c-gpio";
gpios = <&pioA 23 0 /* sda */ gpios = <&pioA 23 GPIO_ACTIVE_HIGH /* sda */
&pioA 24 0 /* scl */ &pioA 24 GPIO_ACTIVE_HIGH /* scl */
>; >;
i2c-gpio,sda-open-drain; i2c-gpio,sda-open-drain;
i2c-gpio,scl-open-drain; i2c-gpio,scl-open-drain;
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
*/ */
#include "skeleton.dtsi" #include "skeleton.dtsi"
#include <dt-bindings/gpio/gpio.h>
/ { / {
model = "Atmel AT91SAM9263 family SoC"; model = "Atmel AT91SAM9263 family SoC";
...@@ -515,8 +516,8 @@ nand0: nand@40000000 { ...@@ -515,8 +516,8 @@ nand0: nand@40000000 {
atmel,nand-cmd-offset = <22>; atmel,nand-cmd-offset = <22>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_nand>; pinctrl-0 = <&pinctrl_nand>;
gpios = <&pioA 22 0 gpios = <&pioA 22 GPIO_ACTIVE_HIGH
&pioD 15 0 &pioD 15 GPIO_ACTIVE_HIGH
0 0
>; >;
status = "disabled"; status = "disabled";
...@@ -532,8 +533,8 @@ usb0: ohci@00a00000 { ...@@ -532,8 +533,8 @@ usb0: ohci@00a00000 {
i2c@0 { i2c@0 {
compatible = "i2c-gpio"; compatible = "i2c-gpio";
gpios = <&pioB 4 0 /* sda */ gpios = <&pioB 4 GPIO_ACTIVE_HIGH /* sda */
&pioB 5 0 /* scl */ &pioB 5 GPIO_ACTIVE_HIGH /* scl */
>; >;
i2c-gpio,sda-open-drain; i2c-gpio,sda-open-drain;
i2c-gpio,scl-open-drain; i2c-gpio,scl-open-drain;
......
...@@ -51,7 +51,7 @@ macb0: ethernet@fffbc000 { ...@@ -51,7 +51,7 @@ macb0: ethernet@fffbc000 {
}; };
usb1: gadget@fff78000 { usb1: gadget@fff78000 {
atmel,vbus-gpio = <&pioA 25 0>; atmel,vbus-gpio = <&pioA 25 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
...@@ -65,8 +65,8 @@ &pinctrl_mmc0_slot0_cmd_dat0 ...@@ -65,8 +65,8 @@ &pinctrl_mmc0_slot0_cmd_dat0
slot@0 { slot@0 {
reg = <0>; reg = <0>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pioE 18 0>; cd-gpios = <&pioE 18 GPIO_ACTIVE_HIGH>;
wp-gpios = <&pioE 19 0>; wp-gpios = <&pioE 19 GPIO_ACTIVE_HIGH>;
}; };
}; };
...@@ -141,8 +141,8 @@ data@7ca0000 { ...@@ -141,8 +141,8 @@ data@7ca0000 {
usb0: ohci@00a00000 { usb0: ohci@00a00000 {
num-ports = <2>; num-ports = <2>;
status = "okay"; status = "okay";
atmel,vbus-gpio = <&pioA 24 0 atmel,vbus-gpio = <&pioA 24 GPIO_ACTIVE_HIGH
&pioA 21 0 &pioA 21 GPIO_ACTIVE_HIGH
>; >;
}; };
}; };
...@@ -152,13 +152,13 @@ leds { ...@@ -152,13 +152,13 @@ leds {
d3 { d3 {
label = "d3"; label = "d3";
gpios = <&pioB 7 0>; gpios = <&pioB 7 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
d2 { d2 {
label = "d2"; label = "d2";
gpios = <&pioC 29 1>; gpios = <&pioC 29 GPIO_ACTIVE_LOW>;
linux,default-trigger = "nand-disk"; linux,default-trigger = "nand-disk";
}; };
}; };
...@@ -168,14 +168,14 @@ gpio_keys { ...@@ -168,14 +168,14 @@ gpio_keys {
left_click { left_click {
label = "left_click"; label = "left_click";
gpios = <&pioC 5 1>; gpios = <&pioC 5 GPIO_ACTIVE_LOW>;
linux,code = <272>; linux,code = <272>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
right_click { right_click {
label = "right_click"; label = "right_click";
gpios = <&pioC 4 1>; gpios = <&pioC 4 GPIO_ACTIVE_LOW>;
linux,code = <273>; linux,code = <273>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
......
...@@ -17,13 +17,13 @@ leds { ...@@ -17,13 +17,13 @@ leds {
ds1 { ds1 {
label = "ds1"; label = "ds1";
gpios = <&pioA 9 0>; gpios = <&pioA 9 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
ds5 { ds5 {
label = "ds5"; label = "ds5";
gpios = <&pioA 6 1>; gpios = <&pioA 6 GPIO_ACTIVE_LOW>;
}; };
}; };
}; };
...@@ -23,7 +23,7 @@ &pinctrl_mmc0_slot0_cmd_dat0 ...@@ -23,7 +23,7 @@ &pinctrl_mmc0_slot0_cmd_dat0
slot@0 { slot@0 {
reg = <0>; reg = <0>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pioC 2 0>; cd-gpios = <&pioC 2 GPIO_ACTIVE_HIGH>;
}; };
}; };
...@@ -43,13 +43,13 @@ leds { ...@@ -43,13 +43,13 @@ leds {
ds1 { ds1 {
label = "ds1"; label = "ds1";
gpios = <&pioB 9 0>; gpios = <&pioB 9 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
ds5 { ds5 {
label = "ds5"; label = "ds5";
gpios = <&pioB 8 1>; gpios = <&pioB 8 GPIO_ACTIVE_LOW>;
}; };
}; };
}; };
...@@ -65,7 +65,7 @@ macb0: ethernet@fffc4000 { ...@@ -65,7 +65,7 @@ macb0: ethernet@fffc4000 {
}; };
usb1: gadget@fffa4000 { usb1: gadget@fffa4000 {
atmel,vbus-gpio = <&pioC 5 0>; atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
...@@ -79,7 +79,7 @@ &pinctrl_mmc0_slot1_cmd_dat0 ...@@ -79,7 +79,7 @@ &pinctrl_mmc0_slot1_cmd_dat0
slot@1 { slot@1 {
reg = <1>; reg = <1>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pioC 9 0>; cd-gpios = <&pioC 9 GPIO_ACTIVE_HIGH>;
}; };
}; };
...@@ -180,14 +180,14 @@ gpio_keys { ...@@ -180,14 +180,14 @@ gpio_keys {
btn3 { btn3 {
label = "Button 3"; label = "Button 3";
gpios = <&pioA 30 1>; gpios = <&pioA 30 GPIO_ACTIVE_LOW>;
linux,code = <0x103>; linux,code = <0x103>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
btn4 { btn4 {
label = "Button 4"; label = "Button 4";
gpios = <&pioA 31 1>; gpios = <&pioA 31 GPIO_ACTIVE_LOW>;
linux,code = <0x104>; linux,code = <0x104>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
*/ */
#include "skeleton.dtsi" #include "skeleton.dtsi"
#include <dt-bindings/gpio/gpio.h>
/ { / {
model = "Atmel AT91SAM9G45 family SoC"; model = "Atmel AT91SAM9G45 family SoC";
...@@ -592,8 +593,8 @@ nand0: nand@40000000 { ...@@ -592,8 +593,8 @@ nand0: nand@40000000 {
atmel,nand-cmd-offset = <22>; atmel,nand-cmd-offset = <22>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_nand>; pinctrl-0 = <&pinctrl_nand>;
gpios = <&pioC 8 0 gpios = <&pioC 8 GPIO_ACTIVE_HIGH
&pioC 14 0 &pioC 14 GPIO_ACTIVE_HIGH
0 0
>; >;
status = "disabled"; status = "disabled";
...@@ -616,8 +617,8 @@ usb1: ehci@00800000 { ...@@ -616,8 +617,8 @@ usb1: ehci@00800000 {
i2c@0 { i2c@0 {
compatible = "i2c-gpio"; compatible = "i2c-gpio";
gpios = <&pioA 20 0 /* sda */ gpios = <&pioA 20 GPIO_ACTIVE_HIGH /* sda */
&pioA 21 0 /* scl */ &pioA 21 GPIO_ACTIVE_HIGH /* scl */
>; >;
i2c-gpio,sda-open-drain; i2c-gpio,sda-open-drain;
i2c-gpio,scl-open-drain; i2c-gpio,scl-open-drain;
......
...@@ -68,7 +68,7 @@ &pinctrl_mmc0_slot0_clk_cmd_dat0 ...@@ -68,7 +68,7 @@ &pinctrl_mmc0_slot0_clk_cmd_dat0
slot@0 { slot@0 {
reg = <0>; reg = <0>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pioD 10 0>; cd-gpios = <&pioD 10 GPIO_ACTIVE_HIGH>;
}; };
}; };
...@@ -81,8 +81,8 @@ &pinctrl_mmc1_slot0_clk_cmd_dat0 ...@@ -81,8 +81,8 @@ &pinctrl_mmc1_slot0_clk_cmd_dat0
slot@0 { slot@0 {
reg = <0>; reg = <0>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pioD 11 0>; cd-gpios = <&pioD 11 GPIO_ACTIVE_HIGH>;
wp-gpios = <&pioD 29 0>; wp-gpios = <&pioD 29 GPIO_ACTIVE_HIGH>;
}; };
}; };
...@@ -139,8 +139,8 @@ data@4000000 { ...@@ -139,8 +139,8 @@ data@4000000 {
usb0: ohci@00700000 { usb0: ohci@00700000 {
status = "okay"; status = "okay";
num-ports = <2>; num-ports = <2>;
atmel,vbus-gpio = <&pioD 1 1 atmel,vbus-gpio = <&pioD 1 GPIO_ACTIVE_LOW
&pioD 3 1>; &pioD 3 GPIO_ACTIVE_LOW>;
}; };
usb1: ehci@00800000 { usb1: ehci@00800000 {
...@@ -153,19 +153,19 @@ leds { ...@@ -153,19 +153,19 @@ leds {
d8 { d8 {
label = "d8"; label = "d8";
gpios = <&pioD 30 0>; gpios = <&pioD 30 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
d6 { d6 {
label = "d6"; label = "d6";
gpios = <&pioD 0 1>; gpios = <&pioD 0 GPIO_ACTIVE_LOW>;
linux,default-trigger = "nand-disk"; linux,default-trigger = "nand-disk";
}; };
d7 { d7 {
label = "d7"; label = "d7";
gpios = <&pioD 31 1>; gpios = <&pioD 31 GPIO_ACTIVE_LOW>;
linux,default-trigger = "mmc0"; linux,default-trigger = "mmc0";
}; };
}; };
...@@ -175,45 +175,45 @@ gpio_keys { ...@@ -175,45 +175,45 @@ gpio_keys {
left_click { left_click {
label = "left_click"; label = "left_click";
gpios = <&pioB 6 1>; gpios = <&pioB 6 GPIO_ACTIVE_LOW>;
linux,code = <272>; linux,code = <272>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
right_click { right_click {
label = "right_click"; label = "right_click";
gpios = <&pioB 7 1>; gpios = <&pioB 7 GPIO_ACTIVE_LOW>;
linux,code = <273>; linux,code = <273>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
left { left {
label = "Joystick Left"; label = "Joystick Left";
gpios = <&pioB 14 1>; gpios = <&pioB 14 GPIO_ACTIVE_LOW>;
linux,code = <105>; linux,code = <105>;
}; };
right { right {
label = "Joystick Right"; label = "Joystick Right";
gpios = <&pioB 15 1>; gpios = <&pioB 15 GPIO_ACTIVE_LOW>;
linux,code = <106>; linux,code = <106>;
}; };
up { up {
label = "Joystick Up"; label = "Joystick Up";
gpios = <&pioB 16 1>; gpios = <&pioB 16 GPIO_ACTIVE_LOW>;
linux,code = <103>; linux,code = <103>;
}; };
down { down {
label = "Joystick Down"; label = "Joystick Down";
gpios = <&pioB 17 1>; gpios = <&pioB 17 GPIO_ACTIVE_LOW>;
linux,code = <108>; linux,code = <108>;
}; };
enter { enter {
label = "Joystick Press"; label = "Joystick Press";
gpios = <&pioB 18 1>; gpios = <&pioB 18 GPIO_ACTIVE_LOW>;
linux,code = <28>; linux,code = <28>;
}; };
}; };
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
*/ */
#include "skeleton.dtsi" #include "skeleton.dtsi"
#include <dt-bindings/gpio/gpio.h>
/ { / {
model = "Atmel AT91SAM9N12 SoC"; model = "Atmel AT91SAM9N12 SoC";
...@@ -438,8 +439,8 @@ nand0: nand@40000000 { ...@@ -438,8 +439,8 @@ nand0: nand@40000000 {
atmel,nand-cmd-offset = <22>; atmel,nand-cmd-offset = <22>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_nand>; pinctrl-0 = <&pinctrl_nand>;
gpios = <&pioD 5 0 gpios = <&pioD 5 GPIO_ACTIVE_HIGH
&pioD 4 0 &pioD 4 GPIO_ACTIVE_HIGH
0 0
>; >;
status = "disabled"; status = "disabled";
...@@ -455,8 +456,8 @@ usb0: ohci@00500000 { ...@@ -455,8 +456,8 @@ usb0: ohci@00500000 {
i2c@0 { i2c@0 {
compatible = "i2c-gpio"; compatible = "i2c-gpio";
gpios = <&pioA 30 0 /* sda */ gpios = <&pioA 30 GPIO_ACTIVE_HIGH /* sda */
&pioA 31 0 /* scl */ &pioA 31 GPIO_ACTIVE_HIGH /* scl */
>; >;
i2c-gpio,sda-open-drain; i2c-gpio,sda-open-drain;
i2c-gpio,scl-open-drain; i2c-gpio,scl-open-drain;
......
...@@ -55,7 +55,7 @@ &pinctrl_mmc0_slot0_clk_cmd_dat0 ...@@ -55,7 +55,7 @@ &pinctrl_mmc0_slot0_clk_cmd_dat0
slot@0 { slot@0 {
reg = <0>; reg = <0>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pioA 7 0>; cd-gpios = <&pioA 7 GPIO_ACTIVE_HIGH>;
}; };
}; };
...@@ -95,19 +95,19 @@ leds { ...@@ -95,19 +95,19 @@ leds {
d8 { d8 {
label = "d8"; label = "d8";
gpios = <&pioB 4 1>; gpios = <&pioB 4 GPIO_ACTIVE_LOW>;
linux,default-trigger = "mmc0"; linux,default-trigger = "mmc0";
}; };
d9 { d9 {
label = "d6"; label = "d6";
gpios = <&pioB 5 1>; gpios = <&pioB 5 GPIO_ACTIVE_LOW>;
linux,default-trigger = "nand-disk"; linux,default-trigger = "nand-disk";
}; };
d10 { d10 {
label = "d7"; label = "d7";
gpios = <&pioB 6 0>; gpios = <&pioB 6 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
}; };
...@@ -117,7 +117,7 @@ gpio_keys { ...@@ -117,7 +117,7 @@ gpio_keys {
enter { enter {
label = "Enter"; label = "Enter";
gpios = <&pioB 4 1>; gpios = <&pioB 4 GPIO_ACTIVE_LOW>;
linux,code = <28>; linux,code = <28>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
*/ */
#include "skeleton.dtsi" #include "skeleton.dtsi"
#include <dt-bindings/gpio/gpio.h>
/ { / {
model = "Atmel AT91SAM9x5 family SoC"; model = "Atmel AT91SAM9x5 family SoC";
...@@ -664,8 +665,8 @@ nand0: nand@40000000 { ...@@ -664,8 +665,8 @@ nand0: nand@40000000 {
atmel,nand-cmd-offset = <22>; atmel,nand-cmd-offset = <22>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_nand>; pinctrl-0 = <&pinctrl_nand>;
gpios = <&pioD 5 0 gpios = <&pioD 5 GPIO_ACTIVE_HIGH
&pioD 4 0 &pioD 4 GPIO_ACTIVE_HIGH
0 0
>; >;
status = "disabled"; status = "disabled";
...@@ -688,8 +689,8 @@ usb1: ehci@00700000 { ...@@ -688,8 +689,8 @@ usb1: ehci@00700000 {
i2c@0 { i2c@0 {
compatible = "i2c-gpio"; compatible = "i2c-gpio";
gpios = <&pioA 30 0 /* sda */ gpios = <&pioA 30 GPIO_ACTIVE_HIGH /* sda */
&pioA 31 0 /* scl */ &pioA 31 GPIO_ACTIVE_HIGH /* scl */
>; >;
i2c-gpio,sda-open-drain; i2c-gpio,sda-open-drain;
i2c-gpio,scl-open-drain; i2c-gpio,scl-open-drain;
...@@ -703,8 +704,8 @@ &pioA 31 0 /* scl */ ...@@ -703,8 +704,8 @@ &pioA 31 0 /* scl */
i2c@1 { i2c@1 {
compatible = "i2c-gpio"; compatible = "i2c-gpio";
gpios = <&pioC 0 0 /* sda */ gpios = <&pioC 0 GPIO_ACTIVE_HIGH /* sda */
&pioC 1 0 /* scl */ &pioC 1 GPIO_ACTIVE_HIGH /* scl */
>; >;
i2c-gpio,sda-open-drain; i2c-gpio,sda-open-drain;
i2c-gpio,scl-open-drain; i2c-gpio,scl-open-drain;
...@@ -718,8 +719,8 @@ &pioC 1 0 /* scl */ ...@@ -718,8 +719,8 @@ &pioC 1 0 /* scl */
i2c@2 { i2c@2 {
compatible = "i2c-gpio"; compatible = "i2c-gpio";
gpios = <&pioB 4 0 /* sda */ gpios = <&pioB 4 GPIO_ACTIVE_HIGH /* sda */
&pioB 5 0 /* scl */ &pioB 5 GPIO_ACTIVE_HIGH /* scl */
>; >;
i2c-gpio,sda-open-drain; i2c-gpio,sda-open-drain;
i2c-gpio,scl-open-drain; i2c-gpio,scl-open-drain;
......
...@@ -75,19 +75,19 @@ leds { ...@@ -75,19 +75,19 @@ leds {
pb18 { pb18 {
label = "pb18"; label = "pb18";
gpios = <&pioB 18 1>; gpios = <&pioB 18 GPIO_ACTIVE_LOW>;
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
pd21 { pd21 {
label = "pd21"; label = "pd21";
gpios = <&pioD 21 0>; gpios = <&pioD 21 GPIO_ACTIVE_HIGH>;
}; };
}; };
1wire_cm { 1wire_cm {
compatible = "w1-gpio"; compatible = "w1-gpio";
gpios = <&pioB 18 0>; gpios = <&pioB 18 GPIO_ACTIVE_HIGH>;
linux,open-drain; linux,open-drain;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_1wire_cm>; pinctrl-0 = <&pinctrl_1wire_cm>;
......
...@@ -27,7 +27,7 @@ &pinctrl_mmc0_slot0_clk_cmd_dat0 ...@@ -27,7 +27,7 @@ &pinctrl_mmc0_slot0_clk_cmd_dat0
slot@0 { slot@0 {
reg = <0>; reg = <0>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pioD 15 0>; cd-gpios = <&pioD 15 GPIO_ACTIVE_HIGH>;
}; };
}; };
...@@ -40,7 +40,7 @@ &pinctrl_mmc1_slot0_clk_cmd_dat0 ...@@ -40,7 +40,7 @@ &pinctrl_mmc1_slot0_clk_cmd_dat0
slot@0 { slot@0 {
reg = <0>; reg = <0>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pioD 14 0>; cd-gpios = <&pioD 14 GPIO_ACTIVE_HIGH>;
}; };
}; };
...@@ -86,8 +86,8 @@ m25p80@0 { ...@@ -86,8 +86,8 @@ m25p80@0 {
usb0: ohci@00600000 { usb0: ohci@00600000 {
status = "okay"; status = "okay";
num-ports = <2>; num-ports = <2>;
atmel,vbus-gpio = <&pioD 19 1 atmel,vbus-gpio = <&pioD 19 GPIO_ACTIVE_LOW
&pioD 20 1 &pioD 20 GPIO_ACTIVE_LOW
>; >;
}; };
......
...@@ -40,7 +40,7 @@ macb0: ethernet@fffc4000 { ...@@ -40,7 +40,7 @@ macb0: ethernet@fffc4000 {
}; };
usb1: gadget@fffa4000 { usb1: gadget@fffa4000 {
atmel,vbus-gpio = <&pioC 5 0>; atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
}; };
...@@ -52,7 +52,7 @@ nand0: nand@40000000 { ...@@ -52,7 +52,7 @@ nand0: nand@40000000 {
status = "okay"; status = "okay";
gpios = <0 gpios = <0
&pioC 14 0 &pioC 14 GPIO_ACTIVE_HIGH
0 0
>; >;
......
...@@ -31,7 +31,7 @@ usart2: serial@fffb8000 { ...@@ -31,7 +31,7 @@ usart2: serial@fffb8000 {
}; };
usb1: gadget@fffa4000 { usb1: gadget@fffa4000 {
atmel,vbus-gpio = <&pioC 5 0>; atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
......
...@@ -94,26 +94,26 @@ leds { ...@@ -94,26 +94,26 @@ leds {
led1g { led1g {
label = "led1:green"; label = "led1:green";
gpios = <&pioB 0 1>; gpios = <&pioB 0 GPIO_ACTIVE_LOW>;
linux,default-trigger = "none"; linux,default-trigger = "none";
}; };
led1r { led1r {
label = "led1:red"; label = "led1:red";
gpios = <&pioB 1 1>; gpios = <&pioB 1 GPIO_ACTIVE_LOW>;
linux,default-trigger = "none"; linux,default-trigger = "none";
}; };
led2g { led2g {
label = "led2:green"; label = "led2:green";
gpios = <&pioB 2 1>; gpios = <&pioB 2 GPIO_ACTIVE_LOW>;
linux,default-trigger = "none"; linux,default-trigger = "none";
default-state = "on"; default-state = "on";
}; };
led2r { led2r {
label = "led2:red"; label = "led2:red";
gpios = <&pioB 3 1>; gpios = <&pioB 3 GPIO_ACTIVE_LOW>;
linux,default-trigger = "none"; linux,default-trigger = "none";
}; };
}; };
...@@ -125,14 +125,14 @@ gpio_keys { ...@@ -125,14 +125,14 @@ gpio_keys {
reset { reset {
label = "reset"; label = "reset";
gpios = <&pioB 30 1>; gpios = <&pioB 30 GPIO_ACTIVE_LOW>;
linux,code = <0x100>; linux,code = <0x100>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
mode { mode {
label = "mode"; label = "mode";
gpios = <&pioB 31 1>; gpios = <&pioB 31 GPIO_ACTIVE_LOW>;
linux,code = <0x101>; linux,code = <0x101>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
......
...@@ -62,7 +62,7 @@ gpio_keys { ...@@ -62,7 +62,7 @@ gpio_keys {
monitor_mute { monitor_mute {
label = "Monitor mute"; label = "Monitor mute";
gpios = <&pioC 1 1>; gpios = <&pioC 1 GPIO_ACTIVE_LOW>;
linux,code = <113>; linux,code = <113>;
}; };
}; };
......
...@@ -64,7 +64,7 @@ &pinctrl_mmc0_slot0_clk_cmd_dat0 ...@@ -64,7 +64,7 @@ &pinctrl_mmc0_slot0_clk_cmd_dat0
slot@0 { slot@0 {
reg = <0>; reg = <0>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pioD 6 0>; cd-gpios = <&pioD 6 GPIO_ACTIVE_HIGH>;
}; };
}; };
...@@ -81,8 +81,8 @@ nand0: nand@40000000 { ...@@ -81,8 +81,8 @@ nand0: nand@40000000 {
nand-on-flash-bbt; nand-on-flash-bbt;
pinctrl-0 = <&pinctrl_board_nand>; pinctrl-0 = <&pinctrl_board_nand>;
gpios = <&pioD 3 0 gpios = <&pioD 3 GPIO_ACTIVE_HIGH
&pioC 14 0 &pioC 14 GPIO_ACTIVE_HIGH
0 0
>; >;
...@@ -134,13 +134,13 @@ leds { ...@@ -134,13 +134,13 @@ leds {
led0 { led0 {
label = "led0"; label = "led0";
gpios = <&pioD 0 1>; gpios = <&pioD 0 GPIO_ACTIVE_LOW>;
linux,default-trigger = "nand-disk"; linux,default-trigger = "nand-disk";
}; };
led1 { led1 {
label = "led1"; label = "led1";
gpios = <&pioD 31 0>; gpios = <&pioD 31 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
}; };
...@@ -152,13 +152,13 @@ gpio_keys { ...@@ -152,13 +152,13 @@ gpio_keys {
right { right {
label = "SW4"; label = "SW4";
gpios = <&pioE 7 1>; gpios = <&pioE 7 GPIO_ACTIVE_LOW>;
linux,code = <106>; linux,code = <106>;
}; };
up { up {
label = "SW3"; label = "SW3";
gpios = <&pioE 8 1>; gpios = <&pioE 8 GPIO_ACTIVE_LOW>;
linux,code = <103>; linux,code = <103>;
}; };
}; };
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
*/ */
#include "skeleton.dtsi" #include "skeleton.dtsi"
#include <dt-bindings/gpio/gpio.h>
/ { / {
model = "Atmel SAMA5D3 family SoC"; model = "Atmel SAMA5D3 family SoC";
......
...@@ -41,7 +41,7 @@ macb1: ethernet@f802c000 { ...@@ -41,7 +41,7 @@ macb1: ethernet@f802c000 {
leds { leds {
d3 { d3 {
label = "d3"; label = "d3";
gpios = <&pioE 24 0>; gpios = <&pioE 24 GPIO_ACTIVE_HIGH>;
}; };
}; };
......
...@@ -51,7 +51,7 @@ macb0: ethernet@f0028000 { ...@@ -51,7 +51,7 @@ macb0: ethernet@f0028000 {
leds { leds {
d3 { d3 {
label = "d3"; label = "d3";
gpios = <&pioE 24 0>; gpios = <&pioE 24 GPIO_ACTIVE_HIGH>;
}; };
}; };
......
...@@ -48,7 +48,7 @@ gpio_keys { ...@@ -48,7 +48,7 @@ gpio_keys {
pb_user1 { pb_user1 {
label = "pb_user1"; label = "pb_user1";
gpios = <&pioE 27 0>; gpios = <&pioE 27 GPIO_ACTIVE_HIGH>;
linux,code = <0x100>; linux,code = <0x100>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
......
...@@ -85,7 +85,7 @@ leds { ...@@ -85,7 +85,7 @@ leds {
d2 { d2 {
label = "d2"; label = "d2";
gpios = <&pioE 25 1>; /* PE25, conflicts with A25, RXD2 */ gpios = <&pioE 25 GPIO_ACTIVE_LOW>; /* PE25, conflicts with A25, RXD2 */
}; };
}; };
}; };
...@@ -20,7 +20,7 @@ mmc0: mmc@f0000000 { ...@@ -20,7 +20,7 @@ mmc0: mmc@f0000000 {
slot@0 { slot@0 {
reg = <0>; reg = <0>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pioD 17 0>; cd-gpios = <&pioD 17 GPIO_ACTIVE_HIGH>;
}; };
}; };
...@@ -62,7 +62,7 @@ mmc1: mmc@f8000000 { ...@@ -62,7 +62,7 @@ mmc1: mmc@f8000000 {
slot@0 { slot@0 {
reg = <0>; reg = <0>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pioD 18 0>; cd-gpios = <&pioD 18 GPIO_ACTIVE_HIGH>;
}; };
}; };
...@@ -127,7 +127,7 @@ watchdog@fffffe40 { ...@@ -127,7 +127,7 @@ watchdog@fffffe40 {
}; };
usb0: gadget@00500000 { usb0: gadget@00500000 {
atmel,vbus-gpio = <&pioD 29 0>; atmel,vbus-gpio = <&pioD 29 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usba_vbus>; pinctrl-0 = <&pinctrl_usba_vbus>;
status = "okay"; status = "okay";
...@@ -135,9 +135,9 @@ usb0: gadget@00500000 { ...@@ -135,9 +135,9 @@ usb0: gadget@00500000 {
usb1: ohci@00600000 { usb1: ohci@00600000 {
num-ports = <3>; num-ports = <3>;
atmel,vbus-gpio = <&pioD 25 0 atmel,vbus-gpio = <&pioD 25 GPIO_ACTIVE_HIGH
&pioD 26 1 &pioD 26 GPIO_ACTIVE_LOW
&pioD 27 1 &pioD 27 GPIO_ACTIVE_LOW
>; >;
status = "okay"; status = "okay";
}; };
......
...@@ -38,7 +38,7 @@ dbgu: serial@ffffee00 { ...@@ -38,7 +38,7 @@ dbgu: serial@ffffee00 {
}; };
usb1: gadget@fff78000 { usb1: gadget@fff78000 {
atmel,vbus-gpio = <&pioB 11 0>; atmel,vbus-gpio = <&pioB 11 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
}; };
......
...@@ -30,7 +30,7 @@ macb0: ethernet@fffc4000 { ...@@ -30,7 +30,7 @@ macb0: ethernet@fffc4000 {
}; };
usb1: gadget@fffa4000 { usb1: gadget@fffa4000 {
atmel,vbus-gpio = <&pioC 5 0>; atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
}; };
...@@ -93,7 +93,7 @@ leds { ...@@ -93,7 +93,7 @@ leds {
user_led { user_led {
label = "user_led"; label = "user_led";
gpios = <&pioB 21 1>; gpios = <&pioB 21 GPIO_ACTIVE_LOW>;
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
}; };
...@@ -105,7 +105,7 @@ gpio_keys { ...@@ -105,7 +105,7 @@ gpio_keys {
user_pb { user_pb {
label = "user_pb"; label = "user_pb";
gpios = <&pioB 10 1>; gpios = <&pioB 10 GPIO_ACTIVE_LOW>;
linux,code = <28>; linux,code = <28>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
......
...@@ -43,7 +43,7 @@ macb0: ethernet@fffbc000 { ...@@ -43,7 +43,7 @@ macb0: ethernet@fffbc000 {
}; };
usb1: gadget@fff78000 { usb1: gadget@fff78000 {
atmel,vbus-gpio = <&pioB 11 0>; atmel,vbus-gpio = <&pioB 11 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
...@@ -107,7 +107,7 @@ leds { ...@@ -107,7 +107,7 @@ leds {
user_led { user_led {
label = "user_led"; label = "user_led";
gpios = <&pioB 21 0>; gpios = <&pioB 21 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
}; };
...@@ -119,7 +119,7 @@ gpio_keys { ...@@ -119,7 +119,7 @@ gpio_keys {
user_pb { user_pb {
label = "user_pb"; label = "user_pb";
gpios = <&pioB 10 1>; gpios = <&pioB 10 GPIO_ACTIVE_LOW>;
linux,code = <28>; linux,code = <28>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
......
...@@ -28,39 +28,39 @@ leds { ...@@ -28,39 +28,39 @@ leds {
user_led1 { user_led1 {
label = "user_led1"; label = "user_led1";
gpios = <&pioB 20 1>; gpios = <&pioB 20 GPIO_ACTIVE_LOW>;
}; };
/* /*
* led already used by mother board but active as high * led already used by mother board but active as high
* user_led2 { * user_led2 {
* label = "user_led2"; * label = "user_led2";
* gpios = <&pioB 21 1>; * gpios = <&pioB 21 GPIO_ACTIVE_LOW>;
* }; * };
*/ */
user_led3 { user_led3 {
label = "user_led3"; label = "user_led3";
gpios = <&pioB 22 1>; gpios = <&pioB 22 GPIO_ACTIVE_LOW>;
}; };
user_led4 { user_led4 {
label = "user_led4"; label = "user_led4";
gpios = <&pioB 23 1>; gpios = <&pioB 23 GPIO_ACTIVE_LOW>;
}; };
red { red {
label = "red"; label = "red";
gpios = <&pioB 24 1>; gpios = <&pioB 24 GPIO_ACTIVE_LOW>;
}; };
orange { orange {
label = "orange"; label = "orange";
gpios = <&pioB 30 1>; gpios = <&pioB 30 GPIO_ACTIVE_LOW>;
}; };
green { green {
label = "green"; label = "green";
gpios = <&pioB 31 1>; gpios = <&pioB 31 GPIO_ACTIVE_LOW>;
}; };
}; };
...@@ -71,25 +71,25 @@ gpio_keys { ...@@ -71,25 +71,25 @@ gpio_keys {
user_pb1 { user_pb1 {
label = "user_pb1"; label = "user_pb1";
gpios = <&pioB 25 1>; gpios = <&pioB 25 GPIO_ACTIVE_LOW>;
linux,code = <0x100>; linux,code = <0x100>;
}; };
user_pb2 { user_pb2 {
label = "user_pb2"; label = "user_pb2";
gpios = <&pioB 13 1>; gpios = <&pioB 13 GPIO_ACTIVE_LOW>;
linux,code = <0x101>; linux,code = <0x101>;
}; };
user_pb3 { user_pb3 {
label = "user_pb3"; label = "user_pb3";
gpios = <&pioA 26 1>; gpios = <&pioA 26 GPIO_ACTIVE_LOW>;
linux,code = <0x102>; linux,code = <0x102>;
}; };
user_pb4 { user_pb4 {
label = "user_pb4"; label = "user_pb4";
gpios = <&pioC 9 1>; gpios = <&pioC 9 GPIO_ACTIVE_LOW>;
linux,code = <0x103>; linux,code = <0x103>;
}; };
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment