Message ID | 52DA2D1D.5070504@denx.de |
---|---|
State | Superseded |
Headers | show |
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
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
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