[U-Boot] Please pull u-boot-ti/master

Wolfgang,
Please pull u-boot-ti/master. I ran MAKEALL and saw no issues. The patch modifying the I2c driver has an ACK from Heiko. The patch restructuring the USB driver actually was a simple patch adding some more #defines so i went ahead and added it.
Thanks, Sandeep
The following changes since commit e9aecdec153ae166739858e6a570432449b979f7: Wolfgang Denk (1): Merge branch 'master' of git://git.denx.de/u-boot-ti
are available in the git repository at:
git://git.denx.de/u-boot-ti.git master
Steve Sakoman (8): ARMV7: Add pad mux support for OMAP4 ARMV7: Fix udelay for OMAP4 ARMV7: Modify i2c driver for more reliable operation on OMAP4 ARMV7: Add support for the TWL6030 I2C power chip used in OMAP4 systems ARMV7: Restructure omap3 musb driver to allow code sharing between OMAP3 and OMAP4 ARMV7: Enable musb driver and usbtty on OMAP4430 SDP ARMV7: Enable musb driver and usbtty on OMAP4 Panda ARMV7: Update default environment for OMAP4 boards
arch/arm/cpu/armv7/omap-common/timer.c | 9 - arch/arm/cpu/armv7/omap4/board.c | 11 + arch/arm/include/asm/arch-omap3/cpu.h | 3 + arch/arm/include/asm/arch-omap3/i2c.h | 4 +- arch/arm/include/asm/arch-omap4/cpu.h | 3 + arch/arm/include/asm/arch-omap4/mux_omap4.h | 344 +++++++++++++++++++++++++++ arch/arm/include/asm/arch-omap4/omap4.h | 2 + arch/arm/include/asm/arch-omap4/sys_proto.h | 1 + board/ti/panda/panda.c | 26 ++ board/ti/panda/panda.h | 265 +++++++++++++++++++++ board/ti/sdp4430/sdp.c | 26 ++ board/ti/sdp4430/sdp.h | 265 +++++++++++++++++++++ drivers/i2c/omap24xx_i2c.c | 31 ++- drivers/i2c/omap24xx_i2c.h | 4 + drivers/power/Makefile | 1 + drivers/power/twl6030.c | 77 ++++++ drivers/usb/musb/omap3.c | 16 ++ drivers/usb/musb/omap3.h | 3 +- include/configs/omap4_panda.h | 26 ++- include/configs/omap4_sdp4430.h | 26 ++- include/twl6030.h | 90 +++++++ 21 files changed, 1208 insertions(+), 25 deletions(-) create mode 100644 arch/arm/include/asm/arch-omap4/mux_omap4.h create mode 100644 board/ti/panda/panda.h create mode 100644 board/ti/sdp4430/sdp.h create mode 100644 drivers/power/twl6030.c create mode 100644 include/twl6030.h

Dear Sandeep,
In message 1280345146-18810-1-git-send-email-s-paulraj@ti.com you wrote:
Please pull u-boot-ti/master. I ran MAKEALL and saw no issues. The patch modifying the I2c driver has an ACK from Heiko. The patch restructuring the USB driver actually was a simple patch adding some more #defines so i went ahead and added it.
Sorry, I cannot.
There is a license conflivt with that patch:
Steve Sakoman (8): ARMV7: Add support for the TWL6030 I2C power chip used in OMAP4 systems
Best regards,
Wolfgang Denk

On Tue, Aug 3, 2010 at 2:37 PM, Wolfgang Denk wd@denx.de wrote:
Dear Sandeep,
In message 1280345146-18810-1-git-send-email-s-paulraj@ti.com you wrote:
Please pull u-boot-ti/master. I ran MAKEALL and saw no issues. The patch modifying the I2c driver has an ACK from Heiko. The patch restructuring the USB driver actually was a simple patch adding some more #defines so i went ahead and added it.
Sorry, I cannot.
There is a license conflivt with that patch:
Steve Sakoman (8): ARMV7: Add support for the TWL6030 I2C power chip used in OMAP4 systems
I just sent a revised version of the patch with that change incorporated.
Steve

Dear Steve Sakoman,
In message AANLkTimyVY=-eippjPncN144Qte6Oq1h5HzLkVS_rPz+@mail.gmail.com you wrote:
I just sent a revised version of the patch with that change incorporated.
Thanks. I'll wait for Sandeep to rebase his tree and resend the pull rq, then.
Best regards,
Wolfgang Denk

On Tue, Aug 3, 2010 at 3:21 PM, Wolfgang Denk wd@denx.de wrote:
Dear Steve Sakoman,
In message AANLkTimyVY=-eippjPncN144Qte6Oq1h5HzLkVS_rPz+@mail.gmail.com you wrote:
I just sent a revised version of the patch with that change incorporated.
Thanks. I'll wait for Sandeep to rebase his tree and resend the pull rq, then.
OK. Sorry for the inconvenience.
I also have the updated series in the following branch if that will make it easier for Sandeep:
http://www.sakoman.com/cgi-bin/gitweb.cgi?p=u-boot.git;a=shortlog;h=refs/hea...
Steve
participants (3)
-
s-paulraj@ti.com
-
Steve Sakoman
-
Wolfgang Denk