aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2012-11-19 11:38:18 -0500
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2012-11-19 12:10:27 -0500
commit199e2edec49b8a24f67afdae61e57cfa6d68bfca (patch)
treef682c176bda8ed4c3ef2ce105d7d7b066f9a4c76
parentd4fe9ac76d43a2ce5472e0ed19c8e1e29dea0688 (diff)
ARM: at91: dt: add mmc pinctrl for Atmel reference boards
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat
-rw-r--r--arch/arm/boot/dts/at91sam9263ek.dts15
-rw-r--r--arch/arm/boot/dts/at91sam9g20ek_2mmc.dts14
-rw-r--r--arch/arm/boot/dts/at91sam9g20ek_common.dtsi14
-rw-r--r--arch/arm/boot/dts/at91sam9m10g45ek.dts25
-rw-r--r--arch/arm/boot/dts/at91sam9n12ek.dts13
-rw-r--r--arch/arm/boot/dts/at91sam9x5ek.dtsi24
6 files changed, 105 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/at91sam9263ek.dts b/arch/arm/boot/dts/at91sam9263ek.dts
index 8e319bbd7ae1..1eb08728f527 100644
--- a/arch/arm/boot/dts/at91sam9263ek.dts
+++ b/arch/arm/boot/dts/at91sam9263ek.dts
@@ -56,6 +56,11 @@
56 }; 56 };
57 57
58 mmc0: mmc@fff80000 { 58 mmc0: mmc@fff80000 {
59 pinctrl-0 = <
60 &pinctrl_board_mmc0
61 &pinctrl_mmc0_clk
62 &pinctrl_mmc0_slot0_cmd_dat0
63 &pinctrl_mmc0_slot0_dat1_3>;
59 status = "okay"; 64 status = "okay";
60 slot@0 { 65 slot@0 {
61 reg = <0>; 66 reg = <0>;
@@ -64,6 +69,16 @@
64 wp-gpios = <&pioE 19 0>; 69 wp-gpios = <&pioE 19 0>;
65 }; 70 };
66 }; 71 };
72
73 pinctrl@fffff200 {
74 mmc0 {
75 pinctrl_board_mmc0: mmc0-board {
76 atmel,pins =
77 <5 18 0x0 0x5 /* PE18 gpio CD pin pull up and deglitch */
78 5 19 0x0 0x1>; /* PE19 gpio WP pin pull up */
79 };
80 };
81 };
67 }; 82 };
68 83
69 nand0: nand@40000000 { 84 nand0: nand@40000000 {
diff --git a/arch/arm/boot/dts/at91sam9g20ek_2mmc.dts b/arch/arm/boot/dts/at91sam9g20ek_2mmc.dts
index 684b22982f8a..66467b113126 100644
--- a/arch/arm/boot/dts/at91sam9g20ek_2mmc.dts
+++ b/arch/arm/boot/dts/at91sam9g20ek_2mmc.dts
@@ -15,12 +15,26 @@
15 ahb { 15 ahb {
16 apb{ 16 apb{
17 mmc0: mmc@fffa8000 { 17 mmc0: mmc@fffa8000 {
18 /* clk already mux wuth slot0 */
19 pinctrl-0 = <
20 &pinctrl_board_mmc0_slot0
21 &pinctrl_mmc0_slot0_cmd_dat0
22 &pinctrl_mmc0_slot0_dat1_3>;
18 slot@0 { 23 slot@0 {
19 reg = <0>; 24 reg = <0>;
20 bus-width = <4>; 25 bus-width = <4>;
21 cd-gpios = <&pioC 2 0>; 26 cd-gpios = <&pioC 2 0>;
22 }; 27 };
23 }; 28 };
29
30 pinctrl@fffff400 {
31 mmc0_slot0 {
32 pinctrl_board_mmc0_slot0: mmc0_slot0-board {
33 atmel,pins =
34 <2 2 0x0 0x5>; /* PC2 gpio CD pin pull up and deglitch */
35 };
36 };
37 };
24 }; 38 };
25 }; 39 };
26 40
diff --git a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
index 0090015a7d54..32a500a0e481 100644
--- a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
+++ b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
@@ -60,6 +60,11 @@
60 }; 60 };
61 61
62 mmc0: mmc@fffa8000 { 62 mmc0: mmc@fffa8000 {
63 pinctrl-0 = <
64 &pinctrl_board_mmc0_slot1
65 &pinctrl_mmc0_clk
66 &pinctrl_mmc0_slot1_cmd_dat0
67 &pinctrl_mmc0_slot1_dat1_3>;
63 status = "okay"; 68 status = "okay";
64 slot@1 { 69 slot@1 {
65 reg = <1>; 70 reg = <1>;
@@ -67,6 +72,15 @@
67 cd-gpios = <&pioC 9 0>; 72 cd-gpios = <&pioC 9 0>;
68 }; 73 };
69 }; 74 };
75
76 pinctrl@fffff400 {
77 mmc0_slot1 {
78 pinctrl_board_mmc0_slot1: mmc0_slot1-board {
79 atmel,pins =
80 <2 9 0x0 0x5>; /* PC9 gpio CD pin pull up and deglitch */
81 };
82 };
83 };
70 }; 84 };
71 85
72 nand0: nand@40000000 { 86 nand0: nand@40000000 {
diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts
index 1fc299fe66bc..20c31913c270 100644
--- a/arch/arm/boot/dts/at91sam9m10g45ek.dts
+++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts
@@ -60,6 +60,10 @@
60 }; 60 };
61 61
62 mmc0: mmc@fff80000 { 62 mmc0: mmc@fff80000 {
63 pinctrl-0 = <
64 &pinctrl_board_mmc0
65 &pinctrl_mmc0_slot0_clk_cmd_dat0
66 &pinctrl_mmc0_slot0_dat1_3>;
63 status = "okay"; 67 status = "okay";
64 slot@0 { 68 slot@0 {
65 reg = <0>; 69 reg = <0>;
@@ -69,6 +73,10 @@
69 }; 73 };
70 74
71 mmc1: mmc@fffd0000 { 75 mmc1: mmc@fffd0000 {
76 pinctrl-0 = <
77 &pinctrl_board_mmc1
78 &pinctrl_mmc1_slot0_clk_cmd_dat0
79 &pinctrl_mmc1_slot0_dat1_3>;
72 status = "okay"; 80 status = "okay";
73 slot@0 { 81 slot@0 {
74 reg = <0>; 82 reg = <0>;
@@ -77,6 +85,23 @@
77 wp-gpios = <&pioD 29 0>; 85 wp-gpios = <&pioD 29 0>;
78 }; 86 };
79 }; 87 };
88
89 pinctrl@fffff200 {
90 mmc0 {
91 pinctrl_board_mmc0: mmc0-board {
92 atmel,pins =
93 <3 10 0x0 0x5>; /* PD10 gpio CD pin pull up and deglitch */
94 };
95 };
96
97 mmc1 {
98 pinctrl_board_mmc1: mmc1-board {
99 atmel,pins =
100 <3 11 0x0 0x5 /* PD11 gpio CD pin pull up and deglitch */
101 3 29 0x0 0x1>; /* PD29 gpio WP pin pull up */
102 };
103 };
104 };
80 }; 105 };
81 106
82 nand0: nand@40000000 { 107 nand0: nand@40000000 {
diff --git a/arch/arm/boot/dts/at91sam9n12ek.dts b/arch/arm/boot/dts/at91sam9n12ek.dts
index 3d165bc919f8..0376bf4fd66b 100644
--- a/arch/arm/boot/dts/at91sam9n12ek.dts
+++ b/arch/arm/boot/dts/at91sam9n12ek.dts
@@ -47,6 +47,10 @@
47 }; 47 };
48 48
49 mmc0: mmc@f0008000 { 49 mmc0: mmc@f0008000 {
50 pinctrl-0 = <
51 &pinctrl_board_mmc0
52 &pinctrl_mmc0_slot0_clk_cmd_dat0
53 &pinctrl_mmc0_slot0_dat1_3>;
50 status = "okay"; 54 status = "okay";
51 slot@0 { 55 slot@0 {
52 reg = <0>; 56 reg = <0>;
@@ -54,6 +58,15 @@
54 cd-gpios = <&pioA 7 0>; 58 cd-gpios = <&pioA 7 0>;
55 }; 59 };
56 }; 60 };
61
62 pinctrl@fffff400 {
63 mmc0 {
64 pinctrl_board_mmc0: mmc0-board {
65 atmel,pins =
66 <0 7 0x0 0x5>; /* PA7 gpio CD pin pull up and deglitch */
67 };
68 };
69 };
57 }; 70 };
58 71
59 nand0: nand@40000000 { 72 nand0: nand@40000000 {
diff --git a/arch/arm/boot/dts/at91sam9x5ek.dtsi b/arch/arm/boot/dts/at91sam9x5ek.dtsi
index e042b5eaf680..8a7cf1d9cf5d 100644
--- a/arch/arm/boot/dts/at91sam9x5ek.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5ek.dtsi
@@ -19,6 +19,10 @@
19 ahb { 19 ahb {
20 apb { 20 apb {
21 mmc0: mmc@f0008000 { 21 mmc0: mmc@f0008000 {
22 pinctrl-0 = <
23 &pinctrl_board_mmc0
24 &pinctrl_mmc0_slot0_clk_cmd_dat0
25 &pinctrl_mmc0_slot0_dat1_3>;
22 status = "okay"; 26 status = "okay";
23 slot@0 { 27 slot@0 {
24 reg = <0>; 28 reg = <0>;
@@ -28,6 +32,10 @@
28 }; 32 };
29 33
30 mmc1: mmc@f000c000 { 34 mmc1: mmc@f000c000 {
35 pinctrl-0 = <
36 &pinctrl_board_mmc1
37 &pinctrl_mmc1_slot0_clk_cmd_dat0
38 &pinctrl_mmc1_slot0_dat1_3>;
31 status = "okay"; 39 status = "okay";
32 slot@0 { 40 slot@0 {
33 reg = <0>; 41 reg = <0>;
@@ -60,6 +68,22 @@
60 i2c2: i2c@f8018000 { 68 i2c2: i2c@f8018000 {
61 status = "okay"; 69 status = "okay";
62 }; 70 };
71
72 pinctrl@fffff400 {
73 mmc0 {
74 pinctrl_board_mmc0: mmc0-board {
75 atmel,pins =
76 <3 15 0x0 0x5>; /* PD15 gpio CD pin pull up and deglitch */
77 };
78 };
79
80 mmc1 {
81 pinctrl_board_mmc1: mmc1-board {
82 atmel,pins =
83 <3 14 0x0 0x5>; /* PD14 gpio CD pin pull up and deglitch */
84 };
85 };
86 };
63 }; 87 };
64 88
65 usb0: ohci@00600000 { 89 usb0: ohci@00600000 {
generated by cgit v1.2.2 (git 2.25.0) at 2024-09-21 10:45:55 -0400