From: Michal Simek <monstr@monstr.eu>
To: u-boot@lists.denx.de
Subject: [U-Boot] [U-Boot, v1, 2/2] i2c: zynq: Add support for the second i2c controller
Date: Mon, 13 Jan 2014 08:53:55 +0100 [thread overview]
Message-ID: <52D39B93.8020604@monstr.eu> (raw)
In-Reply-To: <52D396A4.301@denx.de>
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.burr@logicpd.com>
>>
>> Initialize the second i2c controller.
>>
>> Signed-off-by: Michael Burr<michael.burr@logicpd.com>
>> Signed-off-by: Michal Simek<michal.simek@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 <trini@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.
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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 263 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140113/acb94896/attachment.pgp>
next prev parent reply other threads:[~2014-01-13 7:53 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-03 9:45 [U-Boot] [PATCH v1 1/2] i2c: zynq: Support for 0-length register address Michal Simek
2014-01-03 9:45 ` [U-Boot] [PATCH v1 2/2] i2c: zynq: Add support for the second i2c controller Michal Simek
2014-01-13 7:32 ` [U-Boot] [U-Boot, v1, " Heiko Schocher
2014-01-13 7:53 ` Michal Simek [this message]
2014-01-13 8:10 ` Heiko Schocher
2014-01-13 8:23 ` Michal Simek
2014-01-17 6:43 ` Heiko Schocher
2014-01-20 9:22 ` Michal Simek
2014-01-20 9:41 ` Heiko Schocher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=52D39B93.8020604@monstr.eu \
--to=monstr@monstr.eu \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).