From patchwork Thu May 5 06:49:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arindam Nath X-Patchwork-Id: 756092 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p456q139022457 for ; Thu, 5 May 2011 06:53:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752099Ab1EEGxQ (ORCPT ); Thu, 5 May 2011 02:53:16 -0400 Received: from mail-px0-f173.google.com ([209.85.212.173]:62422 "EHLO mail-px0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751384Ab1EEGxP (ORCPT ); Thu, 5 May 2011 02:53:15 -0400 Received: by mail-px0-f173.google.com with SMTP id 16so1439619pxi.4 for ; Wed, 04 May 2011 23:53:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:cc:subject:date:message-id :x-mailer:in-reply-to:references; bh=SdLptlehPgiCy0FBOghWD2RV/VyM1dg2JmYZ2YWCkpk=; b=Y4JE0RKbnJqyNZd2lpBr4goLa4hRWZKG7OIpueN0o5KRnn+9oOhDx28SetNhWuEDeV 7/d0HjyAAJW3pFOTMqVmKYkBgMYa8DxyNMiyZUk58jhu7ETocbAJDFS8mcXKEHTDqELU fl7XhzTEFiuYO1rzibGE7hHz3LnKlOa5yUXnE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; b=LIOXcoT+cKWUjjDKGYvILXd6VcRZsk1lcTUidCxOj6Iphg+tNpz1Rigteuy3CO54US i2iN/6m2TycfaXFLM0HAkyd9oRLhMwBpUyVzbfBCO9cRa0+uckA5FwYaWzGFPvgD+0FX bDEAJTRrL1EcuEEZ+t1IT2BwBiDaM1c+62d5c= Received: by 10.142.122.8 with SMTP id u8mr1074873wfc.283.1304578395397; Wed, 04 May 2011 23:53:15 -0700 (PDT) Received: from localhost ([122.166.82.113]) by mx.google.com with ESMTPS id z10sm2433806wfj.0.2011.05.04.23.53.07 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 04 May 2011 23:53:14 -0700 (PDT) From: Arindam Nath To: cjb@laptop.org Cc: prakity@marvell.com, zhangfei.gao@gmail.com, subhashj@codeaurora.org, linux-mmc@vger.kernel.org, henry.su@amd.com, aaron.lu@amd.com, anath.amd@gmail.com, Arindam Nath Subject: [PATCH v4 13/15] mmc eMMC signal voltage does not use CMD11 Date: Thu, 5 May 2011 12:19:09 +0530 Message-Id: <1304578151-1775-14-git-send-email-arindam.nath@amd.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1304578151-1775-1-git-send-email-arindam.nath@amd.com> References: <1304578151-1775-1-git-send-email-arindam.nath@amd.com> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Thu, 05 May 2011 06:53:16 +0000 (UTC) eMMC chips do not use CMD11 when changing voltage. Add extra argument to call to indicate if CMD11 needs to be sent. Signed-off-by: Philip Rakity Reviewed-by: Arindam Nath --- drivers/mmc/core/core.c | 4 ++-- drivers/mmc/core/core.h | 3 ++- drivers/mmc/core/sd.c | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 78a9b51..74b4409 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -942,7 +942,7 @@ u32 mmc_select_voltage(struct mmc_host *host, u32 ocr) return ocr; } -int mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage) +int mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage, int cmd11) { struct mmc_command cmd; int err = 0; @@ -953,7 +953,7 @@ int mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage) * Send CMD11 only if the request is to switch the card to * 1.8V signalling. */ - if (signal_voltage == MMC_SIGNAL_VOLTAGE_180) { + if ((signal_voltage != MMC_SIGNAL_VOLTAGE_330) && cmd11) { memset(&cmd, 0, sizeof(struct mmc_command)); cmd.opcode = SD_SWITCH_VOLTAGE; diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h index 93f3397..3c11e17 100644 --- a/drivers/mmc/core/core.h +++ b/drivers/mmc/core/core.h @@ -41,7 +41,8 @@ void mmc_set_bus_width(struct mmc_host *host, unsigned int width); void mmc_set_bus_width_ddr(struct mmc_host *host, unsigned int width, unsigned int ddr); u32 mmc_select_voltage(struct mmc_host *host, u32 ocr); -int mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage); +int mmc_set_signal_voltage(struct mmc_host *host, int signal_voltage, + int cmd11); void mmc_set_timing(struct mmc_host *host, unsigned int timing); void mmc_set_driver_type(struct mmc_host *host, unsigned int drv_type); diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c index 851c8fc..d2a05ab 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c @@ -731,7 +731,7 @@ try_again: */ if (!mmc_host_is_spi(host) && rocr && ((*rocr & 0x41000000) == 0x41000000)) { - err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180); + err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_180, 1); if (err) { ocr &= ~SD_OCR_S18R; goto try_again; @@ -1104,7 +1104,7 @@ int mmc_attach_sd(struct mmc_host *host) WARN_ON(!host->claimed); /* Make sure we are at 3.3V signalling voltage */ - err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_330); + err = mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_330, 0); if (err) return err;