Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[cascardo/linux.git] / arch / arm / boot / dts / at91sam9263ek.dts

diff --git a/arch/arm/boot/dts/at91sam9263ek.dts b/arch/arm/boot/dts/at91sam9263ek.dts
index 3b82d91..70f835b 100644 (file)
--- a/arch/arm/boot/dts/at91sam9263ek.dts
+++ b/arch/arm/boot/dts/at91sam9263ek.dts
@@ -6,7 +6,7 @@
  * Licensed under GPLv2 only
  */
 /dts-v1/;
-/include/ "at91sam9263.dtsi"
+#include "at91sam9263.dtsi"
 
 / {
        model = "Atmel at91sam9263ek";
@@ -51,7 +51,7 @@
                        };
 
                        usb1: gadget@fff78000 {
-                               atmel,vbus-gpio = <&pioA 25 0>;
+                               atmel,vbus-gpio = <&pioA 25 GPIO_ACTIVE_HIGH>;
                                status = "okay";
                        };
 
@@ -65,8 +65,8 @@
                                slot@0 {
                                        reg = <0>;
                                        bus-width = <4>;
-                                       cd-gpios = <&pioE 18 0>;
-                                       wp-gpios = <&pioE 19 0>;
+                                       cd-gpios = <&pioE 18 GPIO_ACTIVE_HIGH>;
+                                       wp-gpios = <&pioE 19 GPIO_ACTIVE_HIGH>;
                                };
                        };
 
@@ -74,8 +74,8 @@
                                mmc0 {
                                        pinctrl_board_mmc0: mmc0-board {
                                                atmel,pins =
-                                                       <5 18 0x0 0x5   /* PE18 gpio CD pin pull up and deglitch */
-                                                        5 19 0x0 0x1>; /* PE19 gpio WP pin pull up */
+                                                       <AT91_PIOE 18 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH    /* PE18 gpio CD pin pull up and deglitch */
+                                                        AT91_PIOE 19 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;   /* PE19 gpio WP pin pull up */
                                        };
                                };
                        };
@@ -89,6 +89,10 @@
                                        reg = <0>;
                                };
                        };
+
+                       watchdog@fffffd40 {
+                               status = "okay";
+                       };
                };
 
                nand0: nand@40000000 {
@@ -141,8 +145,8 @@
                usb0: ohci@00a00000 {
                        num-ports = <2>;
                        status = "okay";
-                       atmel,vbus-gpio = <&pioA 24 0
-                                          &pioA 21 0
+                       atmel,vbus-gpio = <&pioA 24 GPIO_ACTIVE_HIGH
+                                          &pioA 21 GPIO_ACTIVE_HIGH
                                          >;
                };
        };
@@ -152,13 +156,13 @@
 
                d3 {
                        label = "d3";
-                       gpios = <&pioB 7 0>;
+                       gpios = <&pioB 7 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "heartbeat";
                };
 
                d2 {
                        label = "d2";
-                       gpios = <&pioC 29 1>;
+                       gpios = <&pioC 29 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "nand-disk";
                };
        };
@@ -168,14 +172,14 @@
 
                left_click {
                        label = "left_click";
-                       gpios = <&pioC 5 1>;
+                       gpios = <&pioC 5 GPIO_ACTIVE_LOW>;
                        linux,code = <272>;
                        gpio-key,wakeup;
                };
 
                right_click {
                        label = "right_click";
-                       gpios = <&pioC 4 1>;
+                       gpios = <&pioC 4 GPIO_ACTIVE_LOW>;
                        linux,code = <273>;
                        gpio-key,wakeup;
                };