From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiko Schocher Date: Mon, 20 Jan 2014 10:41:34 +0100 Subject: [U-Boot] [U-Boot, v1, 2/2] i2c: zynq: Add support for the second i2c controller In-Reply-To: <52DCEABA.8030608@monstr.eu> References: <19b3e0116e3478083811ae8fbfb9cedaf71274e9.1388742342.git.michal.simek@xilinx.com> <52D396A4.301@denx.de> <52D39B93.8020604@monstr.eu> <52D39F66.7080505@denx.de> <52D3A273.6090809@monstr.eu> <52D8D118.80004@denx.de> <52DCEABA.8030608@monstr.eu> Message-ID: <52DCEF4E.5000903@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hello Michal, Am 20.01.2014 10:22, schrieb Michal Simek: > On 01/17/2014 07:43 AM, Heiko Schocher wrote: >> Hello Michal, >> >> Am 13.01.2014 09:23, schrieb Michal Simek: >>> 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 >>>>>>> >>>>>>> Initialize the second i2c controller. >>>>>>> >>>>>>> Signed-off-by: Michael Burr >>>>>>> Signed-off-by: Michal Simek >>>>>>> >>>>>>> --- >>>>>>> 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 >>>>>> 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. >> >> Do you find some time for tests? I want to send a pull request for >> pending i2c patches (inclusive this patch). > > Sorry for delay. I have retest it and I see that I have totally messed up > the first patch. > "i2c: zynq: Support for 0-length register address" > > This is the origin patch. > http://lists.denx.de/pipermail/u-boot/2013-October/165019.html > > Interesting is that I really don't know what I have tested before. :-( > > Would it be possible to remove this patch. Feel free to remove both > I will resend them. I havd removed both patches from u-boot-i2c.git. Please repost them, thanks! bye, Heiko -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany