On Tue, Nov 23, 2010 at 5:56 AM, Haojian Zhuang
<haojian.zhuang@xxxxxxxxx> wrote:
> On Mon, Nov 22, 2010 at 11:38 AM, Haojian Zhuang
> <haojian.zhuang@xxxxxxxxx> wrote:
>> On Thu, Nov 18, 2010 at 3:42 PM, zhangfei gao <zhangfei.gao@xxxxxxxxx> wrote:
>>> Different platform will provide different init_sdh to handle private
>>> register is not same in various platform.
>>> Put init_sdh in set_clock is we don't want to add more call back
>>> function to sdhci.c to keep sdhci.c as simple as possible.
>>> Currently init_sdh will be called several times when clk is changed:
>>> insert, 2 times; remove: 4 times.
>>> After clk_gating in MMC stack is enabled, set_clock will send clock=0,
>>> and then init_sdh will only called only once as well as enable_clk.
>>>
>>> From c1abef994120536f9f0498293afeebf5412f22f6 Mon Sep 17 00:00:00 2001
>>> From: Zhangfei Gao <zhangfei.gao@xxxxxxxxxxx>
>>> Date: Thu, 18 Nov 2010 01:22:23 -0500
>>> Subject: [PATCH] sdhci-pxa: init_sdh for different platform
>>>
>>> The sdhci-pxa ip is same, but may be different version among
>>> different platforms, as a result private register have different
>>> address.
>>> Provide init_sdh in arch/arm/mach to move the difference to platform code.
>>>
>>> Signed-off-by: Zhangfei Gao <zhangfei.gao@xxxxxxxxxxx>
>>> ---
>>> arch/arm/mach-mmp/include/mach/mmp2_sdh.h | 58 +++++++++++++++++++++++++++++
>>> arch/arm/plat-pxa/include/plat/sdhci.h | 6 +++
>>> drivers/mmc/host/sdhci-pxa.c | 34 +----------------
>>> 3 files changed, 66 insertions(+), 32 deletions(-)
>>> create mode 100644 arch/arm/mach-mmp/include/mach/mmp2_sdh.h
>>>
>>> diff --git a/arch/arm/mach-mmp/include/mach/mmp2_sdh.h
>>> b/arch/arm/mach-mmp/include/mach/mmp2_sdh.h
>>> new file mode 100644
>>> index 0000000..c1d4a80
>>> --- /dev/null
>>> +++ b/arch/arm/mach-mmp/include/mach/mmp2_sdh.h
>>> @@ -0,0 +1,58 @@
>>> +/* linux/arch/arm/mach-mmp/include/mach/mmp2_sdh.h
>>> + *
>>> + * Copyright 2010 Marvell
>>> + * Zhangfei Gao <zhangfei.gao@xxxxxxxxxxx>
>>> + *
>>> + * MMP2 Platform - sepcific sdh function
>>> + *
>>> + * 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 __MMP2_SDH_H
>>> +#define __MMP2_SDH_H
>>> +
>>> +#include <linux/mmc/sdhci.h>
>>> +#include <plat/sdhci.h>
>>> +#include <linux/io.h>
>>> +
>>> +#define SD_FIFO_PARAM 0x104
>>> +#define DIS_PAD_SD_CLK_GATE 0x400
>>> +
>>> +#define SD_CLOCK_AND_BURST_SIZE_SETUP 0x10A
>>> +#define SDCLK_SEL 0x100
>>> +#define SDCLK_DELAY_SHIFT 9
>>> +#define SDCLK_DELAY_MASK 0x1f
>>> +
>>> +inline void mmp2_init_sdh(struct sdhci_host *host,
>>> + struct sdhci_pxa_platdata *pdata)
>>> +{
>>> + /*
>>> + * tune timing of read data/command when crc error happen
>>> + * no performance impact
>>> + */
>>> + if (pdata && 0 != pdata->clk_delay_cycles) {
>>> + u16 tmp;
>>> +
>>> + tmp = readw(host->ioaddr + SD_CLOCK_AND_BURST_SIZE_SETUP);
>>> + tmp |= (pdata->clk_delay_cycles & SDCLK_DELAY_MASK)
>>> + << SDCLK_DELAY_SHIFT;
>>> + tmp |= SDCLK_SEL;
>>> + writew(tmp, host->ioaddr + SD_CLOCK_AND_BURST_SIZE_SETUP);
>>> + }
>>> +
>>> + /*
>>> + * disable clock gating per some cards requirement
>>> + */
>>> +
>>> + if (pdata && pdata->flags & PXA_FLAG_DISABLE_CLOCK_GATING) {
>>> + u32 tmp = 0;
>>> +
>>> + tmp = readl(host->ioaddr + SD_FIFO_PARAM);
>>> + tmp |= DIS_PAD_SD_CLK_GATE;
>>> + writel(tmp, host->ioaddr + SD_FIFO_PARAM);
>>> + }
>>> +}
>
> Since you implement it as C code, it'll result in build issue for
> multiple platform that supports MMP2 SDH. So I suggest you to seperate
> this patch into two. One is focused on implementing mmp2_init_sdh() in
> mmp2.c and submitted to pxa tree since we're always updating mmp2.c in
> pxa subtree. The other one is focused on using this interface from
> pdata in MMC tree.
>
> Thanks
> Haojian
Thanks for suggestion, will split the patch, only provide interface
here, and implement mmp2_init_sdh in arch/arm/mach-mmp/mmp2.c and
submit in pxa tree.
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
