Re: [U-Boot] [PATCH v3 1/6] i2c: rcar_i2c: Setup SCL/SDA delay at rcar_i2c_set_speed
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 --- 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) >>> * e102f74d65 - Merge branch 'master' of git://git.denx.de/u-boot-sh (2 >>> days ago) >>> |\ >>> | * 65eef78cdb - pinctrl: renesas: r8a77990: Reivse USB ID pin name (3 >>> days ago) >>> >>> >>> 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 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v3 1/6] i2c: rcar_i2c: Setup SCL/SDA delay at rcar_i2c_set_speed
Hello Marek, 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 --- 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) * e102f74d65 - Merge branch 'master' of git://git.denx.de/u-boot-sh (2 days ago) |\ | * 65eef78cdb - pinctrl: renesas: r8a77990: Reivse USB ID pin name (3 days ago) 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? bye, Heiko -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: h...@denx.de ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v3 1/6] i2c: rcar_i2c: Setup SCL/SDA delay at rcar_i2c_set_speed
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 >> --- >> 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) > * e102f74d65 - Merge branch 'master' of git://git.denx.de/u-boot-sh (2 > days ago) > |\ > | * 65eef78cdb - pinctrl: renesas: r8a77990: Reivse USB ID pin name (3 > days ago) > > > How does this work for you ? This series applies in top of [PATCH] i2c: rcar_i2c: Add Gen3 SoC support [...] -- Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v3 1/6] i2c: rcar_i2c: Setup SCL/SDA delay at rcar_i2c_set_speed
Hello Ismael,
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
---
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)
* e102f74d65 - Merge branch 'master' of git://git.denx.de/u-boot-sh (2 days ago)
|\
| * 65eef78cdb - pinctrl: renesas: r8a77990: Reivse USB ID pin name (3 days ago)
How does this work for you ?
> diff --git a/drivers/i2c/rcar_i2c.c b/drivers/i2c/rcar_i2c.c
> index 10b0f8bad4..a57f72a228 100644
> --- a/drivers/i2c/rcar_i2c.c
> +++ b/drivers/i2c/rcar_i2c.c
> @@ -116,9 +116,7 @@ static int rcar_i2c_set_addr(struct udevice *dev, u8
chip, u8 read)
>writel(0, priv->base + RCAR_I2C_ICMSR);
>writel(priv->icccr, priv->base + RCAR_I2C_ICCCR);
>
> - if (priv->type == RCAR_I2C_TYPE_GEN3)
> - writel(RCAR_I2C_ICFBSCR_TCYC17, priv->base + RCAR_I2C_ICFBSCR);
> -
> + /* Wait for the bus */
>ret = wait_for_bit_le32(priv->base + RCAR_I2C_ICMCR,
>RCAR_I2C_ICMCR_FSDA, false, 2, true);
>if (ret) {
I do not find RCAR_I2C_TYPE_GEN3 in current mainline code ... please
check!
bye,
Heiko
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: h...@denx.de
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v3 1/6] i2c: rcar_i2c: Setup SCL/SDA delay at rcar_i2c_set_speed
Hello Ismael, 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 --- drivers/i2c/rcar_i2c.c | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) Reviewed-by: Heiko Schocher bye, Heiko -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: h...@denx.de ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v3 1/6] i2c: rcar_i2c: Setup SCL/SDA delay at rcar_i2c_set_speed
On 3/6/19 11:46 AM, Ismael Luceno Cortes wrote:
> 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
Reviewed-by: Marek Vasut
> ---
> drivers/i2c/rcar_i2c.c | 9 ++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/i2c/rcar_i2c.c b/drivers/i2c/rcar_i2c.c
> index 10b0f8bad4..a57f72a228 100644
> --- a/drivers/i2c/rcar_i2c.c
> +++ b/drivers/i2c/rcar_i2c.c
> @@ -116,9 +116,7 @@ static int rcar_i2c_set_addr(struct udevice *dev, u8
> chip, u8 read)
> writel(0, priv->base + RCAR_I2C_ICMSR);
> writel(priv->icccr, priv->base + RCAR_I2C_ICCCR);
>
> - if (priv->type == RCAR_I2C_TYPE_GEN3)
> - writel(RCAR_I2C_ICFBSCR_TCYC17, priv->base + RCAR_I2C_ICFBSCR);
> -
> + /* Wait for the bus */
> ret = wait_for_bit_le32(priv->base + RCAR_I2C_ICMCR,
> RCAR_I2C_ICMCR_FSDA, false, 2, true);
> if (ret) {
> @@ -304,6 +302,11 @@ scgd_find:
> priv->icccr = (scgd << RCAR_I2C_ICCCR_SCGD_OFF) | cdf;
> writel(priv->icccr, priv->base + RCAR_I2C_ICCCR);
>
> + if (priv->type == RCAR_I2C_TYPE_GEN3) {
> + /* Set SCL/SDA delay */
> + writel(RCAR_I2C_ICFBSCR_TCYC17, priv->base + RCAR_I2C_ICFBSCR);
> + }
> +
> return 0;
> }
>
>
> base-commit: f08023c07d826fbc8e62fdd3367961b2f0b06844
> prerequisite-patch-id: 9e5b0458bc15640eb483ccad91dbe85150f9f7be
>
--
Best regards,
Marek Vasut
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v3 1/6] i2c: rcar_i2c: Setup SCL/SDA delay at rcar_i2c_set_speed
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
---
drivers/i2c/rcar_i2c.c | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/i2c/rcar_i2c.c b/drivers/i2c/rcar_i2c.c
index 10b0f8bad4..a57f72a228 100644
--- a/drivers/i2c/rcar_i2c.c
+++ b/drivers/i2c/rcar_i2c.c
@@ -116,9 +116,7 @@ static int rcar_i2c_set_addr(struct udevice *dev, u8 chip,
u8 read)
writel(0, priv->base + RCAR_I2C_ICMSR);
writel(priv->icccr, priv->base + RCAR_I2C_ICCCR);
- if (priv->type == RCAR_I2C_TYPE_GEN3)
- writel(RCAR_I2C_ICFBSCR_TCYC17, priv->base + RCAR_I2C_ICFBSCR);
-
+ /* Wait for the bus */
ret = wait_for_bit_le32(priv->base + RCAR_I2C_ICMCR,
RCAR_I2C_ICMCR_FSDA, false, 2, true);
if (ret) {
@@ -304,6 +302,11 @@ scgd_find:
priv->icccr = (scgd << RCAR_I2C_ICCCR_SCGD_OFF) | cdf;
writel(priv->icccr, priv->base + RCAR_I2C_ICCCR);
+ if (priv->type == RCAR_I2C_TYPE_GEN3) {
+ /* Set SCL/SDA delay */
+ writel(RCAR_I2C_ICFBSCR_TCYC17, priv->base + RCAR_I2C_ICFBSCR);
+ }
+
return 0;
}
base-commit: f08023c07d826fbc8e62fdd3367961b2f0b06844
prerequisite-patch-id: 9e5b0458bc15640eb483ccad91dbe85150f9f7be
--
2.19.1
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
