From patchwork Sun Jan 8 20:17:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Ball X-Patchwork-Id: 6094 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 7294E23E07 for ; Sun, 8 Jan 2012 20:18:07 +0000 (UTC) Received: from mail-bk0-f52.google.com (mail-bk0-f52.google.com [209.85.214.52]) by fiordland.canonical.com (Postfix) with ESMTP id 45E73A1803B for ; Sun, 8 Jan 2012 20:18:07 +0000 (UTC) Received: by bke17 with SMTP id 17so1554958bke.11 for ; Sun, 08 Jan 2012 12:18:07 -0800 (PST) Received: by 10.205.139.66 with SMTP id iv2mr6243794bkc.27.1326053886938; Sun, 08 Jan 2012 12:18:06 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.205.82.144 with SMTP id ac16cs28797bkc; Sun, 8 Jan 2012 12:18:06 -0800 (PST) Received: by 10.180.106.202 with SMTP id gw10mr548136wib.3.1326053885045; Sun, 08 Jan 2012 12:18:05 -0800 (PST) Received: from void.printf.net (void.printf.net. [89.145.121.20]) by mx.google.com with ESMTPS id fa8si9285768wib.19.2012.01.08.12.18.04 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 08 Jan 2012 12:18:04 -0800 (PST) Received-SPF: neutral (google.com: 89.145.121.20 is neither permitted nor denied by best guess record for domain of cjb@laptop.org) client-ip=89.145.121.20; Authentication-Results: mx.google.com; spf=neutral (google.com: 89.145.121.20 is neither permitted nor denied by best guess record for domain of cjb@laptop.org) smtp.mail=cjb@laptop.org Received: from 173-166-109-241-newengland.hfc.comcastbusiness.net ([173.166.109.241] helo=bob.laptop.org) by void.printf.net with esmtp (Exim 4.69) (envelope-from ) id 1RjzBs-00013x-05; Sun, 08 Jan 2012 20:18:04 +0000 From: Chris Ball To: Girish K S Cc: linux-mmc@vger.kernel.org, patches@linaro.org, linux-samsung-soc@vger.kernel.org Subject: Re: [PATCH V9 0/2] HS200 Mode support for device and host References: <1325823999-21770-1-git-send-email-girish.shivananjappa@linaro.org> Date: Sun, 08 Jan 2012 15:17:52 -0500 In-Reply-To: <1325823999-21770-1-git-send-email-girish.shivananjappa@linaro.org> (Girish K. S.'s message of "Fri, 6 Jan 2012 09:56:37 +0530") Message-ID: User-Agent: Gnus/5.110018 (No Gnus v0.18) Emacs/23.2 (gnu/linux) MIME-Version: 1.0 Hi Girish, On Thu, Jan 05 2012, Girish K S wrote: > Girish K S (2): > mmc: core: HS200 mode support for eMMC 4.5 > mmc: host: Adds support for eMMC 4.5 HS200 mode Thanks, pushed to mmc-next with the following corrections to 2/2: diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 4be50ea..64febf2 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1014,8 +1014,8 @@ static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd) flags |= SDHCI_CMD_INDEX; /* CMD19 is special in that the Data Present Select should be set */ - if (cmd->data || (cmd->opcode == MMC_SEND_TUNING_BLOCK) || - (cmd->opcode == MMC_SEND_TUNING_BLOCK_HS200)) + if (cmd->data || cmd->opcode == MMC_SEND_TUNING_BLOCK || + cmd->opcode == MMC_SEND_TUNING_BLOCK_HS200) flags |= SDHCI_CMD_DATA; sdhci_writew(host, SDHCI_MAKE_CMD(cmd->opcode, flags), SDHCI_COMMAND); @@ -1710,10 +1710,10 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode) * If the Host Controller supports the HS200 mode then tuning * function has to be executed. */ - if (((ctrl & SDHCI_CTRL_UHS_MASK) == SDHCI_CTRL_UHS_SDR104) || - (((ctrl & SDHCI_CTRL_UHS_MASK) == SDHCI_CTRL_UHS_SDR50) && - (host->flags & SDHCI_SDR50_NEEDS_TUNING)) || - (host->flags & SDHCI_HS200_NEEDS_TUNING)) + if ((ctrl & SDHCI_CTRL_UHS_MASK == SDHCI_CTRL_UHS_SDR104) || + ((ctrl & SDHCI_CTRL_UHS_MASK == SDHCI_CTRL_UHS_SDR50) && + host->flags & SDHCI_SDR50_NEEDS_TUNING || + host->flags & SDHCI_HS200_NEEDS_TUNING)) ctrl |= SDHCI_CTRL_EXEC_TUNING; else { spin_unlock(&host->lock); @@ -2163,8 +2163,8 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask) /* CMD19 generates _only_ Buffer Read Ready interrupt */ if (intmask & SDHCI_INT_DATA_AVAIL) { command = SDHCI_GET_CMD(sdhci_readw(host, SDHCI_COMMAND)); - if ((command == MMC_SEND_TUNING_BLOCK) || - (command == MMC_SEND_TUNING_BLOCK_HS200)) { + if (command == MMC_SEND_TUNING_BLOCK) || + command == MMC_SEND_TUNING_BLOCK_HS200) { host->tuning_done = 1; wake_up(&host->buf_ready_int); return; @@ -2765,11 +2765,11 @@ int sdhci_add_host(struct sdhci_host *host) if (caps[1] & SDHCI_SUPPORT_DDR50) mmc->caps |= MMC_CAP_UHS_DDR50; - /* Does the host needs tuning for SDR50? */ + /* Does the host need tuning for SDR50? */ if (caps[1] & SDHCI_USE_SDR50_TUNING) host->flags |= SDHCI_SDR50_NEEDS_TUNING; - /* Does the host needs tuning for HS200? */ + /* Does the host need tuning for HS200? */ if (mmc->caps2 & MMC_CAP2_HS200) host->flags |= SDHCI_HS200_NEEDS_TUNING; diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 46fd2ac..ad265b9 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -158,7 +158,7 @@ #define SDHCI_CTRL_UHS_SDR50 0x0002 #define SDHCI_CTRL_UHS_SDR104 0x0003 #define SDHCI_CTRL_UHS_DDR50 0x0004 -#define SDHCI_CTRL_HS_SDR200 0x0005 /*reserved value in SDIO spec */ +#define SDHCI_CTRL_HS_SDR200 0x0005 /* reserved value in SDIO spec */ #define SDHCI_CTRL_VDD_180 0x0008 #define SDHCI_CTRL_DRV_TYPE_MASK 0x0030 #define SDHCI_CTRL_DRV_TYPE_B 0x0000