[PATCH] MTD: pxa3xx_nand: enable multiple chip select support

[Lei Wen]

Hi Daniel,

On Wed, Jun 22, 2011 at 9:06 PM, Daniel Mack <zonque at gmail.com> wrote:
> Hi Lei,
>
> On Wed, Jun 22, 2011 at 2:21 PM, Lei Wen <adrian.wenl at gmail.com> wrote:
>> Hi Daniel,
>>
>> On Wed, Jun 22, 2011 at 7:39 PM, Daniel Mack <zonque at gmail.com> wrote:
>>> On Wed, Jun 22, 2011 at 5:17 AM, Lei Wen <leiwen at marvell.com> wrote:
>>>> Current pxa3xx_nand controller has two chip select which
>>>> both be workable. This patch enable this feature.
>>>>
>>>> Update platform driver to support this feature.
>>>>
>>>> Another notice should be taken that:
>>>> When you want to use this feature, you should not enable the
>>>> keep configuration feature, for two chip select could be
>>>> attached with different nand chip. The different page size
>>>> and timing requirement make the keep configuration impossible.
>>>>
>>>> Signed-off-by: Lei Wen <leiwen at marvell.com>
>>>> ---
>>>>  arch/arm/mach-mmp/aspenite.c                 |    5 +-
>>>>  arch/arm/mach-pxa/cm-x300.c                  |    5 +-
>>>>  arch/arm/mach-pxa/colibri-pxa3xx.c           |    5 +-
>>>>  arch/arm/mach-pxa/littleton.c                |    5 +-
>>>>  arch/arm/mach-pxa/mxm8x10.c                  |    9 +-
>>>>  arch/arm/mach-pxa/raumfeld.c                 |    5 +-
>>>>  arch/arm/mach-pxa/zylonite.c                 |    5 +-
>>>>  arch/arm/plat-pxa/include/plat/pxa3xx_nand.h |    8 +-
>>>>  drivers/mtd/nand/pxa3xx_nand.c               |  735 +++++++++++++++-----------
>>>>  9 files changed, 444 insertions(+), 338 deletions(-)
>>>
>>> This patch doesn't apply for me on top of Linus' master branch. Which
>>> tree are you based on currently?
>>
>> Actually it is based on Linux 3.0-rc2 and add two patches pending to
>> l2-mtd-2.6.git already:
>>
>> mtd: pxa3xx_nand: fix nand detection issue
>> mtd: pxa3xx_nand: Fix blank page ECC mismatch
>
> I have a similar setup, also with those two patches on top, but
> applying your patch gives me:
>
> Applying: MTD: pxa3xx_nand: enable multiple chip select support
> error: patch failed: drivers/mtd/nand/pxa3xx_nand.c:477
> error: drivers/mtd/nand/pxa3xx_nand.c: patch does not apply
> Patch failed at 0001 MTD: pxa3xx_nand: enable multiple chip select support
> When you have resolved this problem run "git am --resolved".
> If you would prefer to skip this patch, instead run "git am --skip".
> To restore the original branch and stop patching run "git am --abort".
>
> Could you push your branch somewhere?
>
>>>>  #ifdef CONFIG_PM
>>>> @@ -1183,8 +1278,8 @@ static int pxa3xx_nand_resume(struct platform_device *pdev)
>>>>        struct pxa3xx_nand_info *info = platform_get_drvdata(pdev);
>>>>        struct mtd_info *mtd = info->mtd;
>>>>
>>>> -       nand_writel(info, NDTR0CS0, info->ndtr0cs0);
>>>> -       nand_writel(info, NDTR1CS0, info->ndtr1cs0);
>>>> +       nand_writel(nand, NDTR0CS0, info->ndtr0cs0);
>>>> +       nand_writel(nand, NDTR1CS0, info->ndtr1cs0);
>>>>        clk_enable(info->clk);
>>>
>>> This won't compile.
>>
>> Could you post your build log?
>
> I didn't compile it because I couldn't, but "nand" is certainly
> undefined in this context now. Did you compile and test this code with
> "CONFIG_PM=y"?

You're right, I haven't take open PM config...
I would rebase this patch over l2-mtd-2.6.git for next post.

Thanks,
Lei