On 01/13/2014 09:10 AM, Heiko Schocher wrote: > Hello Michael, > > Am 13.01.2014 08:53, schrieb Michal Simek: >> On 01/13/2014 08:32 AM, Heiko Schocher wrote: >>> Hello Michel, >>> >>> Am 03.01.2014 10:45, schrieb Michal Simek: >>>> From: Michael Burr<michael.b...@logicpd.com> >>>> >>>> Initialize the second i2c controller. >>>> >>>> Signed-off-by: Michael Burr<michael.b...@logicpd.com> >>>> Signed-off-by: Michal Simek<michal.si...@xilinx.com> >>>> >>>> --- >>>> Changes in v1: >>>> - Based on original thread from Michael Burr >>>> http://lists.denx.de/pipermail/u-boot/2013-October/165017.html >>>> Heiko did some changes in this mainline patch >>>> "i2c, zynq: convert zynq i2c driver to new multibus/multiadapter >>>> framework" >>>> (sha1: 0bdffe71fddeaa46768a39305797e4512dee0f15) >>>> - MS rebase on latest&greatest >>>> >>>> drivers/i2c/zynq_i2c.c | 46 >>>> ++++++++++++++++++++++++++++------------------ >>>> include/configs/zynq.h | 7 +++---- >>>> 2 files changed, 31 insertions(+), 22 deletions(-) >>> >>> I could not apply your patch on top of current tree >>> >>> commit 7f673c99c2d8d1aa21996c5b914f06d784b080ca >>> Merge: 8401bfa 10a147b >>> Author: Tom Rini<tr...@ti.com> >>> Date: Fri Jan 10 10:56:00 2014 -0500 >>> >>> Merge branch 'master' of git://git.denx.de/u-boot-arm >>> >>> Problem is the change in "include/configs/zynq.h", as this file does >>> not longer exist in mainline ... I think, your change should be done >>> in "include/configs/zynq-common.h", right? >>> >>> Is it OK, if I fix this, or would you send a v2 (prefered, as I could >>> not test this)? >> >> yes, zynq.h was renamed to zynq-common.h. >> That will be great if you can fix it yourself. > > Done, see: > http://git.denx.de/?p=u-boot/u-boot-i2c.git;a=commit;h=8e0b3c020057b3f7345b6696029a80eaf162e7f3 > > Please test and give me feedback. If my fix is not perfect, please > post a v2, thanks!
Looks good to me. We will test it and I will let you know if we see any problem. Thanks, Michal -- Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
signature.asc
Description: OpenPGP digital signature
_______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
