From patchwork Wed Oct 17 11:04:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Liu X-Patchwork-Id: 1604911 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 56362DFABE for ; Wed, 17 Oct 2012 11:05:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756621Ab2JQLFp (ORCPT ); Wed, 17 Oct 2012 07:05:45 -0400 Received: from na3sys009aog138.obsmtp.com ([74.125.149.19]:60308 "EHLO na3sys009aog138.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756597Ab2JQLFp (ORCPT ); Wed, 17 Oct 2012 07:05:45 -0400 Received: from MSI-MTA.marvell.com ([65.219.4.132]) (using TLSv1) by na3sys009aob138.postini.com ([74.125.148.12]) with SMTP ID DSNKUH6RBEs04wuOfephXD+5pNfaF42+iI4U@postini.com; Wed, 17 Oct 2012 04:05:45 PDT Received: from maili.marvell.com ([10.68.76.210]) by MSI-MTA.marvell.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 17 Oct 2012 04:05:17 -0700 Received: from localhost.localdomain (unknown [10.38.36.240]) by maili.marvell.com (Postfix) with ESMTP id C8D1C4E513; Wed, 17 Oct 2012 04:05:15 -0700 (PDT) From: Kevin Liu To: linux-mmc@vger.kernel.org, cjb@laptop.org, pierre@ossman.eu, ulf.hansson@linaro.org, zgao6@marvell.com Cc: hzhuang1@marvell.com, cxie4@marvell.com, prakity@marvell.com, kliu5@marvell.com Subject: [PATCH v6 14/14] mmc: sdhci: add function to get retunig timer count Date: Wed, 17 Oct 2012 19:04:53 +0800 Message-Id: <1350471893-29633-15-git-send-email-keyuan.liu@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1350471893-29633-1-git-send-email-keyuan.liu@gmail.com> References: <1350471893-29633-1-git-send-email-keyuan.liu@gmail.com> X-OriginalArrivalTime: 17 Oct 2012 11:05:17.0327 (UTC) FILETIME=[4A5BB9F0:01CDAC57] Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org From: Kevin Liu According to spec, if timer count for retuning return 0xF, it means get information from other source. Signed-off-by: Kevin Liu --- drivers/mmc/host/sdhci.c | 8 ++++++++ drivers/mmc/host/sdhci.h | 1 + 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 9f44efd..882223a 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -2963,6 +2963,14 @@ int sdhci_add_host(struct sdhci_host *host) /* Initial value for re-tuning timer count */ host->tuning_count = (caps[1] & SDHCI_RETUNING_TIMER_COUNT_MASK) >> SDHCI_RETUNING_TIMER_COUNT_SHIFT; + if (host->tuning_count == 0xF) { + if (host->ops->get_tuning_count) + host->tuning_count = + host->ops->get_tuning_count(host) & 0xF; + else + pr_err("%s: Hardware doesn't specify tuning count.\n", + mmc_hostname(mmc)); + } /* * In case Re-tuning Timer is not disabled, the actual value of diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 5f20d32..d124f37 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -291,6 +291,7 @@ struct sdhci_ops { void (*platform_suspend)(struct sdhci_host *host); void (*platform_resume)(struct sdhci_host *host); void (*signal_voltage_switch)(struct sdhci_host *host, u8 vol); + unsigned int (*get_tuning_count)(struct sdhci_host *host); }; #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS