From patchwork Wed Mar 6 15:46:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Otavio Salvador X-Patchwork-Id: 225533 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id AF0CD2C034E for ; Thu, 7 Mar 2013 02:41:10 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B44724A281; Wed, 6 Mar 2013 16:41:04 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oUH+WWECnSvb; Wed, 6 Mar 2013 16:41:04 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 44C064A270; Wed, 6 Mar 2013 16:40:56 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 120FF4A249 for ; Wed, 6 Mar 2013 16:40:53 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fC1dSUS+bgX4 for ; Wed, 6 Mar 2013 16:40:52 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-gg0-f171.google.com (mail-gg0-f171.google.com [209.85.161.171]) by theia.denx.de (Postfix) with ESMTPS id 163EB4A254 for ; Wed, 6 Mar 2013 16:40:50 +0100 (CET) Received: by mail-gg0-f171.google.com with SMTP id j1so1214774ggn.16 for ; Wed, 06 Mar 2013 07:40:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=GKuhJSfcFftHmFLrw2QsLS5kUnsAgj67WJPqGJEGUxI=; b=WZMBj0IO3tvSFeS4CRiMNdNMgsz0OQfx4WoNxJzjHNabmGaohHt/ywC9TNlRZGzTwE XCy4yTYq+mXVblYS2rqqGvTZGOaX+iGykInO915yq3KTXNG8r83RWwWlv5RoqhZ+3LAT vUv3+uatHrsAFtH7pYb2XwucL10TttOq/PyuPTpJSqh2T3Y4u7ExKpbOG3nfEIZFTHgi 0FXib8gZGgaFu4Bsv4fToA9vb5F4VKA0f31kYXuapbfLY/SvykNSVwgeWyvPf6wFbpZ4 Id9ZKoEx70vtWbttjhf2Ux8lAuXZyQ00J2gnvbu8ikHw3P9/LS1U305Ka7Q89UilRK1M a2yw== X-Received: by 10.236.72.202 with SMTP id t50mr21318932yhd.11.1362584448957; Wed, 06 Mar 2013 07:40:48 -0800 (PST) Received: from nano.lab.ossystems.com.br ([187.23.144.59]) by mx.google.com with ESMTPS id x16sm13044411yhj.6.2013.03.06.07.40.46 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Mar 2013 07:40:48 -0800 (PST) From: Otavio Salvador To: U-Boot Mailing List Date: Wed, 6 Mar 2013 12:46:05 -0300 Message-Id: <1362584767-14105-2-git-send-email-otavio@ossystems.com.br> X-Mailer: git-send-email 1.8.1 In-Reply-To: <1362584767-14105-1-git-send-email-otavio@ossystems.com.br> References: <1362584767-14105-1-git-send-email-otavio@ossystems.com.br> Cc: Fabio Estevam , Otavio Salvador Subject: [U-Boot] [PATCH v3 1/3] mx6qsabresd: Fix card detection for invalid card id case X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de This changes the code so in case an unkown value is passed it will return as invalid. Signed-off-by: Otavio Salvador --- Changes in v3: None Changes in v2: - Rework code to use a 'ret' variable (Fabio) board/freescale/mx6qsabresd/mx6qsabresd.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/board/freescale/mx6qsabresd/mx6qsabresd.c b/board/freescale/mx6qsabresd/mx6qsabresd.c index 65c4a1a..e556476 100644 --- a/board/freescale/mx6qsabresd/mx6qsabresd.c +++ b/board/freescale/mx6qsabresd/mx6qsabresd.c @@ -145,15 +145,18 @@ struct fsl_esdhc_cfg usdhc_cfg[3] = { int board_mmc_getcd(struct mmc *mmc) { struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv; + int ret = 0; switch (cfg->esdhc_base) { case USDHC2_BASE_ADDR: - return !gpio_get_value(USDHC2_CD_GPIO); + ret = !gpio_get_value(USDHC2_CD_GPIO); case USDHC3_BASE_ADDR: - return !gpio_get_value(USDHC3_CD_GPIO); - default: - return 1; /* eMMC/uSDHC4 is always present */ + ret = !gpio_get_value(USDHC3_CD_GPIO); + case USDHC4_BASE_ADDR: + ret = 1; /* eMMC/uSDHC4 is always present */ } + + return ret; } int board_mmc_init(bd_t *bis)