From patchwork Wed Sep 19 02:12:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Liu X-Patchwork-Id: 1475621 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id BC723400EC for ; Wed, 19 Sep 2012 02:18:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754959Ab2ISCS0 (ORCPT ); Tue, 18 Sep 2012 22:18:26 -0400 Received: from na3sys009aog119.obsmtp.com ([74.125.149.246]:43062 "EHLO na3sys009aog119.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754240Ab2ISCSZ (ORCPT ); Tue, 18 Sep 2012 22:18:25 -0400 Received: from MSI-MTA.marvell.com ([65.219.4.132]) (using TLSv1) by na3sys009aob119.postini.com ([74.125.148.12]) with SMTP ID DSNKUFkrbrZOM4wEZGg4MJt7+KD1UV4FLvNQ@postini.com; Tue, 18 Sep 2012 19:18:25 PDT Received: from maili.marvell.com ([10.68.76.210]) by MSI-MTA.marvell.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 18 Sep 2012 19:18:08 -0700 Received: from localhost.localdomain (unknown [10.38.36.240]) by maili.marvell.com (Postfix) with ESMTP id 2EB874E510; Tue, 18 Sep 2012 19:18:07 -0700 (PDT) From: Kevin Liu To: linux-mmc@vger.kernel.org, cjb@laptop.org, pierre@ossman.eu Cc: hzhuang1@marvell.com, cxie4@marvell.com, prakity@marvell.com, kliu5@marvell.com, Bin Wang Subject: [PATCH 5/6] mmc: sdhci: keep the saved clock var up to date Date: Wed, 19 Sep 2012 10:12:41 +0800 Message-Id: <1348020762-12932-6-git-send-email-keyuan.liu@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1348020762-12932-1-git-send-email-keyuan.liu@gmail.com> References: <1348020762-12932-1-git-send-email-keyuan.liu@gmail.com> X-OriginalArrivalTime: 19 Sep 2012 02:18:08.0451 (UTC) FILETIME=[02834130:01CD960D] Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org From: Kevin Liu The clock rate set to the sdh controller may not exactly as requested by the mmc core, this patch make the clock rate saved in the mmc_ios and sdhci_host updated with the actual setting as in the controller. Thus "/sys/kernel/debug/mmcx/ios" and card detect prints can show the correct clock rate. Signed-off-by: Bin Wang Signed-off-by: Kevin Liu --- drivers/mmc/host/sdhci.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 32dd505..4b5631e 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1199,7 +1199,10 @@ static void sdhci_set_clock(struct sdhci_host *host, unsigned int clock) sdhci_writew(host, clk, SDHCI_CLOCK_CONTROL); out: - host->clock = clock; + if (real_div) + host->clock = host->mmc->actual_clock; + else + host->clock = clock; } static int sdhci_set_power(struct sdhci_host *host, unsigned short power) @@ -1375,6 +1378,7 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios) } sdhci_set_clock(host, ios->clock); + ios->clock = host->clock; if (ios->power_mode == MMC_POWER_OFF) vdd_bit = sdhci_set_power(host, -1);