November 2022 - U-Boot

[PATCH] watchdog: designware: make reset really optional
by Quentin Schulz 15 Nov '22

15 Nov '22

From: Quentin Schulz <quentin.schulz(a)theobroma-systems.com> Checking for DM_RESET is not enough since not all watchdog implementations use a reset lane. Such is the case for Rockchip implementation for example. Since reset_assert_bulk will only succeed if the resets property exists in the watchdog DT node, it needs to be called only if a reset property is present. This adds a condition on the resets property presence in the watchdog DT node before assuming a reset lane needs to be fetched with reset_assert_bulk, by calling ofnode_read_prop. Cc: Quentin Schulz <foss+uboot(a)0leil.net> Signed-off-by: Quentin Schulz <quentin.schulz(a)theobroma-systems.com> --- To: Stefan Roese <sr(a)denx.de> Cc: u-boot(a)lists.denx.de --- drivers/watchdog/designware_wdt.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c index cad756aeaf..6155939f49 100644 --- a/drivers/watchdog/designware_wdt.c +++ b/drivers/watchdog/designware_wdt.c @@ -72,13 +72,13 @@ static int designware_wdt_reset(struct udevice *dev) static int designware_wdt_stop(struct udevice *dev) { struct designware_wdt_priv *priv = dev_get_priv(dev); + __maybe_unused int ret; designware_wdt_reset(dev); writel(0, priv->base + DW_WDT_CR); - if (CONFIG_IS_ENABLED(DM_RESET)) { - int ret; - + if (CONFIG_IS_ENABLED(DM_RESET) && + ofnode_read_prop(dev_ofnode(dev), "resets", &ret)) { ret = reset_assert_bulk(&priv->resets); if (ret) return ret; @@ -135,7 +135,8 @@ static int designware_wdt_probe(struct udevice *dev) priv->clk_khz = CONFIG_DW_WDT_CLOCK_KHZ; #endif - if (CONFIG_IS_ENABLED(DM_RESET)) { + if (CONFIG_IS_ENABLED(DM_RESET) && + ofnode_read_prop(dev_ofnode(dev), "resets", &ret)) { ret = reset_get_bulk(dev, &priv->resets); if (ret) goto err; --- base-commit: 0cbeed4f6648e0e4966475e3544280a69ecb59d3 change-id: 20221114-dw-wdt-no-reset-2296a2bf37b3 Best regards, -- Quentin Schulz <quentin.schulz(a)theobroma-systems.com>

3 2

Pull request: u-boot-imx u-boot-imx-20221114
by Stefano Babic 15 Nov '22

15 Nov '22

Hi Tom, please pull from u-boot-imx, thanks ! The following changes since commit 88bd8ee106591eb900561715c44ad04441afc0e3: Prepare v2023.01-rc1 (2022-11-07 15:27:03 -0500) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git tags/u-boot-imx-20221114 for you to fetch changes up to fc1c1760de38823edbdc2cdd9606dff938a07f6e: Revert "serial: mxc: have putc use the TXFIFO" (2022-11-12 14:16:26 +0100) ---------------------------------------------------------------- For 2022.01 ----------- CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/14083 - Fix UART - moved to binman (MX8 boards) - Toradex: sync DTS with Linux - Gateworks: fixes - New boards : MSC SM2S iMX8MP ---------------------------------------------------------------- Adam Ford (7): regulator: bd718x7: Only bind children when PMIC_CHILDREN is enabled imx: imx8mn-beacon: Fix out of spec voltage imx: imx8mm_beacon: Eliminate a few extras to free up SPL space imx: imx8mm-beacon: Enable USB booting via SDP imx: imx8mm-beacon: Move Environment to eMMC partition 2 configs: imx8mn_beacon: Re-align memory to standard imx8mn settings configs: imx8mn_beacon: Enable SPL_DM_PMIC_BD71837 Baruch Siach (1): mx6cuboxi: migrate to DM_SERIAL Fabio Estevam (4): wandboard: Pass mmc aliases wandboard: Select DM_SERIAL imx8-u-boot: Fix SPL guard option Revert "serial: mxc: have putc use the TXFIFO" Loic Poulain (1): configs: imx8m: Enable CONFIG_ARMV8_CRYPTO support Marcel Ziswiler (8): vf610: synchronise device tree with linux imxrt1020: migrate to build system included -u-boot.dtsi imxrt1050: synchronise device tree with linux imx8ulp: synchronise device tree with linux imx8mq: synchronise device tree with linux imx8mp: synchronise device tree with linux imx8mn: synchronise device tree with linux imx8mm: synchronise device tree with linux Marek Vasut (1): ARM: imx: Add version variable to DHSOM Martyn Welch (5): imx8m: USDHC3 base address definition for i.MX8MP ARM: imx: imx8mp: Enable support for i2c5 and i2c6 on i.MX8MP drivers: power: pmic: Add support for rn5t568 PMIC drivers: power: pmic: Enable use of rn5t567 PMIC in SPL arm: imx8mp: Initial MSC SM2S iMX8MP support Matthias Schiffer (1): ARM: mx7: psci: fix suspend/resume e10133 workaround Oliver Graute (8): imx: imx8qm-rom7720: switch to binman imx: imx8qm: cgtqmx8: switch to binman imx: imx8qxp: imx8qxp_mek switch to binman imx: imx8qm: imx8qm_mek switch to binman imx: imx8qxp: giedi switch to binman imx: imx8qxp: deneb switch to binman imx: imx8x: colibri: switch to binman imx: imx8: apalis: switch to binman Stefano Babic (1): Convert mx8 u-boot.dtsi to CONFIG_TEXT_BASE Tim Harvey (6): board: gateworks: venice: remove redundance adjustment of thermal trip points configs: imx8mn_venice: fix include header protection configs: imx8mn_venice.h: remove unused ifdef configs: imx8m{m, n}_venice: remove unneeded CONFIG_FEC_MXC_PHYADDR imx: imx8m{m,n,p}_venice: migrate to CONFIG_EXTRA_ENV_TEXT configs: imx8m{m,n,p}_venice: disable autoload MAINTAINERS | 9 + arch/arm/dts/Makefile | 1 + arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi | 2 + arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi | 2 + arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi | 2 + arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi | 2 + arch/arm/dts/imx6dl-wandboard-revd1-u-boot.dtsi | 1 + arch/arm/dts/imx6q-wandboard-revd1-u-boot.dtsi | 1 + arch/arm/dts/imx6qdl-hummingboard2-emmc-som-v15-u-boot.dtsi | 16 ++ arch/arm/dts/imx6qdl-wandboard-u-boot.dtsi | 9 + arch/arm/dts/imx6qp-wandboard-revd1-u-boot.dtsi | 1 + arch/arm/dts/imx8mm-beacon-baseboard.dtsi | 4 +- arch/arm/dts/imx8mm-beacon-kit-u-boot.dtsi | 18 +- arch/arm/dts/imx8mm-evk.dtsi | 43 ++++ arch/arm/dts/imx8mm-icore-mx8mm.dtsi | 14 +- arch/arm/dts/imx8mm-mx8menlo.dts | 14 +- arch/arm/dts/imx8mm-u-boot.dtsi | 2 +- arch/arm/dts/imx8mm-venice-gw700x.dtsi | 24 +-- arch/arm/dts/imx8mm-venice-gw7901.dts | 12 +- arch/arm/dts/imx8mm-venice-gw7902.dts | 14 +- arch/arm/dts/imx8mm-venice-gw7903.dts | 6 +- arch/arm/dts/imx8mm-venice-gw7904.dts | 4 + arch/arm/dts/imx8mm-verdin.dtsi | 50 +++-- arch/arm/dts/imx8mn-beacon-baseboard.dtsi | 4 +- arch/arm/dts/imx8mn-evk.dtsi | 45 ++++- arch/arm/dts/imx8mn-var-som-symphony.dts | 6 +- arch/arm/dts/imx8mn-venice-gw7902.dts | 9 +- arch/arm/dts/imx8mn.dtsi | 14 +- arch/arm/dts/imx8mp-dhcom-pdk2.dts | 29 ++- arch/arm/dts/imx8mp-dhcom-som.dtsi | 20 +- arch/arm/dts/imx8mp-evk.dts | 179 ++++++++++++----- arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2.dts | 2 +- arch/arm/dts/imx8mp-icore-mx8mp.dtsi | 2 +- arch/arm/dts/imx8mp-msc-sm2s-u-boot.dtsi | 65 ++++++ arch/arm/dts/imx8mp-msc-sm2s.dts | 820 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts | 48 ++--- arch/arm/dts/imx8mp-u-boot.dtsi | 2 +- arch/arm/dts/imx8mp-venice-gw74xx.dts | 284 +++++++++++++++++++------- arch/arm/dts/imx8mp-verdin.dtsi | 32 ++- arch/arm/dts/imx8mp.dtsi | 147 +++++++++++++- arch/arm/dts/imx8mq-evk.dts | 43 ++++ arch/arm/dts/imx8mq-librem5-r3.dtsi | 45 +++++ arch/arm/dts/imx8mq-librem5-r4.dts | 20 +- arch/arm/dts/imx8mq-librem5.dtsi | 153 ++++++++++++-- arch/arm/dts/imx8mq-u-boot.dtsi | 10 +- arch/arm/dts/imx8mq.dtsi | 19 +- arch/arm/dts/imx8qm-cgtqmx8.dts | 1 + arch/arm/dts/imx8qm-rom7720-a1.dts | 1 + arch/arm/dts/imx8qm-u-boot.dtsi | 135 +++++++++++++ arch/arm/dts/imx8qxp-capricorn-u-boot.dtsi | 2 + arch/arm/dts/imx8qxp-u-boot.dtsi | 133 ++++++++++++ arch/arm/dts/imx8ulp-evk-u-boot.dtsi | 15 +- arch/arm/dts/imx8ulp-evk.dts | 240 +++++++--------------- arch/arm/dts/imx8ulp-pinfunc.h | 4 +- arch/arm/dts/imx8ulp.dtsi | 594 ++++++++++++++++-------------------------------------- arch/arm/dts/imxrt1020-evk-u-boot.dtsi | 7 +- arch/arm/dts/imxrt1020-evk.dts | 1 - arch/arm/dts/imxrt1050-evk-u-boot.dtsi | 274 +++++++++++++++++++++++-- arch/arm/dts/imxrt1050-evk.dts | 257 +++--------------------- arch/arm/dts/imxrt1050-pinfunc.h | 2 +- arch/arm/dts/imxrt1050.dtsi | 168 +++++++--------- arch/arm/dts/vf610-pinfunc.h | 2 +- arch/arm/include/asm/arch-imx8m/imx-regs.h | 6 +- arch/arm/mach-imx/i2c-mxv7.c | 6 + arch/arm/mach-imx/imx8/Kconfig | 8 + arch/arm/mach-imx/imx8m/Kconfig | 9 + arch/arm/mach-imx/imx8m/clock_imx8mm.c | 12 +- arch/arm/mach-imx/mx7/psci-mx7.c | 9 +- board/advantech/imx8qm_rom7720_a1/imximage.cfg | 4 +- board/beacon/imx8mm/spl.c | 7 +- board/beacon/imx8mn/spl.c | 35 ++++ board/congatec/cgtqmx8/imximage.cfg | 4 +- board/freescale/imx8qm_mek/README | 2 +- board/freescale/imx8qxp_mek/imximage.cfg | 3 +- board/gateworks/venice/venice.c | 16 -- board/gateworks/venice/venice.env | 34 ++++ board/msc/sm2s_imx8mp/Kconfig | 15 ++ board/msc/sm2s_imx8mp/Makefile | 11 + board/msc/sm2s_imx8mp/imximage-8mp-lpddr4.cfg | 8 + board/msc/sm2s_imx8mp/lpddr4_timing.c | 1842 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/msc/sm2s_imx8mp/sm2s_imx8mp.c | 60 ++++++ board/msc/sm2s_imx8mp/spl.c | 273 +++++++++++++++++++++++++ board/siemens/capricorn/imximage.cfg | 2 +- board/solidrun/mx6cuboxi/mx6cuboxi.c | 3 + configs/apalis-imx8_defconfig | 1 + configs/cgtqmx8_defconfig | 4 +- configs/colibri-imx8x_defconfig | 1 + configs/deneb_defconfig | 2 + configs/dh_imx6_defconfig | 1 + configs/giedi_defconfig | 2 + configs/imx8mm_beacon_defconfig | 24 ++- configs/imx8mm_venice_defconfig | 1 + configs/imx8mn_beacon_2g_defconfig | 8 +- configs/imx8mn_beacon_defconfig | 8 +- configs/imx8mn_venice_defconfig | 1 + configs/imx8mp_venice_defconfig | 1 + configs/imx8qm_mek_defconfig | 2 + configs/imx8qm_rom7720_a1_4G_defconfig | 3 +- configs/imx8qxp_mek_defconfig | 2 + configs/msc_sm2s_imx8mp_defconfig | 105 ++++++++++ configs/mx6cuboxi_defconfig | 2 +- configs/wandboard_defconfig | 1 + doc/board/advantech/imx8qm-rom7720-a1.rst | 3 +- doc/board/congatec/cgtqmx8.rst | 3 +- doc/board/nxp/imx8qxp_mek.rst | 2 +- drivers/power/pmic/Kconfig | 8 + drivers/power/pmic/Makefile | 2 +- drivers/power/pmic/bd71837.c | 9 +- drivers/power/pmic/rn5t567.c | 1 + drivers/serial/serial_mxc.c | 2 +- include/configs/imx8mm_venice.h | 53 +---- include/configs/imx8mn_beacon.h | 8 - include/configs/imx8mn_venice.h | 59 +----- include/configs/imx8mp_venice.h | 51 +---- include/configs/msc_sm2s_imx8mp.h | 64 ++++++ include/dt-bindings/clock/imx8mp-clock.h | 13 +- include/dt-bindings/clock/imx8ulp-clock.h | 53 +++-- include/dt-bindings/clock/imxrt1050-clock.h | 9 +- include/dt-bindings/interconnect/fsl,imx8mp.h | 59 ++++++ include/dt-bindings/interconnect/imx8mm.h | 50 +++++ include/dt-bindings/interconnect/imx8mn.h | 41 ++++ include/dt-bindings/power/imx8mp-power.h | 21 +- include/dt-bindings/power/imx8ulp-power.h | 26 +++ include/dt-bindings/reset/imx8mp-reset.h | 50 +++++ include/dt-bindings/reset/imx8mq-reset.h | 61 +++--- include/dt-bindings/reset/imx8ulp-pcc-reset.h | 59 ++++++ 126 files changed, 5775 insertions(+), 1555 deletions(-) create mode 100644 arch/arm/dts/imx6dl-wandboard-revd1-u-boot.dtsi create mode 100644 arch/arm/dts/imx6q-wandboard-revd1-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qdl-wandboard-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qp-wandboard-revd1-u-boot.dtsi create mode 100644 arch/arm/dts/imx8mp-msc-sm2s-u-boot.dtsi create mode 100644 arch/arm/dts/imx8mp-msc-sm2s.dts create mode 100644 arch/arm/dts/imx8mq-librem5-r3.dtsi create mode 100644 arch/arm/dts/imx8qm-u-boot.dtsi create mode 100644 arch/arm/dts/imx8qxp-u-boot.dtsi create mode 100644 board/gateworks/venice/venice.env create mode 100644 board/msc/sm2s_imx8mp/Kconfig create mode 100644 board/msc/sm2s_imx8mp/Makefile create mode 100644 board/msc/sm2s_imx8mp/imximage-8mp-lpddr4.cfg create mode 100644 board/msc/sm2s_imx8mp/lpddr4_timing.c create mode 100644 board/msc/sm2s_imx8mp/sm2s_imx8mp.c create mode 100644 board/msc/sm2s_imx8mp/spl.c create mode 100644 configs/msc_sm2s_imx8mp_defconfig create mode 100644 include/configs/msc_sm2s_imx8mp.h create mode 100644 include/dt-bindings/interconnect/fsl,imx8mp.h create mode 100644 include/dt-bindings/interconnect/imx8mm.h create mode 100644 include/dt-bindings/interconnect/imx8mn.h create mode 100644 include/dt-bindings/power/imx8ulp-power.h create mode 100644 include/dt-bindings/reset/imx8mp-reset.h create mode 100644 include/dt-bindings/reset/imx8ulp-pcc-reset.h Best regards, Stefano -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

3 2

[PATCH] rockchip: clk: add watchdog clock to px30_clk_enable
by Quentin Schulz 15 Nov '22

15 Nov '22

From: Quentin Schulz <quentin.schulz(a)theobroma-systems.com> Add the PCLK_WDT_NS clock to px30_clk_enable so that the watchdog driver can probe since it wants to enable this clock. Cc: Quentin Schulz <foss+uboot(a)0leil.net> Signed-off-by: Quentin Schulz <quentin.schulz(a)theobroma-systems.com> --- rockchip: clk: add watchdog clock to px30_clk_enable This is required for px30 to be able to probe the Designware watchdog device. To: Lukasz Majewski <lukma(a)denx.de> To: Sean Anderson <seanga2(a)gmail.com> To: Simon Glass <sjg(a)chromium.org> To: Philipp Tomsich <philipp.tomsich(a)vrull.eu> To: Kever Yang <kever.yang(a)rock-chips.com> Cc: u-boot(a)lists.denx.de --- drivers/clk/rockchip/clk_px30.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/clk/rockchip/clk_px30.c b/drivers/clk/rockchip/clk_px30.c index 5d467447a1..38cb90e512 100644 --- a/drivers/clk/rockchip/clk_px30.c +++ b/drivers/clk/rockchip/clk_px30.c @@ -1415,6 +1415,9 @@ static int px30_clk_enable(struct clk *clk) case SCLK_GMAC_RMII: /* Required to successfully probe the Designware GMAC driver */ return 0; + case PCLK_WDT_NS: + /* Required to successfully probe the Designware watchdog driver */ + return 0; } debug("%s: unsupported clk %ld\n", __func__, clk->id); --- base-commit: 0cbeed4f6648e0e4966475e3544280a69ecb59d3 change-id: 20221114-px30-wdt-clk-58c875b33d37 Best regards, -- Quentin Schulz <quentin.schulz(a)theobroma-systems.com>

2 1

[PATCH 1/2] udoo_neo: Move to DM for REGUALTOR/PMIC/I2C drivers
by Peter Robinson 15 Nov '22

15 Nov '22

This moves over the PMIC power init to DM and the associated i2c and regulator bits. Signed-off-by: Peter Robinson <pbrobinson(a)gmail.com> --- Rebase this and I think I've fixed the previous build error reported by Stefano. board/udoo/neo/neo.c | 139 +++---------------------------------- configs/udoo_neo_defconfig | 10 +-- include/configs/udoo_neo.h | 5 -- 3 files changed, 15 insertions(+), 139 deletions(-) diff --git a/board/udoo/neo/neo.c b/board/udoo/neo/neo.c index 5e40583ab43..9e2a66996c4 100644 --- a/board/udoo/neo/neo.c +++ b/board/udoo/neo/neo.c @@ -51,11 +51,6 @@ enum { PAD_CTL_PUS_22K_UP | PAD_CTL_SPEED_LOW | \ PAD_CTL_DSE_80ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS) -#define I2C_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ - PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \ - PAD_CTL_DSE_40ohm | PAD_CTL_HYS | \ - PAD_CTL_ODE) - #define ENET_PAD_CTRL (PAD_CTL_PUS_100K_UP | PAD_CTL_PUE | \ PAD_CTL_SPEED_MED | \ PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST) @@ -83,135 +78,25 @@ int dram_init(void) return 0; } -#ifdef CONFIG_SYS_I2C_MXC -#define PC MUX_PAD_CTRL(I2C_PAD_CTRL) -/* I2C1 for PMIC */ -static struct i2c_pads_info i2c_pad_info1 = { - .scl = { - .i2c_mode = MX6_PAD_GPIO1_IO00__I2C1_SCL | PC, - .gpio_mode = MX6_PAD_GPIO1_IO00__GPIO1_IO_0 | PC, - .gp = IMX_GPIO_NR(1, 0), - }, - .sda = { - .i2c_mode = MX6_PAD_GPIO1_IO01__I2C1_SDA | PC, - .gpio_mode = MX6_PAD_GPIO1_IO01__GPIO1_IO_1 | PC, - .gp = IMX_GPIO_NR(1, 1), - }, -}; -#endif - -#if CONFIG_IS_ENABLED(POWER_LEGACY) int power_init_board(void) { - struct pmic *p; - int ret; - unsigned int reg, rev_id; - - ret = power_pfuze3000_init(PFUZE3000_I2C_BUS); - if (ret) - return ret; - - p = pmic_get("PFUZE3000"); - ret = pmic_probe(p); - if (ret) - return ret; + struct udevice *dev; + int ret, dev_id, rev_id; - pmic_reg_read(p, PFUZE3000_DEVICEID, &reg); - pmic_reg_read(p, PFUZE3000_REVID, &rev_id); - printf("PMIC: PFUZE3000 DEV_ID=0x%x REV_ID=0x%x\n", reg, rev_id); - - /* disable Low Power Mode during standby mode */ - pmic_reg_read(p, PFUZE3000_LDOGCTL, &reg); - reg |= 0x1; - ret = pmic_reg_write(p, PFUZE3000_LDOGCTL, reg); - if (ret) + ret = pmic_get("pfuze3000@8", &dev); + if (ret == -ENODEV) + return 0; + if (ret != 0) return ret; - ret = pmic_reg_write(p, PFUZE3000_SW1AMODE, 0xc); - if (ret) - return ret; + dev_id = pmic_reg_read(dev, PFUZE3000_DEVICEID); + rev_id = pmic_reg_read(dev, PFUZE3000_REVID); + printf("PMIC: PFUZE3000 DEV_ID=0x%x REV_ID=0x%x\n", dev_id, rev_id); - ret = pmic_reg_write(p, PFUZE3000_SW1BMODE, 0xc); - if (ret) - return ret; - - ret = pmic_reg_write(p, PFUZE3000_SW2MODE, 0xc); - if (ret) - return ret; - - ret = pmic_reg_write(p, PFUZE3000_SW3MODE, 0xc); - if (ret) - return ret; - - /* set SW1A standby voltage 0.975V */ - pmic_reg_read(p, PFUZE3000_SW1ASTBY, &reg); - reg &= ~0x3f; - reg |= PFUZE3000_SW1AB_SETP(9750); - ret = pmic_reg_write(p, PFUZE3000_SW1ASTBY, reg); - if (ret) - return ret; - - /* set SW1B standby voltage 0.975V */ - pmic_reg_read(p, PFUZE3000_SW1BSTBY, &reg); - reg &= ~0x3f; - reg |= PFUZE3000_SW1AB_SETP(9750); - ret = pmic_reg_write(p, PFUZE3000_SW1BSTBY, reg); - if (ret) - return ret; - - /* set SW1A/VDD_ARM_IN step ramp up time from 16us to 4us/25mV */ - pmic_reg_read(p, PFUZE3000_SW1ACONF, &reg); - reg &= ~0xc0; - reg |= 0x40; - ret = pmic_reg_write(p, PFUZE3000_SW1ACONF, reg); - if (ret) - return ret; - - /* set SW1B/VDD_SOC_IN step ramp up time from 16us to 4us/25mV */ - pmic_reg_read(p, PFUZE3000_SW1BCONF, &reg); - reg &= ~0xc0; - reg |= 0x40; - ret = pmic_reg_write(p, PFUZE3000_SW1BCONF, reg); - if (ret) - return ret; - - /* set VDD_ARM_IN to 1.350V */ - pmic_reg_read(p, PFUZE3000_SW1AVOLT, &reg); - reg &= ~0x3f; - reg |= PFUZE3000_SW1AB_SETP(13500); - ret = pmic_reg_write(p, PFUZE3000_SW1AVOLT, reg); - if (ret) - return ret; - - /* set VDD_SOC_IN to 1.350V */ - pmic_reg_read(p, PFUZE3000_SW1BVOLT, &reg); - reg &= ~0x3f; - reg |= PFUZE3000_SW1AB_SETP(13500); - ret = pmic_reg_write(p, PFUZE3000_SW1BVOLT, reg); - if (ret) - return ret; - - /* set DDR_1_5V to 1.350V */ - pmic_reg_read(p, PFUZE3000_SW3VOLT, &reg); - reg &= ~0x0f; - reg |= PFUZE3000_SW3_SETP(13500); - ret = pmic_reg_write(p, PFUZE3000_SW3VOLT, reg); - if (ret) - return ret; - - /* set VGEN2_1V5 to 1.5V */ - pmic_reg_read(p, PFUZE3000_VLDO2CTL, &reg); - reg &= ~0x0f; - reg |= PFUZE3000_VLDO_SETP(15000); - /* enable */ - reg |= 0x10; - ret = pmic_reg_write(p, PFUZE3000_VLDO2CTL, reg); - if (ret) - return ret; + pmic_clrsetbits(dev, PFUZE3000_LDOGCTL, 0, 1); return 0; } -#endif static iomux_v3_cfg_t const uart1_pads[] = { MX6_PAD_GPIO1_IO04__UART1_TX | MUX_PAD_CTRL(UART_PAD_CTRL), @@ -294,10 +179,6 @@ int board_init(void) gpio_request(IMX_GPIO_NR(4, 16), "ncp692"); gpio_direction_output(IMX_GPIO_NR(4, 16) , 1); -#ifdef CONFIG_SYS_I2C_MXC - setup_i2c(0, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1); -#endif - setup_fec(); return 0; diff --git a/configs/udoo_neo_defconfig b/configs/udoo_neo_defconfig index 8ae9fa57f03..6c29f8fd251 100644 --- a/configs/udoo_neo_defconfig +++ b/configs/udoo_neo_defconfig @@ -10,8 +10,9 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x80000 CONFIG_MX6SX=y CONFIG_TARGET_UDOO_NEO=y -CONFIG_SYS_I2C_MXC_I2C1=y +CONFIG_DM_I2C=y CONFIG_DM_GPIO=y +CONFIG_DM_MMC=y CONFIG_DEFAULT_DEVICE_TREE="imx6sx-udoo-neo-basic" CONFIG_SPL_TEXT_BASE=0x00908000 CONFIG_SPL_MMC=y @@ -43,8 +44,6 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_MMC_ENV_DEV=1 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_BOUNCE_BUFFER=y -CONFIG_SYS_I2C_LEGACY=y -CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_SYS_I2C_MXC=y CONFIG_FSL_USDHC=y CONFIG_PHYLIB=y @@ -55,11 +54,12 @@ CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y -CONFIG_POWER_LEGACY=y +CONFIG_DM_PMIC=y +CONFIG_DM_PMIC_PFUZE100=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_ANATOP=y -CONFIG_POWER_I2C=y +CONFIG_DM_REGULATOR_PFUZE100=y CONFIG_MXC_UART=y CONFIG_IMX_THERMAL=y CONFIG_USB=y diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h index e30b6cc82d8..9ab64a6b0f3 100644 --- a/include/configs/udoo_neo.h +++ b/include/configs/udoo_neo.h @@ -63,9 +63,4 @@ #define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR #define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE -/* PMIC */ -#define CONFIG_POWER_PFUZE3000 -#define CONFIG_POWER_PFUZE3000_I2C_ADDR 0x08 -#define PFUZE3000_I2C_BUS 0 - #endif /* __CONFIG_H */ -- 2.38.1

3 7

Peculiar problem executing boot.scr
by Tasos Terzidis 14 Nov '22

14 Nov '22

Hello, I have a very peculiar problem. I have a very simple boot.scr script so that u-boot can load it and run it. My set up is a Raspberry 3 B (32 bit) Sript is Fatload mmc 0:1 ${kernel_addr_r} kernel7.img Bootz ${kernel_addr_r} - ${fdt_addr} When u-boot stops autocounting, finds the script loads it and the error message is -à ‘ailed to find kernel7.img ß-- Instead of F for word Failed, prints ‘ailed. If I stop auto counting and enter the commands of script by hand it runs and loads kernel as expected As a matter of fact whatever command I add to the script gives an error Example : if I add printenv the error is “can not find command” I can not understand what the problem is. Has anyone encountered such a problem ?? Thank you Tasos

2 1

[PATCH 1/1] sandbox: fix documentation of struct host_ops
by Heinrich Schuchardt 14 Nov '22

14 Nov '22

The documentation of struct host_ops should be Sphinx compliant. Fixes: 9bd1aa8af2ed ("dm: sandbox: Create a new HOST uclass") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- include/sandbox_host.h | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/include/sandbox_host.h b/include/sandbox_host.h index 2e37ede235..ebd7d99b47 100644 --- a/include/sandbox_host.h +++ b/include/sandbox_host.h @@ -23,26 +23,23 @@ struct host_sb_plat { /** * struct host_ops - operations supported by UCLASS_HOST - * - * @attach_file: Attach a new file to a device - * @detach_file: Detach a file from a device */ struct host_ops { - /* - * attach_file() - Attach a new file to the device + /** + * @attach_file: - Attach a new file to the device * - * @dev: Device to update - * @filename: Name of the file, e.g. "/path/to/disk.img" - * Returns: 0 if OK, -EEXIST if a file is already attached, other -ve on + * @attach_file.dev: Device to update + * @attach_file.filename: Name of the file, e.g. "/path/to/disk.img" + * @attach_file.Returns: 0 if OK, -EEXIST if a file is already attached, other -ve on * other error */ int (*attach_file)(struct udevice *dev, const char *filename); /** - * detach_file() - Detach a file from the device + * @detach_file: - Detach a file from the device * - * @dev: Device to detach from - * Returns: 0 if OK, -ENOENT if no file is attached, other -ve on other + * @detach_file.dev: Device to detach from + * @detach_file.Returns: 0 if OK, -ENOENT if no file is attached, other -ve on other * error */ int (*detach_file)(struct udevice *dev); -- 2.37.2

2 1

[PATCH 1/1] Documentation: man-page for command bootd
by Heinrich Schuchardt 14 Nov '22

14 Nov '22

Provide a man-page for the bootd command. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- doc/usage/cmd/bootd.rst | 38 ++++++++++++++++++++++++++++++++++++++ doc/usage/index.rst | 1 + 2 files changed, 39 insertions(+) create mode 100644 doc/usage/cmd/bootd.rst diff --git a/doc/usage/cmd/bootd.rst b/doc/usage/cmd/bootd.rst new file mode 100644 index 0000000000..380ef15283 --- /dev/null +++ b/doc/usage/cmd/bootd.rst @@ -0,0 +1,38 @@ +.. SPDX-License-Identifier: GPL-2.0+: + +bootd command +============= + +Synopsis +-------- + +:: + + bootd + +Description +----------- + +The bootd command executes the command stored in the environment variable +*bootcmd*, i.e. it does the same thing as *run bootcmd*. + +Example +------- + +:: + + => setenv bootcmd 'echo Hello World' + => bootd + Hello World + => setenv bootcmd true + => bootd; echo $? + 0 + => setenv bootcmd false + => bootd; echo $? + 1 + +Return value +------------ + +The return value $? of the bootd command is the return value of the command in +the environment variable *bootcmd*. diff --git a/doc/usage/index.rst b/doc/usage/index.rst index f7f03aeac1..815b032247 100644 --- a/doc/usage/index.rst +++ b/doc/usage/index.rst @@ -23,6 +23,7 @@ Shell commands cmd/addrmap cmd/askenv cmd/base + cmd/bootd cmd/bootdev cmd/bootefi cmd/bootflow -- 2.37.2

2 1

Please pull u-boot-i2c
by Heiko Schocher 14 Nov '22

14 Nov '22

Hello Tom, please pull from u-boot-i2c: The following changes since commit 0cbeed4f6648e0e4966475e3544280a69ecb59d3: Merge branch '2022-11-10-symbol-migrations' (2022-11-10 10:09:40 -0500) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-i2c.git tags/for-v2023.01-rc2 for you to fetch changes up to b0c485fd384b2706717d4c19fa9837c1d785e9e8: i2c: i2c-gpio: add newline (2022-11-14 07:24:47 +0100) ---------------------------------------------------------------- i2c Fixes for v2023.01-rc2 - i2c-gpio: add a missing new line in printed string detected and fixed by Sergei - microchip i2c driver fixes from Conor - fix erroneous late ack send - fix ack sending logic ---------------------------------------------------------------- Conor Dooley (2): i2c: microchip: fix ack sending logic i2c: microchip: fix erroneous late ack send Sergei Antonov (1): i2c: i2c-gpio: add newline drivers/i2c/i2c-gpio.c | 2 +- drivers/i2c/i2c-microchip.c | 25 ++++++++++++++++++------- 2 files changed, 19 insertions(+), 8 deletions(-) Azure builds shows no errors: https://dev.azure.com/hs0298/hs/_build/results?buildId=85&view=results Thanks! bye, Heiko -- DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs(a)denx.de

2 1

[PATCH 1/2] cmd: fdt: Fix iteration over elements above index 2 in fdt get
by Marek Vasut 14 Nov '22

14 Nov '22

Always increment both the iterator and pointer into the string property value by length of the current element + 1 (to cater for the string delimiter), otherwise the element extracted from the string property value would be extracted from an offset that is multiple of the length of the first element, instead of sum of element lengths until select index. This fixes 'fdt get value' operation for index above 2. Fixes: 13982ced2cc ("cmd: fdt: Add support for reading stringlist property values") Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Tom Rini <trini(a)konsulko.com> --- cmd/fdt.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cmd/fdt.c b/cmd/fdt.c index 4b2dcfec863..8e51a431261 100644 --- a/cmd/fdt.c +++ b/cmd/fdt.c @@ -60,11 +60,14 @@ static int fdt_value_env_set(const void *nodep, int len, * Iterate over all members in stringlist and find the one at * offset $index. If no such index exists, indicate failure. */ - for (i = 0; i < len; i += strlen(nodec) + 1) { - if (index-- > 0) + for (i = 0; i < len; ) { + if (index-- > 0) { + i += strlen(nodec) + 1; + nodec += strlen(nodec) + 1; continue; + } - env_set(var, nodec + i); + env_set(var, nodec); return 0; } -- 2.35.1

2 4

[PATCH] eficonfig: fix missing variable initialization
by Masahisa Kojima 14 Nov '22

14 Nov '22

The 'ret' variable must be initialized before use in eficonfig_delete_invalid_boot_option(). Fixes: c416f1c0bc ("bootmenu: add removable media entries") Addresses-Coverity: 376207 ("Uninitialized variables") Signed-off-by: Masahisa Kojima <masahisa.kojima(a)linaro.org> --- cmd/eficonfig.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/eficonfig.c b/cmd/eficonfig.c index 2595dd9563..0a768d8013 100644 --- a/cmd/eficonfig.c +++ b/cmd/eficonfig.c @@ -2280,10 +2280,10 @@ efi_status_t eficonfig_delete_invalid_boot_option(struct eficonfig_media_boot_op { u32 i, j; efi_uintn_t size; - efi_status_t ret; void *load_option; struct efi_load_option lo; u16 varname[] = u"Boot####"; + efi_status_t ret = EFI_SUCCESS; for (i = 0; i <= 0xFFFF; i++) { efi_uintn_t tmp; -- 2.17.1

2 1