From patchwork Tue Jun 7 06:31:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Schocher X-Patchwork-Id: 631329 X-Patchwork-Delegate: trini@ti.com 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 3rP1vY70SRz9t3h for ; Tue, 7 Jun 2016 16:32:25 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D871FB380D; Tue, 7 Jun 2016 08:32:05 +0200 (CEST) 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 KNzqSt0n6NDV; Tue, 7 Jun 2016 08:32:05 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E091CB3818; Tue, 7 Jun 2016 08:31:48 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0CCC7B3801 for ; Tue, 7 Jun 2016 08:31:33 +0200 (CEST) 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 ydz1VwOpi0AR for ; Tue, 7 Jun 2016 08:31:32 +0200 (CEST) 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 pollux.denx.de (host-82-135-33-74.customer.m-online.net [82.135.33.74]) by theia.denx.de (Postfix) with ESMTP id 8B420A74EE for ; Tue, 7 Jun 2016 08:31:32 +0200 (CEST) Received: by pollux.denx.de (Postfix, from userid 515) id CCEF238D3; Tue, 7 Jun 2016 08:31:28 +0200 (CEST) From: Heiko Schocher To: u-boot@lists.denx.de Date: Tue, 7 Jun 2016 08:31:21 +0200 Message-Id: <1465281085-10481-9-git-send-email-hs@denx.de> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1465281085-10481-1-git-send-email-hs@denx.de> References: <1465281085-10481-1-git-send-email-hs@denx.de> Cc: Tom Rini , Pantelis Antoniou , Andrew Gabbasov Subject: [U-Boot] [PATCH v3 08/12] mmc: revert mmc: Handle switch error status bit in MMC card status X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" revert patch: commit: 6b2221b008e0: mmc: Handle switch error status bit in MMC card status to get eMMC working on shc board Signed-off-by: Heiko Schocher --- Changes in v3: None Changes in v2: None drivers/mmc/mmc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 94f19ad..7586558 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -155,8 +155,6 @@ int mmc_send_status(struct mmc *mmc, int timeout) #endif return TIMEOUT; } - if (cmd.response[0] & MMC_STATUS_SWITCH_ERROR) - return SWITCH_ERR; return 0; } @@ -516,7 +514,7 @@ static int mmc_change_freq(struct mmc *mmc) err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_HS_TIMING, 1); if (err) - return err == SWITCH_ERR ? 0 : err; + return err; /* Now check to see that it worked */ err = mmc_send_ext_csd(mmc, ext_csd);