From: Heiko Schocher <hs@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 4/6 v2] i2c: designware_i2c: Prepare for DM driver conversion
Date: Wed, 13 Apr 2016 07:49:08 +0200 [thread overview]
Message-ID: <570DDDD4.3050301@denx.de> (raw)
In-Reply-To: <570CF6AC.5040107@denx.de>
Hello Stefan,
Am 12.04.2016 um 15:22 schrieb 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@denx.de>
>>> Cc: Simon Glass <sjg@chromium.org>
>>> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
>>> Cc: Marek Vasut <marex@denx.de>
>>> Cc: Heiko Schocher <hs@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?
Yes, this patch applies now fine, but the patch:
[U-Boot,5/6,v2] i2c: designware_i2c: Add DM support
http://patchwork.ozlabs.org/patch/601116/
fails now:
--2016-04-13 07:30:54-- http://patchwork.ozlabs.org/patch/601116/mbox
Aufl?sen des Hostnamens ?patchwork.ozlabs.org (patchwork.ozlabs.org)? ? 103.22.144.67, 2401:3900:2:1::2
Verbindungsaufbau zu patchwork.ozlabs.org (patchwork.ozlabs.org)|103.22.144.67|:80 ? verbunden.
HTTP-Anforderung gesendet, auf Antwort wird gewartet ? 301 MOVED PERMANENTLY
Platz: http://patchwork.ozlabs.org/patch/601116/mbox/ [folgend]
--2016-04-13 07:30:54-- http://patchwork.ozlabs.org/patch/601116/mbox/
Wiederverwendung der bestehenden Verbindung zu patchwork.ozlabs.org:80.
HTTP-Anforderung gesendet, auf Antwort wird gewartet ? 200 OK
L?nge: nicht spezifiziert [text/plain]
Wird in ??mbox?? gespeichert.
mbox [ <=>
] 6,06K --.-KB/s in 0,004s
2016-04-13 07:30:54 (1,39 MB/s) - ?mbox? gespeichert [6202]
total: 0 errors, 0 warnings, 0 checks, 181 lines checked
NOTE: Ignored message types: COMPLEX_MACRO CONSIDER_KSTRTO MINMAX MULTISTATEMENT_MACRO_USE_DO_WHILE
NETWORKING_BLOCK_COMMENT_STYLE PREFER_ETHER_ADDR_COPY USLEEP_RANGE
mbox has no obvious style problems and is ready for submission.
Wende an: i2c: designware_i2c: Add DM support
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: Add DM support
Die Kopie des fehlgeschlagenen Patches befindet sich in:
/home/hs/i2c/u-boot/.git/rebase-apply/patch
Wenn Sie das Problem gel?st haben, f?hren Sie "git am --continue" aus.
Falls Sie diesen Patch auslassen m?chten, f?hren Sie stattdessen
"git am --skip" aus.
Um den urspr?nglichen Branch wiederherzustellen und die Anwendung der
Patches abzubrechen, f?hren Sie "git am --abort" aus.
pollux:u-boot hs [master] $
Base is current mainline (with 2 i2c patches from Michal, but they
should not interfere with your patches ...):
pollux:u-boot hs [master] $ git log --oneline
2ddd09a i2c: designware_i2c: Prepare for DM driver conversion
f824253 i2c: designware_i2c: Integrate set_speed() into dw_i2c_set_bus_speed()
709a9e6 i2c: designware_i2c: Add dw_i2c_enable() helper function
1b89299 i2c: designware_i2c: Add ic_enable_status to ic_regs struct
d4cc513 dm: i2c: Add driver for Cadence I2C IP
be332ef i2c: Describe Cadence I2C devicetree bindings
39fbd98 Merge git://www.denx.de/git/u-boot-marvell
patches from you in the above list:
- [U-Boot,1/6,v2] i2c: designware_i2c: Add ic_enable_status to ic_regs struct
http://patchwork.ozlabs.org/patch/601112/
- [U-Boot,2/6,v3] i2c: designware_i2c: Add dw_i2c_enable() helper function
http://patchwork.ozlabs.org/patch/601128/
- [U-Boot,3/6,v2] i2c: designware_i2c: Integrate set_speed() into dw_i2c_set_bus_speed()
http://patchwork.ozlabs.org/patch/601117/
- [U-Boot,v3] i2c: designware_i2c: Prepare for DM driver conversion
http://patchwork.ozlabs.org/patch/609406/
Did I missed an update patch?
bye,
Heiko
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
next prev parent reply other threads:[~2016-04-13 5:49 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-23 5:46 [U-Boot] [PATCH 1/6 v2] i2c: designware_i2c: Add ic_enable_status to ic_regs struct Stefan Roese
2016-03-23 5:46 ` [U-Boot] [PATCH 2/6 v2] i2c: designware_i2c: Add dw_i2c_enable() helper function Stefan Roese
2016-03-23 6:16 ` Marek Vasut
2016-03-23 5:46 ` [U-Boot] [PATCH 3/6 v2] i2c: designware_i2c: Integrate set_speed() into dw_i2c_set_bus_speed() Stefan Roese
2016-03-23 5:46 ` [U-Boot] [PATCH 4/6 v2] i2c: designware_i2c: Prepare for DM driver conversion Stefan Roese
2016-03-28 7:33 ` Heiko Schocher
2016-04-12 13:22 ` Stefan Roese
2016-04-13 5:49 ` Heiko Schocher [this message]
2016-04-13 5:56 ` Stefan Roese
2016-04-13 7:00 ` Heiko Schocher
2016-04-13 7:05 ` Stefan Roese
2016-04-13 7:39 ` Heiko Schocher
2016-04-13 8:05 ` Bin Meng
2016-04-13 8:10 ` Stefan Roese
2016-03-23 5:46 ` [U-Boot] [PATCH 5/6 v2] i2c: designware_i2c: Add DM support Stefan Roese
2016-03-23 5:46 ` [U-Boot] [PATCH 6/6 v2] i2c: designware_i2c: Add support for PCI(e) based I2C cores (x86) Stefan Roese
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=570DDDD4.3050301@denx.de \
--to=hs@denx.de \
--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