From patchwork Wed Jul 6 16:08:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip Rakity X-Patchwork-Id: 949972 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p66GADsS010416 for ; Wed, 6 Jul 2011 16:10:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753498Ab1GFQJ4 (ORCPT ); Wed, 6 Jul 2011 12:09:56 -0400 Received: from na3sys009aog121.obsmtp.com ([74.125.149.145]:42366 "EHLO na3sys009aog121.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750986Ab1GFQJy convert rfc822-to-8bit (ORCPT ); Wed, 6 Jul 2011 12:09:54 -0400 Received: from sc-owa02.marvell.com ([65.219.4.130]) (using TLSv1) by na3sys009aob121.postini.com ([74.125.148.12]) with SMTP ID DSNKThSIjz5JpMOGejRWAZ7XNzX0zO4ptIV/@postini.com; Wed, 06 Jul 2011 09:09:54 PDT Received: from SC-vEXCH3.marvell.com ([10.93.76.133]) by sc-owa02.marvell.com ([10.93.76.22]) with mapi; Wed, 6 Jul 2011 09:08:47 -0700 From: Philip Rakity To: Eric Miao CC: Zhangfei Gao , Russell King - ARM Linux , "linux-arm-kernel@lists.infradead.org" , "linux-mmc@vger.kernel.org" , Chris Ball , Zhangfei Gao Date: Wed, 6 Jul 2011 09:08:45 -0700 Subject: [PATCH v4] arm: mach-mmp: brownstone.c support multiple sd slots Thread-Topic: [PATCH v4] arm: mach-mmp: brownstone.c support multiple sd slots Thread-Index: Acw79vwDhNa6mHCORGae7jAgteJ1cQ== Message-ID: <6AAC67C8-1C8F-4F15-9CED-5BA83CA21C39@marvell.com> References: <59C2B513-EC04-4CA2-818B-9901CAF3E554@marvell.com> <20110427093328.GU17290@n2100.arm.linux.org.uk> <161C3F6C-0986-4364-B458-DBA4D08456FD@marvell.com> <1F336A22-BAC3-41E3-8D4E-5DF27874D1EA@marvell.com> <20110428095127.GX17290@n2100.arm.linux.org.uk> <3BFCE791-3BAD-42ED-BC87-A27F40D6C77C@marvell.com> <67F311C7-B489-41E6-BC85-C06DACC7263A@marvell.com> In-Reply-To: <67F311C7-B489-41E6-BC85-C06DACC7263A@marvell.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 06 Jul 2011 16:10:28 +0000 (UTC) Eric, Not sure what to suggest. If it makes more sense to take V3 which powers on the wifi card but does not do power handling per new spec take that. At least wifi card works and then wait for power code. New code could delete power code as part of the mod. If it makes more sense to wait for power code -- take V4. Philip V4 == remove code to enable power for wifi. Coming in separate patch (by others) that conforms to new power architecture. V3 == Change since V2 -- delete mmc3 since it was committed to linux next. enable mmc1 used for wifi (8688) and marked PERMANENT. Wifi requires enabling of power on the device by toggling the gpio lines for power and reset. Signed-off-by: Philip Rakity --- arch/arm/mach-mmp/brownstone.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-mmp/brownstone.c b/arch/arm/mach-mmp/brownstone.c index c79162a..7634b2f 100644 --- a/arch/arm/mach-mmp/brownstone.c +++ b/arch/arm/mach-mmp/brownstone.c @@ -180,6 +180,11 @@ static struct sdhci_pxa_platdata mmp2_sdh_platdata_mmc0 = { .clk_delay_cycles = 0x1f, }; +static struct sdhci_pxa_platdata mmp2_sdh_platdata_mmc1 = { + .clk_delay_cycles = 0x1f, + .flags = PXA_FLAG_CARD_PERMANENT, +}; + static struct sdhci_pxa_platdata mmp2_sdh_platdata_mmc2 = { .clk_delay_cycles = 0x1f, .flags = PXA_FLAG_CARD_PERMANENT @@ -195,8 +200,9 @@ static void __init brownstone_init(void) mmp2_add_uart(1); mmp2_add_uart(3); mmp2_add_twsi(1, NULL, ARRAY_AND_SIZE(brownstone_twsi1_info)); - mmp2_add_sdhost(0, &mmp2_sdh_platdata_mmc0); /* SD/MMC */ mmp2_add_sdhost(2, &mmp2_sdh_platdata_mmc2); /* eMMC */ + mmp2_add_sdhost(0, &mmp2_sdh_platdata_mmc0); /* SD/MMC */ + mmp2_add_sdhost(1, &mmp2_sdh_platdata_mmc1); /* Wifi */ /* enable 5v regulator */ platform_device_register(&brownstone_v_5vp_device);