ARM: at91: dt: add mmc pinctrl for Atmel reference boards

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

diff --git a/arch/arm/boot/dts/at91sam9263ek.dts b/arch/arm/boot/dts/at91sam9263ek.dts
index 8e319bbd7ae1ca2bdd2bf494b3b1b5e4be52dada..1eb08728f5279090a3f2ba704b35f47f1ef0fbe6 100644 (file)
--- a/arch/arm/boot/dts/at91sam9263ek.dts
+++ b/arch/arm/boot/dts/at91sam9263ek.dts
@@ -56,6 +56,11 @@
                        };
 
                        mmc0: mmc@fff80000 {
+                               pinctrl-0 = <
+                                       &pinctrl_board_mmc0
+                                       &pinctrl_mmc0_clk
+                                       &pinctrl_mmc0_slot0_cmd_dat0
+                                       &pinctrl_mmc0_slot0_dat1_3>;
                                status = "okay";
                                slot@0 {
                                        reg = <0>;
@@ -64,6 +69,16 @@
                                        wp-gpios = <&pioE 19 0>;
                                };
                        };
+
+                       pinctrl@fffff200 {
+                               mmc0 {
+                                       pinctrl_board_mmc0: mmc0-board {
+                                               atmel,pins =
+                                                       <5 18 0x0 0x5   /* PE18 gpio CD pin pull up and deglitch */
+                                                        5 19 0x0 0x1>; /* PE19 gpio WP pin pull up */
+                                       };
+                               };
+                       };
                };
 
                nand0: nand@40000000 {

diff --git a/arch/arm/boot/dts/at91sam9g20ek_2mmc.dts b/arch/arm/boot/dts/at91sam9g20ek_2mmc.dts
index 684b22982f8a1586228789d4ea4483949a047145..66467b1131264bd409da608f58d70f5f3703f79e 100644 (file)
--- a/arch/arm/boot/dts/at91sam9g20ek_2mmc.dts
+++ b/arch/arm/boot/dts/at91sam9g20ek_2mmc.dts
@@ -15,12 +15,26 @@
        ahb {
                apb{
                        mmc0: mmc@fffa8000 {
+                               /* clk already mux wuth slot0 */
+                               pinctrl-0 = <
+                                       &pinctrl_board_mmc0_slot0
+                                       &pinctrl_mmc0_slot0_cmd_dat0
+                                       &pinctrl_mmc0_slot0_dat1_3>;
                                slot@0 {
                                        reg = <0>;
                                        bus-width = <4>;
                                        cd-gpios = <&pioC 2 0>;
                                };
                        };
+
+                       pinctrl@fffff400 {
+                               mmc0_slot0 {
+                                       pinctrl_board_mmc0_slot0: mmc0_slot0-board {
+                                               atmel,pins =
+                                                       <2 2 0x0 0x5>;  /* PC2 gpio CD pin pull up and deglitch */
+                                       };
+                               };
+                       };
                };
        };
 

diff --git a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
index 0090015a7d5446a0809ab3b68bd3830f946fd1d2..32a500a0e481f7473de51be152546081b8bddd15 100644 (file)
--- a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
+++ b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
@@ -60,6 +60,11 @@
                        };
 
                        mmc0: mmc@fffa8000 {
+                               pinctrl-0 = <
+                                       &pinctrl_board_mmc0_slot1
+                                       &pinctrl_mmc0_clk
+                                       &pinctrl_mmc0_slot1_cmd_dat0
+                                       &pinctrl_mmc0_slot1_dat1_3>;
                                status = "okay";
                                slot@1 {
                                        reg = <1>;
@@ -67,6 +72,15 @@
                                        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 */
+                                       };
+                               };
+                       };
                };
 
                nand0: nand@40000000 {

diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts
index 1fc299fe66bc64c139d33eab997d5ce9f50f7afd..20c31913c27015ff21086a6fcede5883dcaff0bb 100644 (file)
--- a/arch/arm/boot/dts/at91sam9m10g45ek.dts
+++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts
@@ -60,6 +60,10 @@
                        };
 
                        mmc0: mmc@fff80000 {
+                               pinctrl-0 = <
+                                       &pinctrl_board_mmc0
+                                       &pinctrl_mmc0_slot0_clk_cmd_dat0
+                                       &pinctrl_mmc0_slot0_dat1_3>;
                                status = "okay";
                                slot@0 {
                                        reg = <0>;
@@ -69,6 +73,10 @@
                        };
 
                        mmc1: mmc@fffd0000 {
+                               pinctrl-0 = <
+                                       &pinctrl_board_mmc1
+                                       &pinctrl_mmc1_slot0_clk_cmd_dat0
+                                       &pinctrl_mmc1_slot0_dat1_3>;
                                status = "okay";
                                slot@0 {
                                        reg = <0>;
@@ -77,6 +85,23 @@
                                        wp-gpios = <&pioD 29 0>;
                                };
                        };
+
+                       pinctrl@fffff200 {
+                               mmc0 {
+                                       pinctrl_board_mmc0: mmc0-board {
+                                               atmel,pins =
+                                                       <3 10 0x0 0x5>; /* PD10 gpio CD pin pull up and deglitch */
+                                       };
+                               };
+
+                               mmc1 {
+                                       pinctrl_board_mmc1: mmc1-board {
+                                               atmel,pins =
+                                                       <3 11 0x0 0x5   /* PD11 gpio CD pin pull up and deglitch */
+                                                        3 29 0x0 0x1>; /* PD29 gpio WP pin pull up */
+                                       };
+                               };
+                       };
                };
 
                nand0: nand@40000000 {

diff --git a/arch/arm/boot/dts/at91sam9n12ek.dts b/arch/arm/boot/dts/at91sam9n12ek.dts
index 3d165bc919f894b67faade3f708317fc2ad6320e..0376bf4fd66b81860999a46e581f6879ce35592a 100644 (file)
--- a/arch/arm/boot/dts/at91sam9n12ek.dts
+++ b/arch/arm/boot/dts/at91sam9n12ek.dts
@@ -47,6 +47,10 @@
                        };
 
                        mmc0: mmc@f0008000 {
+                               pinctrl-0 = <
+                                       &pinctrl_board_mmc0
+                                       &pinctrl_mmc0_slot0_clk_cmd_dat0
+                                       &pinctrl_mmc0_slot0_dat1_3>;
                                status = "okay";
                                slot@0 {
                                        reg = <0>;
@@ -54,6 +58,15 @@
                                        cd-gpios = <&pioA 7 0>;
                                };
                        };
