From patchwork Thu Dec 9 00:18:32 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip Rakity X-Patchwork-Id: 392592 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oB90KEDt007059 for ; Thu, 9 Dec 2010 00:20:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755283Ab0LIAUx (ORCPT ); Wed, 8 Dec 2010 19:20:53 -0500 Received: from na3sys009aog112.obsmtp.com ([74.125.149.207]:34153 "HELO na3sys009aog112.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1755307Ab0LIAUw convert rfc822-to-8bit (ORCPT ); Wed, 8 Dec 2010 19:20:52 -0500 Received: from source ([65.219.4.129]) (using TLSv1) by na3sys009aob112.postini.com ([74.125.148.12]) with SMTP ID DSNKTQAg4wg+Dw2ILak+ZYkhf31rxw7M+Mpq@postini.com; Wed, 08 Dec 2010 16:20:52 PST Received: from SC-vEXCH3.marvell.com ([10.93.76.133]) by SC-OWA01.marvell.com ([10.93.76.21]) with mapi; Wed, 8 Dec 2010 16:18:34 -0800 From: Philip Rakity To: "linux-mmc@vger.kernel.org" CC: Mark Brown , Chris Ball , Nicolas Pitre Date: Wed, 8 Dec 2010 16:18:32 -0800 Subject: [PATCH V4 4/4] mmc: add support for H/W clock gating of SD controller Thread-Topic: [PATCH V4 4/4] mmc: add support for H/W clock gating of SD controller Thread-Index: AcuXNp2waKIXhsu1RtugwvnxW1ouVA== Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 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.3 (demeter1.kernel.org [140.211.167.41]); Thu, 09 Dec 2010 00:20:55 +0000 (UTC) diff --git a/drivers/mmc/host/sdhci-pxa.c b/drivers/mmc/host/sdhci-pxa.c index 5a61208..125cda8 100644 --- a/drivers/mmc/host/sdhci-pxa.c +++ b/drivers/mmc/host/sdhci-pxa.c @@ -25,13 +25,11 @@ #include #include #include +#include #include "sdhci.h" #define DRIVER_NAME "sdhci-pxa" -#define SD_FIFO_PARAM 0x104 -#define DIS_PAD_SD_CLK_GATE 0x400 - struct sdhci_pxa { struct sdhci_host *host; struct sdhci_pxa_platdata *pdata; @@ -46,10 +44,33 @@ struct sdhci_pxa { * SDHCI core callbacks * * * \*****************************************************************************/ +#ifdef CONFIG_MMC_CLKGATE +static void hardware_clk_gating(struct sdhci_host *host) +{ + unsigned short tmp; + int enable; + + /* + * MMP2 controller allows clock gating for SD/eMMC/SDIO cards + * by extending the definition for SDCTRL_2_ASYNC_INT_EN in the + * host control register 2. The SD Host Controller spec + * defines this bit for use with SDIO. + */ + enable = host->mmc->clk_gated; + tmp = readw(host->ioaddr + HOST_CTRL_2); + + if (enable) + tmp |= SDCTRL_2_ASYNC_INT_EN; + else + tmp &= ~SDCTRL_2_ASYNC_INT_EN; + + writew(tmp, host->ioaddr + HOST_CTRL_2); +} +#endif + static void set_clock(struct sdhci_host *host, unsigned int clock) { struct sdhci_pxa *pxa = sdhci_priv(host); - u32 tmp = 0; if (clock == 0) { if (pxa->clk_enable) { @@ -58,11 +79,6 @@ static void set_clock(struct sdhci_host *host, unsigned int clock) } } else { if (0 == pxa->clk_enable) { - if (pxa->pdata->flags & PXA_FLAG_DISABLE_CLOCK_GATING) { - tmp = readl(host->ioaddr + SD_FIFO_PARAM); - tmp |= DIS_PAD_SD_CLK_GATE; - writel(tmp, host->ioaddr + SD_FIFO_PARAM); - } clk_enable(pxa->clk); pxa->clk_enable = 1; } @@ -71,6 +87,9 @@ static void set_clock(struct sdhci_host *host, unsigned int clock) static struct sdhci_ops sdhci_pxa_ops = { .set_clock = set_clock, +#ifdef CONFIG_MMC_CLKGATE + .platform_hw_clk_gate = hardware_clk_gating, +#endif }; /*****************************************************************************\ @@ -145,6 +164,11 @@ static int __devinit sdhci_pxa_probe(struct platform_device *pdev) if (pdata->flags & PXA_FLAG_SD_8_BIT_CAPABLE_SLOT) host->mmc->caps |= MMC_CAP_8_BIT_DATA; +#ifdef CONFIG_MMC_CLKGATE + if (cpu_is_mmp2()) + host->mmc->caps |= MMC_CAP_HW_CLOCK_GATING; +#endif + ret = sdhci_add_host(host); if (ret) { dev_err(&pdev->dev, "failed to add host\n");