From: Marek Vasut <marek.vasut@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v3 1/6] i2c: rcar_i2c: Setup SCL/SDA delay at rcar_i2c_set_speed
Date: Thu, 7 Mar 2019 09:29:21 +0100 [thread overview]
Message-ID: <b7c42e6d-7250-86e8-93a1-331fa57449da@gmail.com> (raw)
In-Reply-To: <21b41072-cca4-67dd-420f-28e73dc0f53a@denx.de>
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@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
prev parent reply other threads:[~2019-03-07 8:29 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-06 10:46 [U-Boot] [PATCH v3 1/6] i2c: rcar_i2c: Setup SCL/SDA delay at rcar_i2c_set_speed Ismael Luceno Cortes
2019-03-06 10:46 ` [U-Boot] [PATCH v3 2/6] i2c: rcar_i2c: Add comments about registers & values Ismael Luceno Cortes
2019-03-06 12:40 ` Marek Vasut
2019-03-07 4:54 ` Heiko Schocher
2019-03-06 10:46 ` [U-Boot] [PATCH v3 3/6] i2c: rcar_i2c: Fix sending of slave addresses Ismael Luceno Cortes
2019-03-06 12:40 ` Marek Vasut
2019-03-07 4:55 ` Heiko Schocher
2019-03-06 10:46 ` [U-Boot] [PATCH v3 4/6] i2c: rcar_i2c: Don't mask errors with EREMOTEIO at rcar_i2c_xfer Ismael Luceno Cortes
2019-03-06 12:40 ` Marek Vasut
2019-03-07 4:55 ` Heiko Schocher
2019-03-06 10:46 ` [U-Boot] [PATCH v3 5/6] i2c: rcar_i2c: Set the slave address from rcar_i2c_xfer Ismael Luceno Cortes
2019-03-06 12:41 ` Marek Vasut
2019-03-07 4:56 ` Heiko Schocher
2019-03-06 10:46 ` [U-Boot] [PATCH v3 6/6] i2c: rcar_i2c: Move FSDA check to rcar_i2c_recover Ismael Luceno Cortes
2019-03-06 12:41 ` Marek Vasut
2019-03-07 4:57 ` Heiko Schocher
2019-03-07 11:59 ` Heiko Schocher
2019-03-07 12:15 ` Ismael Luceno Cortes
2019-03-06 12:39 ` [U-Boot] [PATCH v3 1/6] i2c: rcar_i2c: Setup SCL/SDA delay at rcar_i2c_set_speed Marek Vasut
2019-03-07 4:53 ` Heiko Schocher
2019-03-07 5:14 ` Heiko Schocher
2019-03-07 8:04 ` Marek Vasut
2019-03-07 8:17 ` Heiko Schocher
2019-03-07 8:29 ` Marek Vasut [this message]
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=b7c42e6d-7250-86e8-93a1-331fa57449da@gmail.com \
--to=marek.vasut@gmail.com \
--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