1 files changed, 11 insertions, 11 deletions
diff --git a/arch/arm/boot/dts/pm9g45.dts b/arch/arm/boot/dts/pm9g45.dts
index 387fedb58988..33ffabe9c4c8 100644
--- a/arch/arm/boot/dts/pm9g45.dts
+++ b/arch/arm/boot/dts/pm9g45.dts
@@ -6,7 +6,7 @@
 * Licensed under GPLv2.
 */
 /dts-v1/;
-/include/ "at91sam9g45.dtsi"
+#include "at91sam9g45.dtsi"
 / {
        model = "Ronetix pm9g45";
@@ -42,15 +42,15 @@
                                board {
                                        pinctrl_board_nand: nand0-board {
                                                atmel,pins =
-                                                        <3 3 0x0 0x1    /* PD3 gpio RDY pin pull_up*/
+                                                        <AT91_PIOD 3 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP      /* PD3 gpio RDY pin pull_up*/
-                                                         2 14 0x0 0x1>; /* PC14 gpio enable pin pull_up */
+                                                         AT91_PIOC 14 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>;   /* PC14 gpio enable pin pull_up */
                                        };
                                };
                                mmc {
                                        pinctrl_board_mmc: mmc0-board {
                                                atmel,pins =
-                                                        <3 6 0x0 0x5>;  /* PD6 gpio CD pin pull_up and deglitch */
+                                                        <AT91_PIOD 6 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;   /* PD6 gpio CD pin pull_up and deglitch */
                                        };
                                };
                        };
@@ -64,7 +64,7 @@
                                slot@0 {
                                        reg = <0>;
                                        bus-width = <4>;
-                                        cd-gpios = <&pioD 6 0>;
+                                        cd-gpios = <&pioD 6 GPIO_ACTIVE_HIGH>;
                                };
                        };
@@ -81,8 +81,8 @@
                        nand-on-flash-bbt;
                        pinctrl-0 = <&pinctrl_board_nand>;
-                        gpios = <&pioD 3 0
+                        gpios = <&pioD 3 GPIO_ACTIVE_HIGH
-                                 &pioC 14 0
+                                 &pioC 14 GPIO_ACTIVE_HIGH
                                 0
                                >;
@@ -134,13 +134,13 @@
                led0 {
                        label = "led0";
-                        gpios = <&pioD 0 1>;
+                        gpios = <&pioD 0 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "nand-disk";
                };
                led1 {
                        label = "led1";
-                        gpios = <&pioD 31 0>;
+                        gpios = <&pioD 31 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "heartbeat";
                };
        };
@@ -152,13 +152,13 @@
                right {
                        label = "SW4";
-                        gpios = <&pioE 7 1>;
+                        gpios = <&pioE 7 GPIO_ACTIVE_LOW>;
                        linux,code = <106>;
                };
                up {
                        label = "SW3";
-                        gpios = <&pioE 8 1>;
+                        gpios = <&pioE 8 GPIO_ACTIVE_LOW>;
                        linux,code = <103>;
                };
        };

diff --git a/arch/arm/boot/dts/pm9g45.dts b/arch/arm/boot/dts/pm9g45.dts index 387fedb58988..33ffabe9c4c8 100644 --- a/arch/arm/boot/dts/pm9g45.dts +++ b/arch/arm/boot/dts/pm9g45.dts
@@ -6,7 +6,7 @@
6	* Licensed under GPLv2.	6	* Licensed under GPLv2.
7	*/	7	*/
8	/dts-v1/;	8	/dts-v1/;
9	/include/ "at91sam9g45.dtsi"	9	#include "at91sam9g45.dtsi"
10		10
11	/ {	11	/ {
12	model = "Ronetix pm9g45";	12	model = "Ronetix pm9g45";
@@ -42,15 +42,15 @@
42	board {	42	board {
43	pinctrl_board_nand: nand0-board {	43	pinctrl_board_nand: nand0-board {
44	atmel,pins =	44	atmel,pins =
45	<3 3 0x0 0x1 /* PD3 gpio RDY pin pull_up*/	45	<AT91_PIOD 3 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP /* PD3 gpio RDY pin pull_up*/
46	2 14 0x0 0x1>; /* PC14 gpio enable pin pull_up */	46	AT91_PIOC 14 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; /* PC14 gpio enable pin pull_up */
47	};	47	};
48	};	48	};
49		49
50	mmc {	50	mmc {
51	pinctrl_board_mmc: mmc0-board {	51	pinctrl_board_mmc: mmc0-board {
52	atmel,pins =	52	atmel,pins =
53	<3 6 0x0 0x5>; /* PD6 gpio CD pin pull_up and deglitch */	53	<AT91_PIOD 6 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PD6 gpio CD pin pull_up and deglitch */
54	};	54	};
55	};	55	};
56	};	56	};
@@ -64,7 +64,7 @@
64	slot@0 {	64	slot@0 {
65	reg = <0>;	65	reg = <0>;
66	bus-width = <4>;	66	bus-width = <4>;
67	cd-gpios = <&pioD 6 0>;	67	cd-gpios = <&pioD 6 GPIO_ACTIVE_HIGH>;
68	};	68	};
69	};	69	};
70		70
@@ -81,8 +81,8 @@
81	nand-on-flash-bbt;	81	nand-on-flash-bbt;
82	pinctrl-0 = <&pinctrl_board_nand>;	82	pinctrl-0 = <&pinctrl_board_nand>;
83		83
84	gpios = <&pioD 3 0	84	gpios = <&pioD 3 GPIO_ACTIVE_HIGH
85	&pioC 14 0	85	&pioC 14 GPIO_ACTIVE_HIGH
86	0	86	0
87	>;	87	>;
88		88
@@ -134,13 +134,13 @@
134		134
135	led0 {	135	led0 {
136	label = "led0";	136	label = "led0";
137	gpios = <&pioD 0 1>;	137	gpios = <&pioD 0 GPIO_ACTIVE_LOW>;
138	linux,default-trigger = "nand-disk";	138	linux,default-trigger = "nand-disk";
139	};	139	};
140		140
141	led1 {	141	led1 {
142	label = "led1";	142	label = "led1";
143	gpios = <&pioD 31 0>;	143	gpios = <&pioD 31 GPIO_ACTIVE_HIGH>;
144	linux,default-trigger = "heartbeat";	144	linux,default-trigger = "heartbeat";
145	};	145	};
146	};	146	};
@@ -152,13 +152,13 @@
152		152
153	right {	153	right {
154	label = "SW4";	154	label = "SW4";
155	gpios = <&pioE 7 1>;	155	gpios = <&pioE 7 GPIO_ACTIVE_LOW>;
156	linux,code = <106>;	156	linux,code = <106>;
157	};	157	};
158		158
159	up {	159	up {
160	label = "SW3";	160	label = "SW3";
161	gpios = <&pioE 8 1>;	161	gpios = <&pioE 8 GPIO_ACTIVE_LOW>;
162	linux,code = <103>;	162	linux,code = <103>;
163	};	163	};
164	};	164	};