From patchwork Thu Oct 16 21:03:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dinguyen@opensource.altera.com X-Patchwork-Id: 5094571 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3C1289F30B for ; Thu, 16 Oct 2014 21:11:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7C12820114 for ; Thu, 16 Oct 2014 21:11:25 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 988F920107 for ; Thu, 16 Oct 2014 21:11:24 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XesHa-00015y-9Y; Thu, 16 Oct 2014 21:08:26 +0000 Received: from mail-by2on0078.outbound.protection.outlook.com ([207.46.100.78] helo=na01-by2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XesHR-00011k-8p for linux-arm-kernel@lists.infradead.org; Thu, 16 Oct 2014 21:08:17 +0000 Received: from linux-builds1.altera.com (64.129.157.38) by BN3PR0301MB1186.namprd03.prod.outlook.com (25.160.156.148) with Microsoft SMTP Server (TLS) id 15.0.1054.13; Thu, 16 Oct 2014 21:07:53 +0000 From: To: , , , , , , Subject: [PATCH 1/2] ARM: dts: socfpga: Fix SD card detect Date: Thu, 16 Oct 2014 16:03:32 -0500 Message-ID: <1413493413-8041-2-git-send-email-dinguyen@opensource.altera.com> X-Mailer: git-send-email 2.0.3 In-Reply-To: <1413493413-8041-1-git-send-email-dinguyen@opensource.altera.com> References: <1413493413-8041-1-git-send-email-dinguyen@opensource.altera.com> MIME-Version: 1.0 X-Originating-IP: [64.129.157.38] X-ClientProxiedBy: DB4PR02CA0041.eurprd02.prod.outlook.com (10.242.174.169) To BN3PR0301MB1186.namprd03.prod.outlook.com (25.160.156.148) X-Microsoft-Antispam: UriScan:; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;SRVR:BN3PR0301MB1186; X-Forefront-PRVS: 036614DD9C X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(199003)(189002)(77096002)(21056001)(50226001)(4396001)(107046002)(105586002)(81156004)(229853001)(95666004)(106356001)(42186005)(93916002)(86362001)(104166001)(88136002)(20776003)(50466002)(89996001)(64706001)(85852003)(47776003)(92726001)(97736003)(76482002)(53416004)(92566001)(2201001)(66066001)(86152002)(120916001)(62966002)(77156001)(50986999)(19580405001)(80022003)(19580395003)(122386002)(102836001)(46102003)(40100003)(101416001)(48376002)(69596002)(87286001)(87976001)(33646002)(76176999)(85306004)(31966008)(99396003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN3PR0301MB1186; H:linux-builds1.altera.com; FPR:; MLV:sfv; PTR:InfoNoRecords; A:0; MX:1; LANG:en; X-OriginatorOrg: opensource.altera.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141016_140817_372629_E0E714A4 X-CRM114-Status: UNSURE ( 8.76 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.3 (/) Cc: devicetree@vger.kernel.org, dinh.linux@gmail.com, atull@opensource.altera.com, Dinh Nguyen , s.trumtrar@pengutronix.de, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Dinh Nguyen Without this patch, the booting the SOCFPGA platform would hang at the SDMMC driver loading. There were 2 patches that caused this to happen: - Patch 9795a846e10 "mmc: dw_mmc: remove dw_mci_of_cd_gpio/wp_gpio()" removed looking for "cd-gpios", since mmc_of_parse was getting called. - Patch 3cf890fc42b "mmc: dw_mmc: Pass back errors from mmc_of_parse()" would hang the system at the SDMMC driver loading. This patch will fix booting with SDMMC enabled on SOCFPGA dev kit. Signed-off-by: Dinh Nguyen --- arch/arm/boot/dts/socfpga_cyclone5_socdk.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts b/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts index d7296a5..739c3b7 100644 --- a/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts +++ b/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts @@ -69,7 +69,7 @@ }; &mmc0 { - cd-gpios = <&gpio1 18 0>; + cd = <&gpio1 18 0>; }; &usb1 {