* [U-Boot] [i2c] Pull request
@ 2014-01-18 7:28 Heiko Schocher
2014-01-20 9:24 ` Michal Simek
2014-01-20 9:45 ` [U-Boot] [i2c] v2 " Heiko Schocher
0 siblings, 2 replies; 6+ messages in thread
From: Heiko Schocher @ 2014-01-18 7:28 UTC (permalink / raw)
To: u-boot
Hello Tom,
please pull some small fixes from u-boot-i2c.git
Thanks!
The following changes since commit 7f673c99c2d8d1aa21996c5b914f06d784b080ca:
Merge branch 'master' of git://git.denx.de/u-boot-arm (2014-01-10 10:56:00 -0500)
are available in the git repository at:
git://git.denx.de/u-boot-i2c.git master
for you to fetch changes up to 8e0b3c020057b3f7345b6696029a80eaf162e7f3:
i2c: zynq: Add support for the second i2c controller (2014-01-13 09:06:08 +0100)
----------------------------------------------------------------
Alexey Brodkin (2):
env_eeprom - fix bus recovery for "eeprom_bus_read"
drivers/designware_i2c - add suppor of CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW
Darwin Rambo (1):
i2c: Fix i2c speed command
Hisashi Nakamura (1):
rcar_i2c: Fix receiving wait condition
Kuo-Jung Su (1):
i2c: fti2c010: fix compiler warning on paddr[]
Michael Burr (2):
i2c: zynq: Support for 0-length register address
i2c: zynq: Add support for the second i2c controller
Nobuhiro Iwamatsu (1):
rcar_i2c: Clear status before start master receive
common/env_eeprom.c | 5 ++---
drivers/i2c/designware_i2c.c | 38 ++++++++++++++++++++++++++++++++++++++
drivers/i2c/fti2c010.c | 4 ++--
drivers/i2c/i2c_core.c | 2 +-
drivers/i2c/rcar_i2c.c | 6 ++++--
drivers/i2c/zynq_i2c.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------
include/configs/zynq-common.h | 5 ++---
include/configs/zynq_zc70x.h | 2 +-
8 files changed, 103 insertions(+), 38 deletions(-)
bye,
Heiko
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 6+ messages in thread* [U-Boot] [i2c] Pull request
2014-01-18 7:28 [U-Boot] [i2c] Pull request Heiko Schocher
@ 2014-01-20 9:24 ` Michal Simek
2014-01-20 9:34 ` Alexey Brodkin
2014-01-20 9:45 ` [U-Boot] [i2c] v2 " Heiko Schocher
1 sibling, 1 reply; 6+ messages in thread
From: Michal Simek @ 2014-01-20 9:24 UTC (permalink / raw)
To: u-boot
Hi Tom,
look below.
On 01/18/2014 08:28 AM, Heiko Schocher wrote:
> Hello Tom,
>
> please pull some small fixes from u-boot-i2c.git
>
> Thanks!
>
> The following changes since commit 7f673c99c2d8d1aa21996c5b914f06d784b080ca:
>
> Merge branch 'master' of git://git.denx.de/u-boot-arm (2014-01-10 10:56:00 -0500)
>
> are available in the git repository at:
>
>
> git://git.denx.de/u-boot-i2c.git master
>
> for you to fetch changes up to 8e0b3c020057b3f7345b6696029a80eaf162e7f3:
>
> i2c: zynq: Add support for the second i2c controller (2014-01-13 09:06:08 +0100)
>
> ----------------------------------------------------------------
> Alexey Brodkin (2):
> env_eeprom - fix bus recovery for "eeprom_bus_read"
> drivers/designware_i2c - add suppor of CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW
>
> Darwin Rambo (1):
> i2c: Fix i2c speed command
>
> Hisashi Nakamura (1):
> rcar_i2c: Fix receiving wait condition
>
> Kuo-Jung Su (1):
> i2c: fti2c010: fix compiler warning on paddr[]
>
> Michael Burr (2):
> i2c: zynq: Support for 0-length register address
I have found that I cherry-picked this patch incorrectly from origin one
and it is breaking current functionality.
I have already sent email to Heiko that this is patch is wrong.
I don't know if Heiko wants to send new pull request or you can
just remove that 2 patches on the top of Heiko's tree.
Sorry for inconvenience.
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/20140120/1b6a3939/attachment.pgp>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [i2c] Pull request
2014-01-20 9:24 ` Michal Simek
@ 2014-01-20 9:34 ` Alexey Brodkin
2014-01-20 9:41 ` Michal Simek
0 siblings, 1 reply; 6+ messages in thread
From: Alexey Brodkin @ 2014-01-20 9:34 UTC (permalink / raw)
To: u-boot
On Mon, 2014-01-20 at 10:24 +0100, Michal Simek wrote:
> Hi Tom,
>
> look below.
>
> On 01/18/2014 08:28 AM, Heiko Schocher wrote:
> > Hello Tom,
> >
> > please pull some small fixes from u-boot-i2c.git
> >
> > Thanks!
> >
> > The following changes since commit 7f673c99c2d8d1aa21996c5b914f06d784b080ca:
> >
> > Merge branch 'master' of git://git.denx.de/u-boot-arm (2014-01-10 10:56:00 -0500)
> >
> > are available in the git repository at:
> >
> >
> > git://git.denx.de/u-boot-i2c.git master
> >
> > for you to fetch changes up to 8e0b3c020057b3f7345b6696029a80eaf162e7f3:
> >
> > i2c: zynq: Add support for the second i2c controller (2014-01-13 09:06:08 +0100)
> >
> > ----------------------------------------------------------------
> > Alexey Brodkin (2):
> > env_eeprom - fix bus recovery for "eeprom_bus_read"
> > drivers/designware_i2c - add suppor of CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW
> >
> > Darwin Rambo (1):
> > i2c: Fix i2c speed command
> >
> > Hisashi Nakamura (1):
> > rcar_i2c: Fix receiving wait condition
> >
> > Kuo-Jung Su (1):
> > i2c: fti2c010: fix compiler warning on paddr[]
> >
> > Michael Burr (2):
> > i2c: zynq: Support for 0-length register address
>
> I have found that I cherry-picked this patch incorrectly from origin one
> and it is breaking current functionality.
> I have already sent email to Heiko that this is patch is wrong.
>
> I don't know if Heiko wants to send new pull request or you can
> just remove that 2 patches on the top of Heiko's tree.
Hi Michal,
could you please clarify which particular patches from mentioned
pull-request break current functionality?
-Alexey
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [i2c] Pull request
2014-01-20 9:34 ` Alexey Brodkin
@ 2014-01-20 9:41 ` Michal Simek
0 siblings, 0 replies; 6+ messages in thread
From: Michal Simek @ 2014-01-20 9:41 UTC (permalink / raw)
To: u-boot
On 01/20/2014 10:34 AM, Alexey Brodkin wrote:
> On Mon, 2014-01-20 at 10:24 +0100, Michal Simek wrote:
>> Hi Tom,
>>
>> look below.
>>
>> On 01/18/2014 08:28 AM, Heiko Schocher wrote:
>>> Hello Tom,
>>>
>>> please pull some small fixes from u-boot-i2c.git
>>>
>>> Thanks!
>>>
>>> The following changes since commit 7f673c99c2d8d1aa21996c5b914f06d784b080ca:
>>>
>>> Merge branch 'master' of git://git.denx.de/u-boot-arm (2014-01-10 10:56:00 -0500)
>>>
>>> are available in the git repository at:
>>>
>>>
>>> git://git.denx.de/u-boot-i2c.git master
>>>
>>> for you to fetch changes up to 8e0b3c020057b3f7345b6696029a80eaf162e7f3:
>>>
>>> i2c: zynq: Add support for the second i2c controller (2014-01-13 09:06:08 +0100)
>>>
>>> ----------------------------------------------------------------
>>> Alexey Brodkin (2):
>>> env_eeprom - fix bus recovery for "eeprom_bus_read"
>>> drivers/designware_i2c - add suppor of CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW
>>>
>>> Darwin Rambo (1):
>>> i2c: Fix i2c speed command
>>>
>>> Hisashi Nakamura (1):
>>> rcar_i2c: Fix receiving wait condition
>>>
>>> Kuo-Jung Su (1):
>>> i2c: fti2c010: fix compiler warning on paddr[]
>>>
>>> Michael Burr (2):
>>> i2c: zynq: Support for 0-length register address
>>
>> I have found that I cherry-picked this patch incorrectly from origin one
>> and it is breaking current functionality.
>> I have already sent email to Heiko that this is patch is wrong.
>>
>> I don't know if Heiko wants to send new pull request or you can
>> just remove that 2 patches on the top of Heiko's tree.
>
> Hi Michal,
>
> could you please clarify which particular patches from mentioned
> pull-request break current functionality?
This one: "i2c: zynq: Support for 0-length register address"
It is not your fault just mine. I wrongly resolved conflicts
which there was and I don't know why testing passed in that time.
(I probably tested any incorrect version).
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/20140120/5b90c6ae/attachment.pgp>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [i2c] v2 Pull request
2014-01-18 7:28 [U-Boot] [i2c] Pull request Heiko Schocher
2014-01-20 9:24 ` Michal Simek
@ 2014-01-20 9:45 ` Heiko Schocher
2014-01-20 22:58 ` Tom Rini
1 sibling, 1 reply; 6+ messages in thread
From: Heiko Schocher @ 2014-01-20 9:45 UTC (permalink / raw)
To: u-boot
Hello Tom
Updated pull request for u-boot-i2c, as the zynq patches had problems,
see:
http://lists.denx.de/pipermail/u-boot/2014-January/171352.html
So, here the correct pull-request:
The following changes since commit 7f673c99c2d8d1aa21996c5b914f06d784b080ca:
Merge branch 'master' of git://git.denx.de/u-boot-arm (2014-01-10 10:56:00 -0500)
are available in the git repository at:
git://git.denx.de/u-boot-i2c.git master
for you to fetch changes up to dccacbe01968f9e682cb1dc9b7d43c831897cbec:
i2c: fti2c010: fix compiler warning on paddr[] (2014-01-13 08:18:38 +0100)
----------------------------------------------------------------
Alexey Brodkin (2):
env_eeprom - fix bus recovery for "eeprom_bus_read"
drivers/designware_i2c - add suppor of CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW
Darwin Rambo (1):
i2c: Fix i2c speed command
Hisashi Nakamura (1):
rcar_i2c: Fix receiving wait condition
Kuo-Jung Su (1):
i2c: fti2c010: fix compiler warning on paddr[]
Nobuhiro Iwamatsu (1):
rcar_i2c: Clear status before start master receive
common/env_eeprom.c | 5 ++---
drivers/i2c/designware_i2c.c | 38 ++++++++++++++++++++++++++++++++++++++
drivers/i2c/fti2c010.c | 4 ++--
drivers/i2c/i2c_core.c | 2 +-
drivers/i2c/rcar_i2c.c | 6 ++++--
5 files changed, 47 insertions(+), 8 deletions(-)
Thanks!
bye,
Heiko
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 6+ messages in thread* [U-Boot] [i2c] v2 Pull request
2014-01-20 9:45 ` [U-Boot] [i2c] v2 " Heiko Schocher
@ 2014-01-20 22:58 ` Tom Rini
0 siblings, 0 replies; 6+ messages in thread
From: Tom Rini @ 2014-01-20 22:58 UTC (permalink / raw)
To: u-boot
On Mon, Jan 20, 2014 at 10:45:58AM +0100, Heiko Schocher wrote:
> Hello Tom
>
> Updated pull request for u-boot-i2c, as the zynq patches had problems,
> see:
>
> http://lists.denx.de/pipermail/u-boot/2014-January/171352.html
>
> So, here the correct pull-request:
>
> The following changes since commit 7f673c99c2d8d1aa21996c5b914f06d784b080ca:
>
> Merge branch 'master' of git://git.denx.de/u-boot-arm (2014-01-10 10:56:00 -0500)
>
> are available in the git repository at:
>
>
> git://git.denx.de/u-boot-i2c.git master
>
> for you to fetch changes up to dccacbe01968f9e682cb1dc9b7d43c831897cbec:
>
> i2c: fti2c010: fix compiler warning on paddr[] (2014-01-13 08:18:38 +0100)
>
> ----------------------------------------------------------------
> Alexey Brodkin (2):
> env_eeprom - fix bus recovery for "eeprom_bus_read"
> drivers/designware_i2c - add suppor of CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW
>
> Darwin Rambo (1):
> i2c: Fix i2c speed command
>
> Hisashi Nakamura (1):
> rcar_i2c: Fix receiving wait condition
>
> Kuo-Jung Su (1):
> i2c: fti2c010: fix compiler warning on paddr[]
>
> Nobuhiro Iwamatsu (1):
> rcar_i2c: Clear status before start master receive
>
> common/env_eeprom.c | 5 ++---
> drivers/i2c/designware_i2c.c | 38 ++++++++++++++++++++++++++++++++++++++
> drivers/i2c/fti2c010.c | 4 ++--
> drivers/i2c/i2c_core.c | 2 +-
> drivers/i2c/rcar_i2c.c | 6 ++++--
> 5 files changed, 47 insertions(+), 8 deletions(-)
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140120/788f86c6/attachment.pgp>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-01-20 22:58 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-18 7:28 [U-Boot] [i2c] Pull request Heiko Schocher
2014-01-20 9:24 ` Michal Simek
2014-01-20 9:34 ` Alexey Brodkin
2014-01-20 9:41 ` Michal Simek
2014-01-20 9:45 ` [U-Boot] [i2c] v2 " Heiko Schocher
2014-01-20 22:58 ` Tom Rini
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).