June 2023 - U-Boot

[RFC PATCH v1 0/3] Allwinner R329/D1/R528/T113s SPI support
by Maxim Kiselev 05 Jun '23

05 Jun '23

This series adds support for SPI controller which is used in newest Allwinner SOCs R329/D1/R528/T113s. It includes changes for both spl_spi_sunxi and uboot spi-sunxi drivers. The series is based on Andre's attempt to add support for T113s SoC. https://lore.kernel.org/u-boot/20221206004549.29015-1-andre.przywara@arm.co… Maxim Kiselev (3): sunxi: SPL SPI: Add SPI boot support for the Allwinner R528/T113 SoCs spi: sunxi: Add support for R329/D1/R528/T113 SPI controller riscv: dts: allwinner: d1: Add SPI controllers node arch/arm/mach-sunxi/Kconfig | 2 +- arch/arm/mach-sunxi/spl_spi_sunxi.c | 78 +++++++++++++++++++++-------- arch/riscv/dts/sunxi-d1s-t113.dtsi | 37 ++++++++++++++ drivers/spi/spi-sunxi.c | 34 ++++++++++++- 4 files changed, 128 insertions(+), 23 deletions(-) -- 2.39.2

3 7

[PATCH v4 0/7] Tegra: add ASUS/Google Nexus 7 (2012) support
by Svyatoslav Ryhel 05 Jun '23

05 Jun '23

