On Wed, Apr 13, 2011 at 10:26 PM, Prafulla Wadaskar
<prafu...@marvell.com> wrote:
>
>
>> -----Original Message-----
>> From: Lei Wen [mailto:adrian.w...@gmail.com]
>> Sent: Wednesday, April 13, 2011 7:44 PM
>> To: Prafulla Wadaskar
>> Cc: Lei Wen; Heiko Schocher; Wolfgang Denk; u-boot@lists.denx.de; Marek
>> Vasut; Ashish Karkare; Prabhanjan Sarnaik; Yu Tang
>> Subject: Re: [PATCH V8 0/6] add i2c support to pantheon and aramada100
>>
>> Hi Prafulla,
>>
>> On Wed, Apr 13, 2011 at 10:01 PM, Prafulla Wadaskar
>> <prafu...@marvell.com> wrote:
>> >
>> >
>> >> -----Original Message-----
>> >> From: Lei Wen [mailto:lei...@marvell.com]
>> >> Sent: Tuesday, April 05, 2011 1:31 PM
>> >> To: Heiko Schocher; Prafulla Wadaskar; Wolfgang Denk; u-
>> >> b...@lists.denx.de; Marek Vasut; Ashish Karkare; Prabhanjan Sarnaik;
>> Yu
>> >> Tang; adrian.w...@gmail.com
>> >> Subject: [PATCH V8 0/6] add i2c support to pantheon and aramada100
>> >>
>> >> V2:
>> >> rename the previous pxa_i2c to mvi2c, since this driver would be
>> shared
>> >> by many other Marvell platforms.
>> >>
>> >> V3:
>> >> Clean the code sytle issue
>> >>
>> >> V4:
>> >> add and* and or* to make set bit operation generic
>> >> Also make i2c definition included in the ifdef
>> >>
>> >> V5:
>> >> Fix code style issue of the first patch
>> >>
>> >> V6:
>> >> Seperate the and* and or* patch out of the patch set
>> >> Move CONFIG_CMD_I2C define place
>> >>
>> >> V7:
>> >> Fix comments style
>> >> Make global change from PXA to MV
>> >> Move i2c config setting to <arch/config>
>> >>
>> >> V8:
>> >> Seperate timeout fix patch out
>> >>
>> >> Lei Wen (6):
>> >> pxa: move i2c driver to the common place
>> >> mv_i2c: fix timeout value to be consistent with comments
>> >> mv_i2c: use structure to replace the direclty define
>> >> I2C: add i2c support for Pantheon platform
>> >> I2C: mv_i2c: add multi bus support
>> >> I2C: add i2c support for Armada100 platform
>> >>
>> >> arch/arm/cpu/arm926ejs/armada100/cpu.c | 16 +
>> >> arch/arm/cpu/arm926ejs/pantheon/cpu.c | 12 +
>> >> arch/arm/cpu/pxa/Makefile | 1 -
>> >> arch/arm/cpu/pxa/cpu.c | 10 +
>> >> arch/arm/cpu/pxa/i2c.c | 469 ----------------
>> ---
>> >> ------
>> >> arch/arm/include/asm/arch-armada100/config.h | 12 +
>> >> arch/arm/include/asm/arch-armada100/mfp.h | 40 ++-
>> >> arch/arm/include/asm/arch-pantheon/config.h | 10 +
>> >> arch/arm/include/asm/arch-pantheon/cpu.h | 4 +-
>> >> arch/arm/include/asm/arch-pantheon/mfp.h | 6 +-
>> >> arch/arm/include/asm/arch-pxa/pxa-regs.h | 56 ---
>> >> board/Marvell/aspenite/aspenite.c | 5 +
>> >> board/Marvell/dkb/dkb.c | 4 +
>> >> board/innokom/innokom.c | 9 +-
>> >> drivers/i2c/Makefile | 1 +
>> >> drivers/i2c/mv_i2c.c | 481
>> >> ++++++++++++++++++++++++++
>> >> drivers/i2c/mv_i2c.h | 83 +++++
>> >> include/configs/aspenite.h | 1 +
>> >> include/configs/dkb.h | 2 +
>> >> include/configs/innokom.h | 2 +
>> >> include/configs/xm250.h | 2 +
>> >> 21 files changed, 671 insertions(+), 555 deletions(-)
>> >> delete mode 100644 arch/arm/cpu/pxa/i2c.c
>> >> create mode 100644 drivers/i2c/mv_i2c.c
>> >> create mode 100644 drivers/i2c/mv_i2c.h
>> >
>> > Dear Lei
>> > I have trying to apply this patch series to u-boot-marvell.git master
>> branch.
>> > Since I have rebased this branch to latest u-boot-arm.git master.
>> >
>> > This patch series cannot be cleanly applied.
>> >
>> > Can you pls provide new one in sync with latest pull from u-boot-
>> marvell.git master branch?
>> >
>>
>> I just apply those patch on master branch without any warning.
>> Are you apply the V8 series?
>
> Yes, I am using V8 patches.
> Have you done git pull before that?
> What is your latest git log? (before applying patches)
>
The commit apply is based on:
commit 162987fcf760ed54df5fb95018036ade636b5cd3
Author: Fabio Estevam <feste...@gmail.com>
Date: Sun Apr 3 12:17:19 2011 +0000
MX25: tx25: Add _end section on nand_spl
Isn't it the latest?
Best regards,
Lei
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
