From patchwork Fri May 13 05:47:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arindam Nath X-Patchwork-Id: 781752 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 p4D5m2ji009499 for ; Fri, 13 May 2011 05:48:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756272Ab1EMFsu (ORCPT ); Fri, 13 May 2011 01:48:50 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:62232 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756161Ab1EMFss (ORCPT ); Fri, 13 May 2011 01:48:48 -0400 Received: by pzk9 with SMTP id 9so1030473pzk.19 for ; Thu, 12 May 2011 22:48:47 -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=uY3ozxUtUj7uRkW0+olHkJ61Vxg0rHUM5786BagKJhQ=; b=cIOFGWDylFEEIURhXCE3DvJCa+NmOeeNub2Mjd18wvTFsafU1MhLiu1cGpr72URBwj 5oVrSDdU1Abwm61IuIrm5R3UqCvS+/c+tj8SE7IAJXFgQImNv/rLKedOf1pz0+U+Tkyq sBURex/EARI7b4o9dtu6IabjFPkwxrRRE5jhY= 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=et288hrz/HytVxxW//fNLlNyoRXVMGDOqGRhOpm9Joh8I/QtLeiabJx/BKb7I5jaax ColC4RSIndDV/axQjkYYY2k3oIbL1Px5brMcNVDtaraeqTRNgjjPCiSpR3sI3lkD0gZf ecvdot4YsBMIdP3NnvT0fvZqGzAZfBYNs5p18= Received: by 10.142.149.8 with SMTP id w8mr662680wfd.237.1305265727743; Thu, 12 May 2011 22:48:47 -0700 (PDT) Received: from localhost ([122.167.11.185]) by mx.google.com with ESMTPS id k6sm1816969wfa.5.2011.05.12.22.48.40 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 12 May 2011 22:48:47 -0700 (PDT) From: Arindam Nath To: cjb@laptop.org Cc: linux-mmc@vger.kernel.org, prakity@marvell.com, zhangfei.gao@gmail.com, Arindam Nath Subject: [PATCH v2 3/4] mmc eMMC signal voltage does not use CMD11 Date: Fri, 13 May 2011 11:17:17 +0530 Message-Id: <1305265638-1572-4-git-send-email-arindam.nath@amd.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1305265638-1572-1-git-send-email-arindam.nath@amd.com> References: <1305265638-1572-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]); Fri, 13 May 2011 05:48:50 +0000 (UTC) From: Philip Rakity 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 | 5 +++-- drivers/mmc/core/core.h | 3 ++- drivers/mmc/core/sd.c | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 72e113e..580fe82 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -942,7 +942,8 @@ 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, + bool cmd11) { struct mmc_command cmd = {0}; int err = 0; @@ -953,7 +954,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) { cmd.opcode = SD_SWITCH_VOLTAGE; cmd.arg = 0; cmd.flags = MMC_RSP_R1 | MMC_CMD_AC; diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h index 93f3397..53d23c2 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, + bool 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 b461b29..b309a84 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c @@ -725,7 +725,8 @@ 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, + true); if (err) { ocr &= ~SD_OCR_S18R; goto try_again; @@ -1098,7 +1099,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, false); if (err) return err;