From patchwork Sun Mar 17 18:20:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tanmay Upadhyay X-Patchwork-Id: 2284231 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 95817E00DD for ; Sun, 17 Mar 2013 18:23:13 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UHICC-0002po-DX; Sun, 17 Mar 2013 18:20:36 +0000 Received: from out09.sjc.mx.trendmicro.com ([216.99.131.46]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UHIBq-0002gz-Vi for linux-arm-kernel@lists.infradead.org; Sun, 17 Mar 2013 18:20:16 +0000 Received: from relay09.sjc.mx.trendmicro.com (unknown [10.30.239.136]) by out09.sjc.mx.trendmicro.com (Postfix) with ESMTP id 389D6980439; Sun, 17 Mar 2013 18:20:13 +0000 (UTC) Received: from us.einfochips.com (unknown [174.123.40.210]) by relay09.sjc.mx.trendmicro.com (Postfix) with ESMTP id D58CC980432; Sun, 17 Mar 2013 18:20:12 +0000 (UTC) Received: by us.einfochips.com (Postfix, from userid 101) id 060AE6500036; Sun, 17 Mar 2013 13:04:37 -0500 (CDT) Received: from localhost.localdomain (cpe-70-124-85-237.austin.res.rr.com [70.124.85.237]) by us.einfochips.com (Postfix) with ESMTPA id 25DCC6500014; Sun, 17 Mar 2013 13:04:36 -0500 (CDT) From: Tanmay Upadhyay To: eric.y.miao@gmail.com, haojian.zhuang@gmail.com Subject: [PATCH v2 4/4] ARM: pxa168/gplugd: Add support for SD port 1 Date: Sun, 17 Mar 2013 13:20:06 -0500 Message-Id: <1363544406-3837-1-git-send-email-tanmay.upadhyay@einfochips.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1363544206-3671-1-git-send-email-tanmay.upadhyay@einfochips.com> References: <1363544206-3671-1-git-send-email-tanmay.upadhyay@einfochips.com> X-Copyrighted-Material: Please visit www.company.com/privacy.htm X-TM-AS-Product-Ver: IMHS-1.0.0.1393-7.0.0.1014-19726.001 X-TM-AS-Result: No--10.7492-5.0-31-10 X-TM-AS-Result-Detail: Spam:No-Score:-10.7492-Baseline:ModeratelyHigh-Other:Lowest X-TMASE-MatchedRID: LdFOTQpFq6c9S3IiQd+eNRWCVBr+Ay98QPCWRE0Lo8JcKZwALwMGs1tE UzPReCEC09NQNrxIpFYBtjkcfRMmqUfr6WG4Th9aliwpJdZauwcyWxZ1HCECbUdmDSBYfnJRZgh wl9L7i/QPshj7JZn5iEo6L5oHKfPIu+66Sy5jOwIRxOX047Fkj/cku775L1VGW+jwVKpqvlKzLT NoHAuPh1ULDLlDFJKthD1W6HYjQD948YB5KfXbgpmug812qIbz9wXxnluKnXv7s8CQBJM67nruc +LMsxmGedSp+M2T6JtuCzs/FjY7zHMbiLLKBHkEC24oEZ6SpSkj80Za3RRg8NsQH1tNTBZxtFBU dSj0ZHanZ5eJkTylk+YJv3+aV6iAAKqL34WGEvg= X-TM-Deliver-Signature: 7ad61507b85d4e713ca9022e7c254b7d X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130317_142015_901298_FA28D485 X-CRM114-Status: GOOD ( 22.39 ) X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [216.99.131.46 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: prakity@marvell.com, linux-mmc@vger.kernel.org, Tanmay Upadhyay , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org v2 - after sdhci-pxav1 driver is merged with sdhci-pxav2, pass pxav1_controller = 1 - as sdhci device numbering now starts from 1, call pxa168_add_sdh accordingly Signed-off-by: Tanmay Upadhyay Reviewed-by: Philip Rakity Acked-by: Haojian Zhuang --- arch/arm/mach-mmp/gplugd.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/mach-mmp/gplugd.c b/arch/arm/mach-mmp/gplugd.c index 5c3d61e..d821368 100644 --- a/arch/arm/mach-mmp/gplugd.c +++ b/arch/arm/mach-mmp/gplugd.c @@ -155,6 +155,11 @@ struct pxa168_eth_platform_data gplugd_eth_platform_data = { .init = gplugd_eth_init, }; +struct sdhci_pxa_platdata gplugd_sdh_platdata = { + .delay_in_ms = 5, + .pxav1_controller = 1, +}; + static void __init select_disp_freq(void) { /* set GPIO 35 & clear GPIO 85 to set LCD External Clock to 74.25 MHz */ @@ -188,6 +193,7 @@ static void __init gplugd_init(void) platform_device_register(&pxa168_device_gpio); pxa168_add_eth(&gplugd_eth_platform_data); + pxa168_add_sdh(1, &gplugd_sdh_platdata); } MACHINE_START(GPLUGD, "PXA168-based GuruPlug Display (gplugD) Platform")