2023.07 RC4
This commit is contained in:
parent
0d5f023cd6
commit
9f5ba74ae0
|
@ -1,54 +1,3 @@
|
|||
From 671b2e758900f4a733d6840b2f39bc24dd63cfdb Mon Sep 17 00:00:00 2001
|
||||
From: Ondrej Jirman <megi@xff.cz>
|
||||
Date: Thu, 25 May 2023 14:18:17 +0200
|
||||
Subject: [PATCH] i2c: rockchip: De-initialize the bus after start bit failure
|
||||
|
||||
Failure can happen when i2c is used without initializing pinctrl properly,
|
||||
which U-Boot happily allows in SPL. Without this fix, further I2C access would
|
||||
fail, even after proper pinctrl initialization.
|
||||
|
||||
Signed-off-by: Ondrej Jirman <megi@xff.cz>
|
||||
Cc: Heiko Schocher <hs@denx.de>
|
||||
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
|
||||
Reviewed-by: Heiko Schocher <hs@denx.de>
|
||||
---
|
||||
drivers/i2c/rk_i2c.c | 7 ++++---
|
||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/i2c/rk_i2c.c b/drivers/i2c/rk_i2c.c
|
||||
index f8fac45b6ca..9927af94a80 100644
|
||||
--- a/drivers/i2c/rk_i2c.c
|
||||
+++ b/drivers/i2c/rk_i2c.c
|
||||
@@ -342,7 +342,7 @@ static int rockchip_i2c_xfer(struct udevice *bus, struct i2c_msg *msg,
|
||||
int nmsgs)
|
||||
{
|
||||
struct rk_i2c *i2c = dev_get_priv(bus);
|
||||
- int ret;
|
||||
+ int ret = 0;
|
||||
|
||||
debug("i2c_xfer: %d messages\n", nmsgs);
|
||||
for (; nmsgs > 0; nmsgs--, msg++) {
|
||||
@@ -356,14 +356,15 @@ static int rockchip_i2c_xfer(struct udevice *bus, struct i2c_msg *msg,
|
||||
}
|
||||
if (ret) {
|
||||
debug("i2c_write: error sending\n");
|
||||
- return -EREMOTEIO;
|
||||
+ ret = -EREMOTEIO;
|
||||
+ break;
|
||||
}
|
||||
}
|
||||
|
||||
rk_i2c_send_stop_bit(i2c);
|
||||
rk_i2c_disable(i2c);
|
||||
|
||||
- return 0;
|
||||
+ return ret;
|
||||
}
|
||||
|
||||
int rockchip_i2c_set_bus_speed(struct udevice *bus, unsigned int speed)
|
||||
--
|
||||
2.41.0
|
||||
|
||||
From 1af5e42f170d2c4b944beeb875b80ec7f061038a Mon Sep 17 00:00:00 2001
|
||||
From: Ondrej Jirman <megi@xff.cz>
|
||||
Date: Thu, 25 May 2023 15:27:08 +0200
|
||||
|
|
2
sources
2
sources
|
@ -1 +1 @@
|
|||
SHA512 (u-boot-2023.07-rc3.tar.bz2) = 2fc12ec0be56603931122063926e5edcb5464cc033f9bb79b07fdfa80a3045ccb5dd17703515f794406e109a5f2ad32e1a22909567d1d7ad2251bae2f70ed4a2
|
||||
SHA512 (u-boot-2023.07-rc4.tar.bz2) = 523e0e63960921f3fa5a6cbb4d73b5326e4a95c81e7dc74dcca5e460d2a37209fbd2622db636358f6d7e4b0fdd715d4587f021a0d722b95808b65db2998b6fcf
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
%global candidate rc3
|
||||
%global candidate rc4
|
||||
%if 0%{?rhel}
|
||||
%bcond_with toolsonly
|
||||
%else
|
||||
|
@ -7,7 +7,7 @@
|
|||
|
||||
Name: uboot-tools
|
||||
Version: 2023.07
|
||||
Release: 0.2%{?candidate:.%{candidate}}%{?dist}
|
||||
Release: 0.3%{?candidate:.%{candidate}}%{?dist}
|
||||
Summary: U-Boot utilities
|
||||
License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
|
||||
URL: http://www.denx.de/wiki/U-Boot
|
||||
|
@ -212,6 +212,9 @@ cp -p board/sunxi/README.nand builds/docs/README.sunxi-nand
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Jun 12 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 2023.07-0.3.rc4
|
||||
- Update to 2023.07 RC4
|
||||
|
||||
* Sun Jun 11 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 2023.07-0.2.rc3
|
||||
- Update to 2023.07 RC3
|
||||
- Fixes for the Pinephone Pro, RockPro64
|
||||
|
|
Loading…
Reference in New Issue