1 files changed, 7 insertions, 7 deletions
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 @@
 * Licensed under GPLv2 or later.
 */
 /dts-v1/;
-/include/ "at91sam9n12.dtsi"
+#include "at91sam9n12.dtsi"
 / {
        model = "Atmel AT91SAM9N12-EK";
@@ -55,7 +55,7 @@
                                slot@0 {
                                        reg = <0>;
                                        bus-width = <4>;
-                                        cd-gpios = <&pioA 7 0>;
+                                        cd-gpios = <&pioA 7 GPIO_ACTIVE_HIGH>;
                                };
                        };
@@ -63,7 +63,7 @@
                                mmc0 {
                                        pinctrl_board_mmc0: mmc0-board {
                                                atmel,pins =
-                                                        <0 7 0x0 0x5>;  /* PA7 gpio CD pin pull up and deglitch */
+                                                        <AT91_PIOA 7 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;   /* PA7 gpio CD pin pull up and deglitch */
                                        };
                                };
                        };
@@ -95,19 +95,19 @@
                d8 {
                        label = "d8";
-                        gpios = <&pioB 4 1>;
+                        gpios = <&pioB 4 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "mmc0";
                };
                d9 {
                        label = "d6";
-                        gpios = <&pioB 5 1>;
+                        gpios = <&pioB 5 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "nand-disk";
                };
                d10 {
                        label = "d7";
-                        gpios = <&pioB 6 0>;
+                        gpios = <&pioB 6 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "heartbeat";
                };
        };
@@ -117,7 +117,7 @@
                enter {
                        label = "Enter";
-                        gpios = <&pioB 4 1>;
+                        gpios = <&pioB 4 GPIO_ACTIVE_LOW>;
                        linux,code = <28>;
                        gpio-key,wakeup;
                };

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	};