From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from buildserver.ru.mvista.com (unknown [85.21.88.6]) by ozlabs.org (Postfix) with ESMTP id 132E1DDEFE for ; Thu, 22 Jan 2009 13:00:40 +1100 (EST) Date: Thu, 22 Jan 2009 05:00:37 +0300 From: Anton Vorontsov To: Pierre Ossman Subject: [PATCH 08/10] sdhci: Add set_clock callback Message-ID: <20090122020037.GH11492@oksana.dev.rtsoft.ru> References: <20090122015649.GA6835@oksana.dev.rtsoft.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 In-Reply-To: <20090122015649.GA6835@oksana.dev.rtsoft.ru> Cc: sdhci-devel@list.drzeus.cx, Arnd Bergmann , linux-kernel@vger.kernel.org, Liu Dave , Joe D'Abbraccio , linuxppc-dev@ozlabs.org, Konjin Lai , Ben Dooks , Xie Xiaobo List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , FSL eSDHC hosts have incompatible register map to manage the SDCLK. This patch adds set_clock callback so that drivers could overwrite set_clock behaviour. Similar patch[1] was posted by Ben Dooks, though in Ben's version the callback is named change_clock, plus the patch has some unrelated bits that makes the patch difficult to reuse. [1] http://lkml.org/lkml/2008/12/2/160 Signed-off-by: Anton Vorontsov --- drivers/mmc/host/sdhci.c | 5 +++++ drivers/mmc/host/sdhci.h | 2 ++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 9ac088a..e456ae0 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -959,6 +959,11 @@ static void sdhci_set_clock(struct sdhci_host *host, unsigned int clock) if (clock == host->clock) return; + if (host->ops->set_clock) { + host->ops->set_clock(host, clock); + return; + } + sdhci_writew(host, SDHCI_CLOCK_CONTROL, 0); if (clock == 0) diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 7e3b01f..39cfd5a 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -303,6 +303,8 @@ struct sdhci_ops { void (*writew)(struct sdhci_host *host, int reg, u16 val); void (*writeb)(struct sdhci_host *host, int reg, u8 val); + void (*set_clock)(struct sdhci_host *host, unsigned int clock); + int (*enable_dma)(struct sdhci_host *host); }; -- 1.5.6.5