From 948773c837bc979a488439fba401238beee5fcb8 Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Tue, 20 Nov 2012 00:46:24 +0800 Subject: [PATCH] --- yaml --- r: 336458 b: refs/heads/master c: c12a819e3ad9147acec3f20201fd51144f2244e9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/dts/pm9g45.dts | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5f83eb368ec6..d76a21e7d868 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 301333bc6c78051b257e520ad0f5cf0b6596c4f4 +refs/heads/master: c12a819e3ad9147acec3f20201fd51144f2244e9 diff --git a/trunk/arch/arm/boot/dts/pm9g45.dts b/trunk/arch/arm/boot/dts/pm9g45.dts index b0c258dd19ed..387fedb58988 100644 --- a/trunk/arch/arm/boot/dts/pm9g45.dts +++ b/trunk/arch/arm/boot/dts/pm9g45.dts @@ -46,12 +46,33 @@ 2 14 0x0 0x1>; /* 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 */ + }; + }; + }; + + mmc0: mmc@fff80000 { + pinctrl-0 = < + &pinctrl_board_mmc + &pinctrl_mmc0_slot0_clk_cmd_dat0 + &pinctrl_mmc0_slot0_dat1_3>; + status = "okay"; + slot@0 { + reg = <0>; + bus-width = <4>; + cd-gpios = <&pioD 6 0>; + }; }; macb0: ethernet@fffbc000 { phy-mode = "rmii"; status = "okay"; }; + }; nand0: nand@40000000 {