From 57ef17a120843149dad9f3ef43713770eef50824 Mon Sep 17 00:00:00 2001 From: Lauri Hintsala Date: Tue, 10 Jul 2012 10:08:10 +0300 Subject: [PATCH] --- yaml --- r: 313307 b: refs/heads/master c: 557763b31cf1019a6f26fe86a586609d9ada3d96 h: refs/heads/master i: 313305: 20a4c96b516100a294538254a3772c464feaed63 313303: 6ea6e833a89ac042ec485abd5238a520abcbcef5 v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/dts/apx4devkit.dts | 31 ++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b3ad6ef416c2..884abcdba96e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1eb73ca0b5b0b26a829471c5e8bb8ccf9a05a7bd +refs/heads/master: 557763b31cf1019a6f26fe86a586609d9ada3d96 diff --git a/trunk/arch/arm/boot/dts/apx4devkit.dts b/trunk/arch/arm/boot/dts/apx4devkit.dts index 35b75131ddc9..d3fed0b42e68 100644 --- a/trunk/arch/arm/boot/dts/apx4devkit.dts +++ b/trunk/arch/arm/boot/dts/apx4devkit.dts @@ -25,6 +25,14 @@ status = "okay"; }; + ssp2: ssp@80014000 { + compatible = "fsl,imx28-mmc"; + pinctrl-names = "default"; + pinctrl-0 = <&mmc2_4bit_pins_apx4 &mmc2_sck_cfg_apx4>; + bus-width = <4>; + status = "okay"; + }; + pinctrl@80018000 { pinctrl-names = "default"; pinctrl-0 = <&hog_pins_a>; @@ -52,6 +60,29 @@ fsl,voltage = <1>; fsl,pull-up = <0>; }; + + mmc2_4bit_pins_apx4: mmc2-4bit-apx4@0 { + reg = <0>; + fsl,pinmux-ids = < + 0x2041 /* MX28_PAD_SSP0_DATA4__SSP2_D0 */ + 0x2051 /* MX28_PAD_SSP0_DATA5__SSP2_D3 */ + 0x2061 /* MX28_PAD_SSP0_DATA6__SSP2_CMD */ + 0x2071 /* MX28_PAD_SSP0_DATA7__SSP2_SCK */ + 0x2141 /* MX28_PAD_SSP2_SS1__SSP2_D1 */ + 0x2151 /* MX28_PAD_SSP2_SS2__SSP2_D2 */ + >; + fsl,drive-strength = <1>; + fsl,voltage = <1>; + fsl,pull-up = <1>; + }; + + mmc2_sck_cfg_apx4: mmc2-sck-cfg-apx4 { + fsl,pinmux-ids = < + 0x2071 /* MX28_PAD_SSP0_DATA7__SSP2_SCK */ + >; + fsl,drive-strength = <2>; + fsl,pull-up = <0>; + }; }; lcdif@80030000 {