From patchwork Sun Sep 26 10:56:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhangfei Gao X-Patchwork-Id: 209882 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 o8QAusYG011064 for ; Sun, 26 Sep 2010 10:56:55 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756327Ab0IZK4y (ORCPT ); Sun, 26 Sep 2010 06:56:54 -0400 Received: from mail-iw0-f174.google.com ([209.85.214.174]:47230 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755542Ab0IZK4x (ORCPT ); Sun, 26 Sep 2010 06:56:53 -0400 Received: by iwn5 with SMTP id 5so3808849iwn.19 for ; Sun, 26 Sep 2010 03:56:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:date:message-id :subject:from:to:cc:content-type; bh=iUynzRxp6zhU5KzGtLxxnjhQI562n3QuGTLPk48HpTk=; b=uwImCznqwlrNGf1gMYoSqVeljmvZoPq+ByYP/Z4cuI7uGWIlPXUThKZx+kUV5tpasz Ovt/mVKfT4DNMXkYDu0wJa9BB2vJu9nMCuu6GjhF+5clmtsj6ViNvJ2vdzdvW0gD8zJd KRV5we0vEBozHmlg3DGlqpeovbYv/3RiLdNSA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:cc:content-type; b=MeLQcXKe9TSYs4Nq8gCg3k3iax5ZMnAeeW2nlQhGfw+gD5c1Ka6GmkFo2FBx7XKZlb A0GCZjzCtzMDjA3wqYRJ3xvQqMQGyqPQsGZV/sjxayBlOzYkJSuH9+T7eHxYbWIgm9Vd 4mdhnSs7zVBBaGzE815cL28EfkTt6sEufmnFE= MIME-Version: 1.0 Received: by 10.231.161.80 with SMTP id q16mr6853743ibx.142.1285498611124; Sun, 26 Sep 2010 03:56:51 -0700 (PDT) Received: by 10.231.206.203 with HTTP; Sun, 26 Sep 2010 03:56:51 -0700 (PDT) Date: Sun, 26 Sep 2010 06:56:51 -0400 Message-ID: Subject: [patch 2/2] mmc: add support of sdhci-pxa driver From: zhangfei gao To: linux-mmc@vger.kernel.org Cc: Chris Ball , Wolfram Sang , eric.y.miao@gmail.com, Haojian Zhuang 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]); Sun, 26 Sep 2010 10:56:55 +0000 (UTC) From f7e1cc9975cbed2d993d4209eae36f8f300fb18c Mon Sep 17 00:00:00 2001 From: Zhangfei Gao Date: Sun, 26 Sep 2010 17:13:43 -0400 Subject: [PATCH 2/2] mmc: add support of sdhci-pxa driver Support Marvell PXA168/PXA910/MMP2 SD Host Controller Signed-off-by: Zhangfei Gao --- arch/arm/plat-pxa/include/plat/sdhci.h | 32 +++++++ drivers/mmc/host/Kconfig | 11 +++ drivers/mmc/host/Makefile | 1 + drivers/mmc/host/sdhci-pxa.c | 143 ++++++++++++++++++++++++++++++++ 4 files changed, 187 insertions(+), 0 deletions(-) create mode 100644 arch/arm/plat-pxa/include/plat/sdhci.h create mode 100644 drivers/mmc/host/sdhci-pxa.c diff --git a/arch/arm/plat-pxa/include/plat/sdhci.h b/arch/arm/plat-pxa/include/plat/sdhci.h new file mode 100644 index 0000000..3d5f5ef --- /dev/null +++ b/arch/arm/plat-pxa/include/plat/sdhci.h @@ -0,0 +1,32 @@ +/* arch/arm/plat-pxa/include/plat/sdhci.h + * + * Copyright 2010 Marvell + * Zhangfei Gao + * + * PXA Platform - SDHCI platform data definitions + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. +*/ + +#ifndef __PLAT_PXA_SDHCI_H +#define __PLAT_PXA_SDHCI_H __FILE__ + +/* pxa specific quirks */ +/* Card alwayes wired to host, like emmc */ +#define PXA_QUIRK_BROKEN_CARD_DETECTION (1<<0) +/* Require clock free running */ +#define PXA_QUIRK_DISABLE_CLOCK_GATING (1<<1) + +/** + * struct pxa_sdhci_platdata() - Platform device data for PXA SDHCI + * @max_speed: The maximum speed supported. + * @pxa_quirks: specific quirk of pxa +*/ +struct sdhci_pxa_platdata { + unsigned int max_speed; + unsigned int pxa_quirk; +}; + +#endif /* __PLAT_PXA_SDHCI_H */ diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index 6f12d5d..9510976 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -158,6 +158,17 @@ config MMC_SDHCI_S3C If unsure, say N. +config MMC_SDHCI_PXA + tristate "Marvell PXA168/PXA910/MMP2 SD Host Controller support" + depends on ARCH_PXA || ARCH_MMP + depends on MMC_SDHCI_PLTFM + help + This selects the Marvell(R) PXA168/PXA910/MMP2 SD Host Controller. + If you have a PXA168/PXA910/MMP2 platform with SD Host Controller and a + card slot,say Y or M here. + + If unsure, say N. + config MMC_SDHCI_SPEAR tristate "SDHCI support on ST SPEAr platform" depends on MMC_SDHCI && PLAT_SPEAR diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile index ef32c32..d166493 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile @@ -38,6 +38,7 @@ obj-$(CONFIG_MMC_USHC) += ushc.o obj-$(CONFIG_MMC_SDHCI_PLTFM) += sdhci-platform.o sdhci-platform-y := sdhci-pltfm.o sdhci-platform-$(CONFIG_MMC_SDHCI_CNS3XXX) += sdhci-cns3xxx.o +sdhci-platform-$(CONFIG_MMC_SDHCI_PXA) += sdhci-pxa.o obj-$(CONFIG_MMC_SDHCI_OF) += sdhci-of.o sdhci-of-y := sdhci-of-core.o diff --git a/drivers/mmc/host/sdhci-pxa.c b/drivers/mmc/host/sdhci-pxa.c new file mode 100644 index 0000000..12ede18 --- /dev/null +++ b/drivers/mmc/host/sdhci-pxa.c @@ -0,0 +1,143 @@ +/* linux/drivers/mmc/host/sdhci-pxa.c + * + * Copyright 2010 Marvell + * Zhangfei Gao + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +/* Supports: + * SDHCI support for MMP2/PXA910/PXA168 + * + * Based on sdhci-pltfm.c + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include "sdhci.h" +#include "sdhci-pltfm.h" + +#define SD_FIFO_PARAM 0x104 +#define DIS_PAD_SD_CLK_GATE 0x400 + +struct sdhci_pxa { + struct sdhci_pxa_platdata *pdata; + struct clk *clk; + + u32 quirks; + u8 clk_enable; +}; + +/*****************************************************************************\ + * * + * SDHCI core callbacks * + * * +\*****************************************************************************/ +static void sdhci_pxa_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) { + clk_disable(pxa->clk); + pxa->clk_enable = 0; + } + } else { + if (0 == pxa->clk_enable) { + if (pxa->pdata->pxa_quirk + & PXA_QUIRK_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; + } + } +} + +static struct sdhci_ops sdhci_pxa_ops = { + .set_clock = sdhci_pxa_set_clock, +}; + +/*****************************************************************************\ + * * + * sdhci-pltfm callbacks * + * * +\*****************************************************************************/ +static int sdhci_pxa_init(struct sdhci_host *host, struct sdhci_pltfm_data *pdata, void* priv_pdata) +{ + struct sdhci_pxa *pxa = sdhci_priv(host); + struct device *dev = mmc_dev(host->mmc); + + pxa->pdata = priv_pdata; + pxa->clk_enable = 0; + + pxa->clk = clk_get(dev, "PXA-SDHCLK"); + if (IS_ERR(pxa->clk)) { + dev_err(dev, "clk err\n"); + return -ENODEV; + } + clk_enable(pxa->clk); + dev_dbg(dev, "SDHC clock:%lu\n", clk_get_rate(pxa->clk)); + + pxa->clk_enable = 0; + pxa->quirks = pdata->quirks; + + if (pxa->pdata->pxa_quirk & PXA_QUIRK_BROKEN_CARD_DETECTION) + pxa->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION; + + return 0; +} + +static unsigned int sdhci_pxa_get_quirk(struct sdhci_host *host) +{ + struct sdhci_pxa *pxa = sdhci_priv(host); + + return pxa->quirks; +} + +static void sdhci_pxa_set_max_speed(struct sdhci_host *host) +{ + struct sdhci_pxa *pxa = sdhci_priv(host); + + if (pxa->pdata->max_speed) + host->mmc->f_max = pxa->pdata->max_speed; +} + +static void sdhci_pxa_exit(struct sdhci_host *host) +{ + struct sdhci_pxa *pxa = sdhci_priv(host); + + if (pxa->clk_enable) + clk_disable(pxa->clk); + clk_put(pxa->clk); +} + +static struct sdhci_host *sdhci_pxa_alloc_host(struct device *dev) +{ + return sdhci_alloc_host(dev, sizeof(struct sdhci_pxa)); +} + +struct sdhci_pltfm_data sdhci_pxa_pdata = { + .ops = &sdhci_pxa_ops, + .quirks = SDHCI_QUIRK_BROKEN_ADMA | SDHCI_QUIRK_BROKEN_TIMEOUT_VAL, + .init = sdhci_pxa_init, + .exit = sdhci_pxa_exit, + .get_quirk = sdhci_pxa_get_quirk, + .set_max_speed = sdhci_pxa_set_max_speed, + .alloc_host = sdhci_pxa_alloc_host, +}; + +MODULE_DESCRIPTION("SDH controller driver for PXA168/PXA910/MMP2"); +MODULE_AUTHOR("Zhangfei Gao "); +MODULE_LICENSE("GPL v2"); -- 1.7.0.4