[U-Boot] [PATCH 4/6 v2] i2c: designware_i2c: Prepare for DM driver conversion

[Stefan Roese]

Hi Heiko,

On 28.03.2016 09:33, Heiko Schocher wrote:
> Am 23.03.2016 um 06:46 schrieb Stefan Roese:
>> This patch prepares the designware I2C driver for the DM conversion.
>> This is mainly done by removing struct i2c_adapter from the functions
>> that shall be used by the DM driver version as well.
>>
>> Signed-off-by: Stefan Roese <sr at denx.de>
>> Cc: Simon Glass <sjg at chromium.org>
>> Reviewed-by: Bin Meng <bmeng.cn at gmail.com>
>> Cc: Marek Vasut <marex at denx.de>
>> Cc: Heiko Schocher <hs at denx.de>
>> ---
>> v2:
>> - Added Reviewed-by from Bin
>>
>>   drivers/i2c/designware_i2c.c | 173
>> ++++++++++++++++++++++---------------------
>>   1 file changed, 90 insertions(+), 83 deletions(-)
>
> I tried to apply this patch, but get the following error:
>
> Wende an: i2c: designware_i2c: Prepare for DM driver conversion
> fatal: sha1 information is lacking or useless
> (drivers/i2c/designware_i2c.c).
> Dem Repository fehlen notwendige Blobs um auf einen 3-Wege-Merge
> zurückzufallen.
> Kann nicht zu 3-Wege-Merge zurückfallen.
> Anwendung des Patches fehlgeschlagen bei 0001 i2c: designware_i2c:
> Prepare for DM driver conversion
>
> I tried the this patch on current mainline, with the following
> patches applied:
>
> http://patchwork.ozlabs.org/patch/601112/
> http://patchwork.ozlabs.org/patch/601128/
> http://patchwork.ozlabs.org/patch/601117/
>
> Could you take a look?

This should be fixed with v3 of this patch:

https://patchwork.ozlabs.org/patch/609406/

Could you give it another try please?

Thanks,
Stefan