Merge tag 'regmap-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[deliverable/linux.git] / arch / arm / boot / dts / sama5d3xmb.dtsi

diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi
index 661d7ca9c309b6b03a6c8a94af36accf82a57105..8a9e05d8a4b87dc870bb293eb7b65c26f0241b19 100644 (file)
--- a/arch/arm/boot/dts/sama5d3xmb.dtsi
+++ b/arch/arm/boot/dts/sama5d3xmb.dtsi
@@ -6,7 +6,7 @@
  *
  * Licensed under GPLv2 or later.
  */
-/include/ "sama5d3xcm.dtsi"
+#include "sama5d3xcm.dtsi"
 
 / {
        compatible = "atmel,sama5d3xmb", "atmel,sama5d3xcm", "atmel,sama5d3", "atmel,sama5";
@@ -20,7 +20,7 @@
                                slot@0 {
                                        reg = <0>;
                                        bus-width = <4>;
-                                       cd-gpios = <&pioD 17 0>;
+                                       cd-gpios = <&pioD 17 GPIO_ACTIVE_HIGH>;
                                };
                        };
 
@@ -62,7 +62,7 @@
                                slot@0 {
                                        reg = <0>;
                                        bus-width = <4>;
-                                       cd-gpios = <&pioD 18 0>;
+                                       cd-gpios = <&pioD 18 GPIO_ACTIVE_HIGH>;
                                };
                        };
 
@@ -87,32 +87,32 @@
                                board {
                                        pinctrl_mmc0_cd: mmc0_cd {
                                                atmel,pins =
-                                                       <3 17 0x0 0x5>; /* PD17 GPIO with pullup deglitch */
+                                                       <AT91_PIOD 17 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PD17 GPIO with pullup deglitch */
                                        };
 
                                        pinctrl_mmc1_cd: mmc1_cd {
                                                atmel,pins =
-                                                       <3 18 0x0 0x5>; /* PD18 GPIO with pullup deglitch */
+                                                       <AT91_PIOD 18 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PD18 GPIO with pullup deglitch */
                                        };
 
                                        pinctrl_pck0_as_audio_mck: pck0_as_audio_mck {
                                                atmel,pins =
-                                                       <3 30 0x2 0x0>; /* PD30 periph B */
+                                                       <AT91_PIOD 30 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PD30 periph B */
                                        };
 
                                        pinctrl_isi_reset: isi_reset-0 {
                                                atmel,pins =
-                                                       <4 24 0x0 0x0>;   /* PE24 gpio */
+                                                       <AT91_PIOE 24 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;   /* PE24 gpio */
                                        };
 
                                        pinctrl_isi_power: isi_power-0 {
                                                atmel,pins =
-                                                       <4 29 0x0 0x0>; /* PE29 gpio */
+                                                       <AT91_PIOE 29 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>; /* PE29 gpio */
                                        };
 
                                        pinctrl_usba_vbus: usba_vbus {
                                                atmel,pins =
-                                                       <3 29 0x0 0x4>; /* PD29 GPIO with deglitch */
+                                                       <AT91_PIOD 29 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>; /* PD29 GPIO with deglitch */
                                        };
                                };
                        };
@@ -127,7 +127,7 @@
                };
 
                usb0: gadget@00500000 {
-                       atmel,vbus-gpio = <&pioD 29 0>;
+                       atmel,vbus-gpio = <&pioD 29 GPIO_ACTIVE_HIGH>;
                        pinctrl-names = "default";
                        pinctrl-0 = <&pinctrl_usba_vbus>;
                        status = "okay";
@@ -135,9 +135,9 @@
 
                usb1: ohci@00600000 {
                        num-ports = <3>;
-                       atmel,vbus-gpio = <&pioD 25 0
-                                          &pioD 26 1
-                                          &pioD 27 1
+                       atmel,vbus-gpio = <&pioD 25 GPIO_ACTIVE_HIGH
+                                          &pioD 26 GPIO_ACTIVE_LOW
+                                          &pioD 27 GPIO_ACTIVE_LOW
                                          >;
                        status = "okay";
                };