+
+                       pinctrl@fffff400 {
+                               mmc0 {
+                                       pinctrl_board_mmc0: mmc0-board {
+                                               atmel,pins =
+                                                       <0 7 0x0 0x5>;  /* PA7 gpio CD pin pull up and deglitch */
+                                       };
+                               };
+                       };
                };
 
                nand0: nand@40000000 {

diff --git a/arch/arm/boot/dts/at91sam9x5ek.dtsi b/arch/arm/boot/dts/at91sam9x5ek.dtsi
index e042b5eaf6800d4fe5a1a312caa6241d1b1babc3..8a7cf1d9cf5db6f71ee002725151a6d968da40fa 100644 (file)
--- a/arch/arm/boot/dts/at91sam9x5ek.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5ek.dtsi
@@ -19,6 +19,10 @@
        ahb {
                apb {
                        mmc0: mmc@f0008000 {
+                               pinctrl-0 = <
+                                       &pinctrl_board_mmc0
+                                       &pinctrl_mmc0_slot0_clk_cmd_dat0
+                                       &pinctrl_mmc0_slot0_dat1_3>;
                                status = "okay";
                                slot@0 {
                                        reg = <0>;
@@ -28,6 +32,10 @@
                        };
 
                        mmc1: mmc@f000c000 {
+                               pinctrl-0 = <
+                                       &pinctrl_board_mmc1
+                                       &pinctrl_mmc1_slot0_clk_cmd_dat0
+                                       &pinctrl_mmc1_slot0_dat1_3>;
                                status = "okay";
                                slot@0 {
                                        reg = <0>;
@@ -60,6 +68,22 @@
                        i2c2: i2c@f8018000 {
                                status = "okay";
                        };
+
+                       pinctrl@fffff400 {
+                               mmc0 {
+                                       pinctrl_board_mmc0: mmc0-board {
+                                               atmel,pins =
+                                                       <3 15 0x0 0x5>; /* PD15 gpio CD pin pull up and deglitch */
+                                       };
+                               };
+
+                               mmc1 {
+                                       pinctrl_board_mmc1: mmc1-board {
+                                               atmel,pins =
+                                                       <3 14 0x0 0x5>; /* PD14 gpio CD pin pull up and deglitch */
+                                       };
+                               };
+                       };
                };
 
                usb0: ohci@00600000 {