ARM: at91: dt: switch to pinctrl to pre-processor

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

1 files changed, 8 insertions, 10 deletions

diff --git a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
index 79338393caf9..c7ffc32918f9 100644
--- a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
+++ b/arch/arm/boot/dts/at91sam9g20ek_common.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 {
@@ -83,15 +90,6 @@
                                 };
                         };
 
-                        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 */
-                                        };
-                                };
-                        };
-
                         ssc0: ssc@fffbc000 {
                                 status = "okay";
                                 pinctrl-0 = <&pinctrl_ssc0_tx>;