This patchset adds support for native use of U-Boot on: - ASUS T30 Transformers (7 devices, all models); - ASUS/Google Nexus 7 (2012), both grouper and tilapia - LG Optimus 4X HD (P880) and Optimus Vu (P895) - HTC One X (endeavoru) as a replacement for the vendor bootloader. Current commits are designed to work on re-crypted devices but can be used on clean unmodified devices with slight restrictions (like no booting/mounting emmc and no self updating feature). All device setup commits fall under the same pattern. Alongside device bringup tegra requires few small patches: - add gpio keyboard as stdin device - make networking boot options optional - add a small tool to generate SoC UID Commits passed './tools/buildman/buildman tegra' (30 boards) without errors. --- Changes from v3: - extended amount of devices supported Changes from v2: - fuse build is excluded for T186 (it is not supported in it anyway) Changes from v1: - fix fuse headers for newer Tegra generations - allow grouper_common_defconfig to pass without fragments --- Jonas Schwöbel (1): configs: tegra-common-post: make PXE and DHCP boot targets optional Svyatoslav Ryhel (6): configs: tegra-common-post: add GPIO keyboard as STDIN device ARM: tegra: add SoC UID calculation function board: asus: transformer: add ASUS Transformer T30 family support board: asus: grouper: add Google Nexus 7 (2012) support board: lg: x3: add Optimus 4X HD and Optimus Vu support board: htc: endeavoru: add One X support arch/arm/dts/Makefile | 12 + arch/arm/dts/tegra30-asus-grouper-common.dtsi | 157 ++++++ .../dts/tegra30-asus-nexus7-grouper-E1565.dts | 43 ++ .../dts/tegra30-asus-nexus7-grouper-PM269.dts | 36 ++ .../dts/tegra30-asus-nexus7-tilapia-E1565.dts | 62 +++ arch/arm/dts/tegra30-asus-p1801-t.dts | 17 + arch/arm/dts/tegra30-asus-tf201.dts | 9 + arch/arm/dts/tegra30-asus-tf300t.dts | 18 + arch/arm/dts/tegra30-asus-tf300tg.dts | 9 + arch/arm/dts/tegra30-asus-tf300tl.dts | 9 + arch/arm/dts/tegra30-asus-tf600t.dts | 89 ++++ arch/arm/dts/tegra30-asus-tf700t.dts | 13 + arch/arm/dts/tegra30-asus-transformer.dtsi | 211 ++++++++ arch/arm/dts/tegra30-htc-endeavoru.dts | 166 +++++++ arch/arm/dts/tegra30-lg-p880.dts | 40 ++ arch/arm/dts/tegra30-lg-p895.dts | 50 ++ arch/arm/dts/tegra30-lg-x3.dtsi | 180 +++++++ arch/arm/include/asm/arch-tegra/fuse.h | 7 + arch/arm/mach-tegra/Makefile | 4 + arch/arm/mach-tegra/fuse.c | 151 ++++++ arch/arm/mach-tegra/tegra30/Kconfig | 20 + board/asus/grouper/Kconfig | 22 + board/asus/grouper/MAINTAINERS | 6 + board/asus/grouper/Makefile | 14 + board/asus/grouper/grouper-spl-max.c | 45 ++ board/asus/grouper/grouper-spl-ti.c | 41 ++ board/asus/grouper/grouper.c | 202 ++++++++ board/asus/grouper/pinmux-config-grouper.h | 362 ++++++++++++++ board/asus/transformer-t30/Kconfig | 35 ++ board/asus/transformer-t30/MAINTAINERS | 6 + board/asus/transformer-t30/Makefile | 11 + .../pinmux-config-transformer.h | 365 ++++++++++++++ .../transformer-t30/transformer-t30-spl.c | 41 ++ board/asus/transformer-t30/transformer-t30.c | 201 ++++++++ board/htc/endeavoru/Kconfig | 12 + board/htc/endeavoru/MAINTAINERS | 6 + board/htc/endeavoru/Makefile | 11 + board/htc/endeavoru/endeavoru-spl.c | 47 ++ board/htc/endeavoru/endeavoru.c | 116 +++++ board/htc/endeavoru/pinmux-config-endeavoru.h | 362 ++++++++++++++ board/lg/x3-t30/Kconfig | 26 + board/lg/x3-t30/MAINTAINERS | 6 + board/lg/x3-t30/Makefile | 11 + board/lg/x3-t30/pinmux-config-x3.h | 449 ++++++++++++++++++ board/lg/x3-t30/x3-t30-spl.c | 48 ++ board/lg/x3-t30/x3-t30.c | 176 +++++++ configs/endeavoru_defconfig | 82 ++++ configs/grouper_E1565.config | 2 + configs/grouper_PM269.config | 2 + configs/grouper_common_defconfig | 82 ++++ configs/p1801-t.config | 2 + configs/p880.config | 4 + configs/p895.config | 4 + configs/tf201.config | 2 + configs/tf300t.config | 2 + configs/tf300tg.config | 2 + configs/tf300tl.config | 2 + configs/tf600t.config | 5 + configs/tf700t.config | 2 + configs/tilapia.config | 3 + configs/transformer_t30_defconfig | 83 ++++ configs/x3_t30_defconfig | 86 ++++ doc/board/asus/grouper_common.rst | 95 ++++ doc/board/asus/index.rst | 10 + doc/board/asus/transformer_t30.rst | 96 ++++ doc/board/htc/endeavoru.rst | 90 ++++ doc/board/htc/index.rst | 9 + doc/board/lg/index.rst | 9 + doc/board/lg/x3_t30.rst | 93 ++++ include/configs/endeavoru.h | 72 +++ include/configs/grouper.h | 68 +++ include/configs/tegra-common-post.h | 28 +- include/configs/transformer-common.h | 94 ++++ include/configs/transformer-t30.h | 46 ++ include/configs/x3-t30.h | 85 ++++ 75 files changed, 5079 insertions(+), 5 deletions(-) create mode 100644 arch/arm/dts/tegra30-asus-grouper-common.dtsi create mode 100644 arch/arm/dts/tegra30-asus-nexus7-grouper-E1565.dts create mode 100644 arch/arm/dts/tegra30-asus-nexus7-grouper-PM269.dts create mode 100644 arch/arm/dts/tegra30-asus-nexus7-tilapia-E1565.dts create mode 100644 arch/arm/dts/tegra30-asus-p1801-t.dts create mode 100644 arch/arm/dts/tegra30-asus-tf201.dts create mode 100644 arch/arm/dts/tegra30-asus-tf300t.dts create mode 100644 arch/arm/dts/tegra30-asus-tf300tg.dts create mode 100644 arch/arm/dts/tegra30-asus-tf300tl.dts create mode 100644 arch/arm/dts/tegra30-asus-tf600t.dts create mode 100644 arch/arm/dts/tegra30-asus-tf700t.dts create mode 100644 arch/arm/dts/tegra30-asus-transformer.dtsi create mode 100644 arch/arm/dts/tegra30-htc-endeavoru.dts create mode 100644 arch/arm/dts/tegra30-lg-p880.dts create mode 100644 arch/arm/dts/tegra30-lg-p895.dts create mode 100644 arch/arm/dts/tegra30-lg-x3.dtsi create mode 100644 arch/arm/mach-tegra/fuse.c create mode 100644 board/asus/grouper/Kconfig create mode 100644 board/asus/grouper/MAINTAINERS create mode 100644 board/asus/grouper/Makefile create mode 100644 board/asus/grouper/grouper-spl-max.c create mode 100644 board/asus/grouper/grouper-spl-ti.c create mode 100644 board/asus/grouper/grouper.c create mode 100644 board/asus/grouper/pinmux-config-grouper.h create mode 100644 board/asus/transformer-t30/Kconfig create mode 100644 board/asus/transformer-t30/MAINTAINERS create mode 100644 board/asus/transformer-t30/Makefile create mode 100644 board/asus/transformer-t30/pinmux-config-transformer.h create mode 100644 board/asus/transformer-t30/transformer-t30-spl.c create mode 100644 board/asus/transformer-t30/transformer-t30.c create mode 100644 board/htc/endeavoru/Kconfig create mode 100644 board/htc/endeavoru/MAINTAINERS create mode 100644 board/htc/endeavoru/Makefile create mode 100644 board/htc/endeavoru/endeavoru-spl.c create mode 100644 board/htc/endeavoru/endeavoru.c create mode 100644 board/htc/endeavoru/pinmux-config-endeavoru.h create mode 100644 board/lg/x3-t30/Kconfig create mode 100644 board/lg/x3-t30/MAINTAINERS create mode 100644 board/lg/x3-t30/Makefile create mode 100644 board/lg/x3-t30/pinmux-config-x3.h create mode 100644 board/lg/x3-t30/x3-t30-spl.c create mode 100644 board/lg/x3-t30/x3-t30.c create mode 100644 configs/endeavoru_defconfig create mode 100644 configs/grouper_E1565.config create mode 100644 configs/grouper_PM269.config create mode 100644 configs/grouper_common_defconfig create mode 100644 configs/p1801-t.config create mode 100644 configs/p880.config create mode 100644 configs/p895.config create mode 100644 configs/tf201.config create mode 100644 configs/tf300t.config create mode 100644 configs/tf300tg.config create mode 100644 configs/tf300tl.config create mode 100644 configs/tf600t.config create mode 100644 configs/tf700t.config create mode 100644 configs/tilapia.config create mode 100644 configs/transformer_t30_defconfig create mode 100644 configs/x3_t30_defconfig create mode 100644 doc/board/asus/grouper_common.rst create mode 100644 doc/board/asus/index.rst create mode 100644 doc/board/asus/transformer_t30.rst create mode 100644 doc/board/htc/endeavoru.rst create mode 100644 doc/board/htc/index.rst create mode 100644 doc/board/lg/index.rst create mode 100644 doc/board/lg/x3_t30.rst create mode 100644 include/configs/endeavoru.h create mode 100644 include/configs/grouper.h create mode 100644 include/configs/transformer-common.h create mode 100644 include/configs/transformer-t30.h create mode 100644 include/configs/x3-t30.h -- 2.39.2

