[U-Boot] [PATCH v3 1/6] i2c: rcar_i2c: Setup SCL/SDA delay at rcar_i2c_set_speed

[Marek Vasut]

On 3/7/19 9:17 AM, Heiko Schocher wrote:
> Hello Marek,

Hi,

> Am 07.03.2019 um 09:04 schrieb Marek Vasut:
>> On 3/7/19 6:14 AM, Heiko Schocher wrote:
>>> Hello Ismael,
>>
>> Hi,
>>
>>> Am 06.03.2019 um 11:46 schrieb Ismael Luceno Cortes:
>>>> Setting up the delay only needs to be done once; move it to
>>>> rcar_i2c_set_speed so it's done at initialization time.
>>>>
>>>> Signed-off-by: Ismael Luceno <ismael.luceno at silicon-gears.com>
>>>> ---
>>>>    drivers/i2c/rcar_i2c.c | 9 ++++++---
>>>>    1 file changed, 6 insertions(+), 3 deletions(-)
>>>
>>> Your patch does not apply to
>>>
>>> base-commit: f08023c07d826fbc8e62fdd3367961b2f0b06844
>>>
>>> I get based on f08023c07d826fbc8e62fdd3367961b2f0b06844
>>>
>>> Applying: i2c: rcar_i2c: Setup SCL/SDA delay at rcar_i2c_set_speed
>>> error: sha1 information is lacking or useless (drivers/i2c/rcar_i2c.c).
>>> error: could not build fake ancestor
>>> Patch failed at 0001 i2c: rcar_i2c: Setup SCL/SDA delay at
>>> rcar_i2c_set_speed
>>> Use 'git am --show-current-patch' to see the failed patch
>>> When you have resolved this problem, run "git am --continue".
>>> If you prefer to skip this patch, run "git am --skip" instead.
>>> To restore the original branch and stop patching, run "git am --abort".
>>>
>>> My base:
>>>
>>> pollux:u-boot hs [temp] $ glg
>>> * f08023c07d - (HEAD -> temp, tag: v2019.04-rc3, origin/master,
>>> origin/HEAD, master) Prepare v2019.04-rc4 (2 days ago) <Tom Rini>
>>> *   e102f74d65 - Merge branch 'master' of git://git.denx.de/u-boot-sh (2
>>> days ago) <Tom Rini>
>>> |\
>>> | * 65eef78cdb - pinctrl: renesas: r8a77990: Reivse USB ID pin name (3
>>> days ago) <Hiroyuki Yokoyama>
>>>
>>>
>>> How does this work for you ?
>>
>> This series applies in top of
>>
>> [PATCH] i2c: rcar_i2c: Add Gen3 SoC support
> 
> Ah! Thanks for the hint, I missed this...
> 
> Hmm... I thought the patchseries from Ismael as bugfix patch, so
> I thought to pick it up for 2019.04 ... but based on the this patch,
> is it okay to pick up this stuff, when merge window is open?

The Gen3 support is technically a bugfix too, since it's mostly fixing
build warnings on ARM64 . It should be fine to put it into this release.

-- 
Best regards,
Marek Vasut