aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorJoachim Eastwood <manabian@gmail.com>2012-12-04 13:10:57 -0500
committerNicolas Ferre <nicolas.ferre@atmel.com>2013-02-07 10:40:08 -0500
commit4e4c963ea9586647b055834e56f67c9ec1898692 (patch)
tree3a87bd8fcf0173d4a96642d33379617b146a47ea /arch/arm
parenta5618928d5b7acb0fcc9ff4868ec6f914a2d9942 (diff)
ARM: at91: add MMC bindings to RM9200 DT
Signed-off-by: Joachim Eastwood <manabian@gmail.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/at91rm9200.dtsi42
-rw-r--r--arch/arm/mach-at91/at91rm9200.c1
2 files changed, 43 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/at91rm9200.dtsi b/arch/arm/boot/dts/at91rm9200.dtsi
index 222047f1ece9..73edf0217890 100644
--- a/arch/arm/boot/dts/at91rm9200.dtsi
+++ b/arch/arm/boot/dts/at91rm9200.dtsi
@@ -88,6 +88,15 @@
88 interrupts = <20 4 0 21 4 0 22 4 0>; 88 interrupts = <20 4 0 21 4 0 22 4 0>;
89 }; 89 };
90 90
91 mmc0: mmc@fffb4000 {
92 compatible = "atmel,hsmci";
93 reg = <0xfffb4000 0x4000>;
94 interrupts = <10 4 0>;
95 #address-cells = <1>;
96 #size-cells = <0>;
97 status = "disabled";
98 };
99
91 pinctrl@fffff400 { 100 pinctrl@fffff400 {
92 #address-cells = <1>; 101 #address-cells = <1>;
93 #size-cells = <1>; 102 #size-cells = <1>;
@@ -207,6 +216,39 @@
207 }; 216 };
208 }; 217 };
209 218
219 mmc0 {
220 pinctrl_mmc0_clk: mmc0_clk-0 {
221 atmel,pins =
222 <0 27 0x1 0x0>; /* PA27 periph A */
223 };
224
225 pinctrl_mmc0_slot0_cmd_dat0: mmc0_slot0_cmd_dat0-0 {
226 atmel,pins =
227 <0 28 0x1 0x1 /* PA28 periph A with pullup */
228 0 29 0x1 0x1>; /* PA29 periph A with pullup */
229 };
230
231 pinctrl_mmc0_slot0_dat1_3: mmc0_slot0_dat1_3-0 {
232 atmel,pins =
233 <1 3 0x2 0x1 /* PB3 periph B with pullup */
234 1 4 0x2 0x1 /* PB4 periph B with pullup */
235 1 5 0x2 0x1>; /* PB5 periph B with pullup */
236 };
237
238 pinctrl_mmc0_slot1_cmd_dat0: mmc0_slot1_cmd_dat0-0 {
239 atmel,pins =
240 <0 8 0x2 0x1 /* PA8 periph B with pullup */
241 0 9 0x2 0x1>; /* PA9 periph B with pullup */
242 };
243
244 pinctrl_mmc0_slot1_dat1_3: mmc0_slot1_dat1_3-0 {
245 atmel,pins =
246 <0 10 0x2 0x1 /* PA10 periph B with pullup */
247 0 11 0x2 0x1 /* PA11 periph B with pullup */
248 0 12 0x2 0x1>; /* PA12 periph B with pullup */
249 };
250 };
251
210 pioA: gpio@fffff400 { 252 pioA: gpio@fffff400 {
211 compatible = "atmel,at91rm9200-gpio"; 253 compatible = "atmel,at91rm9200-gpio";
212 reg = <0xfffff400 0x200>; 254 reg = <0xfffff400 0x200>;
diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c
index 7aeb473ee539..9809f8546d7c 100644
--- a/arch/arm/mach-at91/at91rm9200.c
+++ b/arch/arm/mach-at91/at91rm9200.c
@@ -210,6 +210,7 @@ static struct clk_lookup periph_clocks_lookups[] = {
210 CLKDEV_CON_DEV_ID("t0_clk", "fffa4000.timer", &tc3_clk), 210 CLKDEV_CON_DEV_ID("t0_clk", "fffa4000.timer", &tc3_clk),
211 CLKDEV_CON_DEV_ID("t1_clk", "fffa4000.timer", &tc4_clk), 211 CLKDEV_CON_DEV_ID("t1_clk", "fffa4000.timer", &tc4_clk),
212 CLKDEV_CON_DEV_ID("t2_clk", "fffa4000.timer", &tc5_clk), 212 CLKDEV_CON_DEV_ID("t2_clk", "fffa4000.timer", &tc5_clk),
213 CLKDEV_CON_DEV_ID("mci_clk", "fffb4000.mmc", &mmc_clk),
213 CLKDEV_CON_DEV_ID("hclk", "300000.ohci", &ohci_clk), 214 CLKDEV_CON_DEV_ID("hclk", "300000.ohci", &ohci_clk),
214 CLKDEV_CON_DEV_ID(NULL, "fffff400.gpio", &pioA_clk), 215 CLKDEV_CON_DEV_ID(NULL, "fffff400.gpio", &pioA_clk),
215 CLKDEV_CON_DEV_ID(NULL, "fffff600.gpio", &pioB_clk), 216 CLKDEV_CON_DEV_ID(NULL, "fffff600.gpio", &pioB_clk),