3 12

Pull request efi-2023-07-rc4
by Heinrich Schuchardt 05 Jun '23

05 Jun '23

Dear Tom, The following changes since commit cb4437e530ec1ff3deae85754010344afab8bcc5: Merge branch '2023-05-30-TI-fixes-Apple-M2-support' (2023-05-30 16:23:41 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-efi.git tags/efi-2023-07-rc4 for you to fetch changes up to 75ebeb4d94bd911ee7884b7beae06f3dec2838a8: efi_selftest: LocateHandleBuffer return code (2023-06-02 10:59:15 +0200) ---------------------------------------------------------------- Pull request efi-2023-07-rc4 Documentation: * man pages for loadb, loadx UEFI: * check return value of part_get_info() * improve unit test for RegisterProtocolNotify() Gitlab CI did not indicate any problems: https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/16470 ---------------------------------------------------------------- Bin Meng (1): doc: android: Fix a typo Heinrich Schuchardt (5): doc: loadb man-page doc: loadx man-page doc: fix loady man-page efi_loader: check return value of part_get_info() efi_selftest: LocateHandleBuffer return code doc/android/boot-image.rst | 2 +- doc/usage/cmd/loadb.rst | 70 ++++++++++++++++++++++ doc/usage/cmd/loadx.rst | 77 +++++++++++++++++++++++++ doc/usage/cmd/loady.rst | 8 +-- doc/usage/index.rst | 2 + lib/efi_loader/efi_device_path.c | 7 ++- lib/efi_selftest/efi_selftest_register_notify.c | 16 +++-- 7 files changed, 171 insertions(+), 11 deletions(-) create mode 100644 doc/usage/cmd/loadb.rst create mode 100644 doc/usage/cmd/loadx.rst

2 2

[PATCH v6 0/2] arm: dts: rockchip: rk3399: usb: ehci: Fix EHCI probe in rk3399 to access peripherals by USB 2.
by Xavier Drudis Ferran 05 Jun '23

05 Jun '23

EHCI probing in Rock pi 4 currently fails. Add a clock driver for usb2phy so that probing EHCI does not fail when missing one of the clocks in the bundle for usb_host0_ehci, since usb2phy is UCLASS_PHY but not UCLASS_CLK. Xavier Drudis Ferran (2): arm: dts: rockchip: rk3399: usb: ehci: Fix EHCI probe in rk3399 to access peripherals by USB 2. arm: rk3399: usb2phy: phy-rockchip-inno-usb2.c: Implement operations for the 480MHz usb2phy clock in rk3399. drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 97 ++++++++++++++++++- 1 file changed, 96 insertions(+), 1 deletion(-) Cc: Simon Glass <sjg(a)chromium.org> Cc: Philipp Tomsich <philipp.tomsich(a)vrull.eu> Cc: Kever Yang <kever.yang(a)rock-chips.com> Cc: Lukasz Majewski <lukma(a)denx.de> Cc: Sean Anderson <seanga2(a)gmail.com> Cc: Marek Vasut <marex(a)denx.de> Cc: Christoph Fritz <chf.fritz(a)googlemail.com> Cc: Jagan Teki <jagan(a)amarulasolutions.com> Signed-off-by: Xavier Drudis Ferran <xdrudis(a)tinet.cat> --- Changes: v6: just retested over current next branch and some corrections to message and headers (no changes to code). v5: fixes a bug that Christoph Fritz discovered, consisting in the wrong eror code returned when enabling or disabling the clock because property_enable() returns an error code in linux but the modified register value in U-Boot. This caused the clk disable to abort before freeing the clock. v4: move v3 to one patch in the series and add a second patch to add operations to enable disable the usb2phy 480Mhz clock. Also, honour clock-output-names for what is worth. v3: implement option 5 (bind usb2phy as a clk driver too) instead of option 1 (ehci-generic.c tolerates missing clocks). v2: implement option 1 (ehci-generic.c tolerates missing clocks) instead of option 3 (change dts node to remove the missing clock). -- 2.20.1

3 8

[PATCH] ARM: dts: stm32: fix display pinmux for stm32f746-disco
by Dario Binacchi 05 Jun '23

05 Jun '23

As reported by the datasheet (DocID027590 Rev 4) for PG12: - AF9 -> LCD_B4 - AF14 -> LCD_B1 So replace AF14 with AF9 for PG12 in the dts. Fixes: fe63d3cfb77ef ("ARM: dts: stm32: Sync DT with v4.20 kernel for stm32f7") Signed-off-by: Dario Binacchi <dario.binacchi(a)amarulasolutions.com> --- arch/arm/dts/stm32f746-disco-u-boot.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/dts/stm32f746-disco-u-boot.dtsi b/arch/arm/dts/stm32f746-disco-u-boot.dtsi index 19b5451db441..522cffb1ac9f 100644 --- a/arch/arm/dts/stm32f746-disco-u-boot.dtsi +++ b/arch/arm/dts/stm32f746-disco-u-boot.dtsi @@ -169,7 +169,7 @@ ltdc_pins: ltdc@0 { pins { pinmux = <STM32_PINMUX('E', 4, AF14)>, /* B0 */ - <STM32_PINMUX('G',12, AF14)>, /* B4 */ + <STM32_PINMUX('G',12, AF9)>, /* B4 */ <STM32_PINMUX('I', 9, AF14)>, /* VSYNC */ <STM32_PINMUX('I',10, AF14)>, /* HSYNC */ <STM32_PINMUX('I',14, AF14)>, /* CLK */ -- 2.32.0

3 3

[PATCH 0/6] video: zynqmp: Add support for ZynqMP DP
by Michal Simek 05 Jun '23

05 Jun '23

Hi, this series is adding initial support for Diplay port. As of today it is working on fixed configuration but working on making it more flexible to be able to fully configure it via DT only. Thanks, Michal Michal Simek (3): video: Add support for RGBA8888 format video: bmp: Support rgba8888 pixel format video: zynqmp: Enable 1024x768 resolution Venkatesh Yadav Abbarapu (3): video: move zynqmp files to subdirectory video: zynqmp: Driver for Xilinx ZynqMP DisplayPort Subsystem xilinx: zynqmp: Enable the vidconsole by default MAINTAINERS | 1 + drivers/video/Kconfig | 9 +- drivers/video/Makefile | 2 +- drivers/video/video-uclass.c | 10 +- drivers/video/video_bmp.c | 36 + drivers/video/zynqmp/Kconfig | 8 + drivers/video/zynqmp/Makefile | 5 + drivers/video/zynqmp/zynqmp_dpsub.c | 2225 +++++++++++++++++++++++++++ drivers/video/zynqmp/zynqmp_dpsub.h | 680 ++++++++ drivers/video/zynqmp_dpsub.c | 66 - include/configs/xilinx_zynqmp.h | 3 + include/video.h | 1 + 12 files changed, 2969 insertions(+), 77 deletions(-) create mode 100644 drivers/video/zynqmp/Kconfig create mode 100644 drivers/video/zynqmp/Makefile create mode 100644 drivers/video/zynqmp/zynqmp_dpsub.c create mode 100644 drivers/video/zynqmp/zynqmp_dpsub.h delete mode 100644 drivers/video/zynqmp_dpsub.c -- 2.36.1

1 7

[PATCH 0/7] rockchip: Fix RK3328 USB support
by Jagan Teki 05 Jun '23

05 Jun '23

This series support fixes for RK3328 USB. It has few dependencies and nits. 1. dependencies https://patchwork.ozlabs.org/project/uboot/patch/20230530102617.3413183-5-j… https://patchwork.ozlabs.org/project/uboot/patch/Y5IWpjYLB4aXMy9o@localhost/ 2. USB2PHY still working on default syscon. Thanks, Jagan. Jagan Teki (7): arm64: dts: rockchip: Drop unused rk3328-xhci node configs: Drop unused XHCI_DWC3 for RK3328 boards usb: dwc3-generic: Restrict single ctrl node for RK3328 configs: Enable DWC3 USB 3.0 on RK3328 boards phy: rockchip-inno-usb2: Add USB2 PHY for RK3328 clk: rockchip: rk3328: Return zero for USB480M clocks configs: rockchip: Enable USB2PHY for RK3328 boards arch/arm/dts/rk3328-evb-u-boot.dtsi | 5 --- arch/arm/dts/rk3328-roc-cc-u-boot.dtsi | 14 -------- arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi | 5 --- arch/arm/dts/rk3328-rock64-u-boot.dtsi | 15 --------- arch/arm/dts/rk3328-u-boot.dtsi | 11 ------- configs/evb-rk3328_defconfig | 4 ++- configs/nanopi-r2c-rk3328_defconfig | 4 ++- configs/nanopi-r2s-rk3328_defconfig | 4 ++- configs/roc-cc-rk3328_defconfig | 4 ++- configs/rock-pi-e-rk3328_defconfig | 4 ++- configs/rock64-rk3328_defconfig | 4 ++- drivers/clk/rockchip/clk_rk3328.c | 1 + drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 33 +++++++++++++++++++ drivers/usb/dwc3/dwc3-generic.c | 2 +- 14 files changed, 53 insertions(+), 57 deletions(-) -- 2.25.1

2 8

[PATCH v2] dfu: mtd: mark bad the MTD block on erase error
by Patrick Delaunay 05 Jun '23

05 Jun '23

In the MTD DFU backend, it is needed to mark the NAND block bad when the erase failed with the -EIO error, as it is done in UBI and JFFS2 code. This operation is not done in the MTD framework, but the bad block tag (in BBM or in BBT) is required to avoid to write data on this block in the next DFU_OP_WRITE loop in mtd_block_op(): the code skip the bad blocks, tested by mtd_block_isbad(). Without this patch, when the NAND block become bad on DFU write operation - low probability on new NAND - the DFU write operation will always failed because the failing block is never marked bad. This patch also adds a test to avoid to request an erase operation on a block already marked bad; this test is not performed in MTD framework in mtd_erase(). Signed-off-by: Patrick Delaunay <patrick.delaunay(a)foss.st.com> --- Changes in v2: - fixe mtd_block_isbad offset parameter for erase check - Add trace when bad block are skipped in erase loop - Add remaining byte in trace "Limit reached" drivers/dfu/dfu_mtd.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/drivers/dfu/dfu_mtd.c b/drivers/dfu/dfu_mtd.c index c7075f12eca9..a4a3e91be23e 100644 --- a/drivers/dfu/dfu_mtd.c +++ b/drivers/dfu/dfu_mtd.c @@ -86,27 +86,39 @@ static int mtd_block_op(enum dfu_op op, struct dfu_entity *dfu, while (remaining) { if (erase_op.addr + remaining > lim) { - printf("Limit reached 0x%llx while erasing at offset 0x%llx\n", - lim, off); + printf("Limit reached 0x%llx while erasing at offset 0x%llx, remaining 0x%llx\n", + lim, erase_op.addr, remaining); return -EIO; } + /* Skip the block if it is bad, don't erase it again */ + if (mtd_block_isbad(mtd, erase_op.addr)) { + printf("Skipping bad block at 0x%08llx\n", + erase_op.addr); + erase_op.addr += mtd->erasesize; + continue; + } + ret = mtd_erase(mtd, &erase_op); if (ret) { - /* Abort if its not a bad block error */ - if (ret != -EIO) { - printf("Failure while erasing at offset 0x%llx\n", - erase_op.fail_addr); - return 0; + /* If this is not -EIO, we have no idea what to do. */ + if (ret == -EIO) { + printf("Marking bad block at 0x%08llx (%d)\n", + erase_op.fail_addr, ret); + ret = mtd_block_markbad(mtd, erase_op.addr); + } + /* Abort if it is not -EIO or can't mark bad */ + if (ret) { + printf("Failure while erasing at offset 0x%llx (%d)\n", + erase_op.fail_addr, ret); + return ret; } - printf("Skipping bad block at 0x%08llx\n", - erase_op.addr); } else { remaining -= mtd->erasesize; } - /* Continue erase behind bad block */ + /* Continue erase behind the current block */ erase_op.addr += mtd->erasesize; } } -- 2.25.1

3 2

[PATCH] I2C: cdns: Fix broken retry mechanism on arbitration lost.
by Andrea Merello 05 Jun '23

05 Jun '23

In the current implementation, in case of I2C arbitration lost, a retry is attempted; the message counter and pointer are reset to the original values and the I2C xfer process is restart from the beginning. However the message counter and message pointer are respectively decremented and incremented by one before attempting any transfer, causing the 1st transfer not to be actually retried (in case of a single transfer, nothing is actually retried at all). This patch fixes this: in case of retry, the 1st transfer is also retried. Tested on a ZynqMP Kria board, with upstream older u-boot, but the involved file and underlying logic seem basically the same. Signed-off-by: Andrea Merello <andrea.merello(a)iit.it> --- drivers/i2c/i2c-cdns.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/i2c-cdns.c b/drivers/i2c/i2c-cdns.c index 1a89207206..935b2ac637 100644 --- a/drivers/i2c/i2c-cdns.c +++ b/drivers/i2c/i2c-cdns.c @@ -444,7 +444,7 @@ static int cdns_i2c_xfer(struct udevice *dev, struct i2c_msg *msg, debug("i2c_xfer: %d messages\n", nmsgs); for (u8 retry = 0; retry < CDNS_I2C_ARB_LOST_MAX_RETRIES && - nmsgs > 0; nmsgs--, msg++) { + nmsgs > 0;) { debug("i2c_xfer: chip=0x%x, len=0x%x\n", msg->addr, msg->len); if (msg->flags & I2C_M_RD) { ret = cdns_i2c_read_data(i2c_bus, msg->addr, msg->buf, @@ -461,7 +461,8 @@ static int cdns_i2c_xfer(struct udevice *dev, struct i2c_msg *msg, retry); continue; } - + nmsgs--; + msg++; if (ret) { debug("i2c_write: error sending\n"); return -EREMOTEIO; -- 2.17.1

2 1

[PATCH] i2c: rockchip: De-initialize the bus after start bit failure
by Ondřej Jirman 05 Jun '23

05 Jun '23

From: Ondrej Jirman <megi(a)xff.cz> 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(a)xff.cz> Cc: Heiko Schocher <hs(a)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 f8fac45b6ca0..9927af94a80b 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.40.1

3 3