1 files changed, 13 insertions, 15 deletions

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 @@
  *
  * Licensed under GPLv2.
  */
-/include/ "at91sam9g20.dtsi"
+#include "at91sam9g20.dtsi"
 
 / {
 
@@ -34,10 +34,17 @@
                                 board {
                                         pinctrl_pck0_as_mck: pck0_as_mck {
                                                 atmel,pins =
-                                                        <2 1 0x2 0x0>;  /* PC1 periph B */
+                                                        <AT91_PIOC 1 AT91_PERIPH_B AT91_PINCTRL_NONE>;  /* PC1 periph B */
                                         };
 
                                 };
+
+                                mmc0_slot1 {
+                                        pinctrl_board_mmc0_slot1: mmc0_slot1-board {
+                                                atmel,pins =
+                                                        <AT91_PIOC 9 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;   /* PC9 gpio CD pin pull up and deglitch */
+                                        };
+                                };
                         };
 
                         dbgu: serial@fffff200 {
@@ -65,7 +72,7 @@
                         };
 
                         usb1: gadget@fffa4000 {
-                                atmel,vbus-gpio = <&pioC 5 0>;
+                                atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>;
                                 status = "okay";
                         };
 
@@ -79,16 +86,7 @@
                                 slot@1 {
                                         reg = <1>;
                                         bus-width = <4>;
-                                        cd-gpios = <&pioC 9 0>;
-                                };
-                        };
-
-                        pinctrl@fffff400 {
-                                mmc0_slot1 {
-                                        pinctrl_board_mmc0_slot1: mmc0_slot1-board {
-                                                atmel,pins =
-                                                        <2 9 0x0 0x5>;  /* PC9 gpio CD pin pull up and deglitch */
-                                        };
+                                        cd-gpios = <&pioC 9 GPIO_ACTIVE_HIGH>;
                                 };
                         };
 
@@ -180,14 +178,14 @@
 
                 btn3 {
                         label = "Button 3";
-                        gpios = <&pioA 30 1>;
+                        gpios = <&pioA 30 GPIO_ACTIVE_LOW>;
                         linux,code = <0x103>;
                         gpio-key,wakeup;
                 };
 
                 btn4 {
                         label = "Button 4";
-                        gpios = <&pioA 31 1>;
+                        gpios = <&pioA 31 GPIO_ACTIVE_LOW>;
                         linux,code = <0x104>;
                         gpio-key,wakeup;
                 };