From patchwork Sat Mar 16 18:05:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Otavio Salvador X-Patchwork-Id: 228233 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 AE2C62C0098 for ; Sun, 17 Mar 2013 05:01:03 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8DDAB4A105; Sat, 16 Mar 2013 19:01:01 +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 3RDfWg+2xF9I; Sat, 16 Mar 2013 19:01:01 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C43084A10A; Sat, 16 Mar 2013 19:00:39 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CCFE74A103 for ; Sat, 16 Mar 2013 19:00:01 +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 q0XHACQTXlio for ; Sat, 16 Mar 2013 18:59:51 +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-qa0-f43.google.com (mail-qa0-f43.google.com [209.85.216.43]) by theia.denx.de (Postfix) with ESMTPS id 347904A0FE for ; Sat, 16 Mar 2013 18:59:45 +0100 (CET) Received: by mail-qa0-f43.google.com with SMTP id dx4so937242qab.9 for ; Sat, 16 Mar 2013 10:59:44 -0700 (PDT) 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=4/FIkJT5eVB4qFyJWXn/lr0cHpOUQEAOFcbMpSd1U04=; b=ifr/NchA7hhA1ZLAZPb7E+CDKoDM76y4fSTJEYicBugs4XhF3gSZG08zPRPMDwqvLt KAaHyCGhTbzPIzmNJeMBr9yVNvb9gvaNtZiOcCMGuRXg1Hk4hjm2w3vtO9GF+w1A9b6Y KariRp/rwGZid9X5QROHB1P4rK/GV4S4/byd8mnkXAouPzrLmwjcFZeZRLkwh++XX0iJ dCR1XFz04Pz5M6xcDzUAP8yDJqY9Vg1AmBe0nkrN2XOkWcgJOa7Fk17J+C5M2p/ulq36 HK2llGXlgGyM3JUQU3t6/vbhQVe7K2q2nVAoRUxfqvDSi+HsnD4W2+e3f8pq5tv6eLB7 xtZQ== X-Received: by 10.229.172.80 with SMTP id k16mr2691779qcz.56.1363456783897; Sat, 16 Mar 2013 10:59:43 -0700 (PDT) Received: from nano.lab.ossystems.com.br ([187.23.144.59]) by mx.google.com with ESMTPS id gn6sm15429094qab.5.2013.03.16.10.59.41 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 16 Mar 2013 10:59:43 -0700 (PDT) From: Otavio Salvador To: U-Boot Mailing List Date: Sat, 16 Mar 2013 15:05:06 -0300 Message-Id: <1363457107-3968-3-git-send-email-otavio@ossystems.com.br> X-Mailer: git-send-email 1.8.1 In-Reply-To: <1363457107-3968-1-git-send-email-otavio@ossystems.com.br> References: <1363457107-3968-1-git-send-email-otavio@ossystems.com.br> Cc: Fabio Estevam , Otavio Salvador Subject: [U-Boot] [PATCH v5 2/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 v5: None Changes in v4: - Fix switch code to proper break (Stefano) Changes in v3: None Changes in v2: - Rework code to use a 'ret' variable (Fabio) board/freescale/mx6qsabresd/mx6qsabresd.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/board/freescale/mx6qsabresd/mx6qsabresd.c b/board/freescale/mx6qsabresd/mx6qsabresd.c index 5ebbff3..d3019e9 100644 --- a/board/freescale/mx6qsabresd/mx6qsabresd.c +++ b/board/freescale/mx6qsabresd/mx6qsabresd.c @@ -145,15 +145,21 @@ 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); + break; 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); + break; + case USDHC4_BASE_ADDR: + ret = 1; /* eMMC/uSDHC4 is always present */ + break; } + + return ret; } int board_mmc_init(bd_t *bis)