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? leiwen@ubuntu:~/reps/works/u-boot-marvell$ git am ~/reps/works/u-boot/20110411/0001-pxa-move-i2c-driver-to-the-common-place.patch Applying: pxa: move i2c driver to the common place leiwen@ubuntu:~/reps/works/u-boot-marvell$ git am ~/reps/works/u-boot/20110411/0002-mv_i2c-fix-timeout-value-to-be-consistent-with-comme.patch Applying: mv_i2c: fix timeout value to be consistent with comments leiwen@ubuntu:~/reps/works/u-boot-marvell$ git am ~/reps/works/u-boot/20110411/0003-mv_i2c-use-structure-to-replace-the-direclty-define.patch Applying: mv_i2c: use structure to replace the direclty define leiwen@ubuntu:~/reps/works/u-boot-marvell$ git am ~/reps/works/u-boot/20110411/0004-I2C-add-i2c-support-for-Pantheon-platform.patch Applying: I2C: add i2c support for Pantheon platform leiwen@ubuntu:~/reps/works/u-boot-marvell$ git am ~/reps/works/u-boot/20110411/0005-I2C-mv_i2c-add-multi-bus-support.patch Applying: I2C: mv_i2c: add multi bus support leiwen@ubuntu:~/reps/works/u-boot-marvell$ git am ~/reps/works/u-boot/20110411/0006-I2C-add-i2c-support-for-Armada100-platform.patch Applying: I2C: add i2c support for Armada100 platform 7ad84a1ad5fb2d55efcf87a5b37d1e013283191e I2C: add i2c support for Armada100 platform 7fe7e01ca592e978b18ec37bd4ac36cfb13b7538 I2C: mv_i2c: add multi bus support 89f9b6a3714fd898f46370b3729040b29b820681 I2C: add i2c support for Pantheon platform 8bb0300e9de3d45959282fa0ddcd06e48f3edfaf mv_i2c: use structure to replace the direclty define 04390287c9101169fbf6f7015290f2f73cf6b193 mv_i2c: fix timeout value to be consistent with comments 84e1db708ade04ab014b72bcdc8e657bc9ae5b1c pxa: move i2c driver to the common place 162987fcf760ed54df5fb95018036ade636b5cd3 MX25: tx25: Add _end section on nand_spl feb28e18dab7c583b6d0d20e89256271ef1ac6ad MX31: mx31pdk: fix nand_spl Best regards, Lei _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot