January 2025 - U-Boot

[PATCH v2] led: add function naming option from linux
by Heiko Schocher 23 Jan '25

23 Jan '25

in linux we have the option to create the name of a led optionally through the following properties: - function - color - function-enumerator This patch adds support for parsing this properties if there is no label property. To be as close as possible to linux import the following files from it: include/dt-bindings/leds/common.h include/linux/uapi/linux/uleds.h base commit was: commit: b8f52214c61a ("Merge tag 'audit-pr-20241205' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit") The led name is created in led_post_bind() and we need some storage place for it. Currently this patch prevents to use malloc() instead it stores the name in new member : char name[LED_MAX_NAME_SIZE]; of struct led_uc_plat. While at it append led tests for the new feature. Signed-off-by: Heiko Schocher <hs(a)denx.de> --- as we introduce a new element in struct led_uc_priv, may we should add this functionality through a new Kconfig option? (Which also would make this optional and save some bytes for boards who do not need this...) Ignored a lot of checkpatch warnigs for file include/dt-bindings/leds/common.h WARNING: Block comments use * on subsequent lines +/* Obsolete equivalents: "tpacpi::thinklight" (IBM/Lenovo Thinkpads), + "lp5523:kb{1,2,3,4,5,6}" (Nokia N900) */ WARNING: Block comments use a trailing */ on a separate line + "lp5523:kb{1,2,3,4,5,6}" (Nokia N900) */ WARNING: Block comments use * on subsequent lines +/* System LEDs, usually found on system body. + platform::mute (etc) is sometimes seen, :mute would be better */ WARNING: Block comments use a trailing */ on a separate line + platform::mute (etc) is sometimes seen, :mute would be better */ WARNING: Block comments use * on subsequent lines +/* Used RGB notification LEDs common on phones. + Obsolete equivalents: "status-led:{red,green,blue}" (Motorola Droid 4), WARNING: Block comments use a trailing */ on a separate line + "lp5523:{r,g,b}" (Nokia N900) */ as it is copied from linux commit: b8f52214c61a ("Merge tag 'audit-pr-20241205' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit") Azure build: https://dev.azure.com/hs0298/hs/_build/results?buildId=164&view=results Changes in v2: - remove unused name variable in function led_get_label() - rebased patch to current HEAD 82d262ae162 ("Merge patch series "MediaTek MT7629 OF_UPSTREAM migration (v2)"") arch/sandbox/dts/test.dts | 37 +++++++- doc/device-tree-bindings/leds/common.txt | 28 ++++++ drivers/led/led-uclass.c | 70 +++++++++++++- include/dt-bindings/leds/common.h | 114 +++++++++++++++++++++++ include/led.h | 2 + include/linux/uapi/linux/uleds.h | 25 +++++ test/dm/led.c | 22 ++++- test/dm/ofnode.c | 2 +- 8 files changed, 293 insertions(+), 7 deletions(-) create mode 100644 include/dt-bindings/leds/common.h create mode 100644 include/linux/uapi/linux/uleds.h diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index ae52b375ccb..b8f3012873e 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -13,6 +13,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/sandbox-gpio.h> #include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include <dt-bindings/pinctrl/sandbox-pinmux.h> #include <dt-bindings/mux/mux.h> @@ -820,7 +821,7 @@ gpio-controller; #gpio-cells = <1>; gpio-bank-name = "a"; - sandbox,gpio-count = <20>; + sandbox,gpio-count = <25>; hog_input_active_low { gpio-hog; input; @@ -1010,6 +1011,40 @@ /* label intentionally omitted */ default-state = "off"; }; + + led-20 { + gpios = <&gpio_a 20 0>; + /* label intentionally omitted */ + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_RED>; + function-enumerator = <20>; + }; + + led-21 { + gpios = <&gpio_a 21 0>; + /* label intentionally omitted */ + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_GREEN>; + }; + + led-22 { + gpios = <&gpio_a 22 0>; + /* label intentionally omitted */ + function = LED_FUNCTION_STATUS; + }; + + led-23 { + gpios = <&gpio_a 23 0>; + /* label intentionally omitted */ + color = <LED_COLOR_ID_GREEN>; + }; + + led-24 { + gpios = <&gpio_a 24 0>; + label = "sandbox:function"; + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_GREEN>; + }; }; wdt-gpio-toggle { diff --git a/doc/device-tree-bindings/leds/common.txt b/doc/device-tree-bindings/leds/common.txt index 2d88816dd55..10b2cd84113 100644 --- a/doc/device-tree-bindings/leds/common.txt +++ b/doc/device-tree-bindings/leds/common.txt @@ -4,6 +4,21 @@ Optional properties for child nodes: - label : The label for this LED. If omitted, the label is taken from the node name (excluding the unit address). +- function: + LED function. Use one of the LED_FUNCTION_* prefixed definitions + from the header include/dt-bindings/leds/common.h. If there is no + matching LED_FUNCTION available, add a new one. + +- color: + Color of the LED. Use one of the LED_COLOR_ID_* prefixed definitions from + the header include/dt-bindings/leds/common.h. If there is no matching + LED_COLOR_ID available, add a new one. + +- function-enumerator: + optional + Integer to be used when more than one instance of the same function is + needed, differing only with an ordinal number. + - linux,default-trigger : This parameter, if present, is a string defining the trigger assigned to the LED. Current triggers are: "backlight" - LED will act as a back-light, controlled by the framebuffer @@ -21,3 +36,16 @@ system-status { linux,default-trigger = "heartbeat"; ... }; + +led-0 { + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_RED>; + function-enumerator = <20>; + ... +}; + +led-1 { + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_YELLOW>; + ... +}; diff --git a/drivers/led/led-uclass.c b/drivers/led/led-uclass.c index 760750568c0..27ef890ed0a 100644 --- a/drivers/led/led-uclass.c +++ b/drivers/led/led-uclass.c @@ -13,6 +13,25 @@ #include <dm/lists.h> #include <dm/root.h> #include <dm/uclass-internal.h> +#include <dt-bindings/leds/common.h> + +static const char * const led_colors[LED_COLOR_ID_MAX] = { + [LED_COLOR_ID_WHITE] = "white", + [LED_COLOR_ID_RED] = "red", + [LED_COLOR_ID_GREEN] = "green", + [LED_COLOR_ID_BLUE] = "blue", + [LED_COLOR_ID_AMBER] = "amber", + [LED_COLOR_ID_VIOLET] = "violet", + [LED_COLOR_ID_YELLOW] = "yellow", + [LED_COLOR_ID_IR] = "ir", + [LED_COLOR_ID_MULTI] = "multicolor", + [LED_COLOR_ID_RGB] = "rgb", + [LED_COLOR_ID_PURPLE] = "purple", + [LED_COLOR_ID_ORANGE] = "orange", + [LED_COLOR_ID_PINK] = "pink", + [LED_COLOR_ID_CYAN] = "cyan", + [LED_COLOR_ID_LIME] = "lime", +}; int led_bind_generic(struct udevice *parent, const char *driver_name) { @@ -232,11 +251,54 @@ int led_activity_blink(void) #endif #endif -static const char *led_get_label(ofnode node) +static const char *led_get_function_name(struct udevice *dev) +{ + struct led_uc_plat *uc_plat; + const char *func; + u32 color; + u32 enumerator; + int ret; + int cp; + + if (!dev) + return NULL; + + uc_plat = dev_get_uclass_plat(dev); + if (!uc_plat) + return NULL; + + if (uc_plat->label) + return uc_plat->label; + + /* Now try to detect function label name */ + func = dev_read_string(dev, "function"); + cp = dev_read_u32(dev, "color", &color); + if (cp == 0 || func) { + ret = dev_read_u32(dev, "function-enumerator", &enumerator); + if (!ret) { + snprintf(uc_plat->name, LED_MAX_NAME_SIZE, + "%s:%s-%d", + cp ? "" : led_colors[color], + func ? func : "", enumerator); + } else { + snprintf(uc_plat->name, LED_MAX_NAME_SIZE, + "%s:%s", + cp ? "" : led_colors[color], + func ? func : ""); + } + uc_plat->label = uc_plat->name; + } + + return uc_plat->label; +} + +static const char *led_get_label(struct udevice *dev, ofnode node) { const char *label; label = ofnode_read_string(node, "label"); + if (!label) + label = led_get_function_name(dev); if (!label && !ofnode_read_string(node, "compatible")) label = ofnode_get_name(node); @@ -249,7 +311,7 @@ static int led_post_bind(struct udevice *dev) const char *default_state; if (!uc_plat->label) - uc_plat->label = led_get_label(dev_ofnode(dev)); + uc_plat->label = led_get_label(dev, dev_ofnode(dev)); uc_plat->default_state = LEDST_COUNT; @@ -314,14 +376,14 @@ static int led_init(struct uclass *uc) #ifdef CONFIG_LED_BOOT ret = ofnode_options_get_by_phandle("boot-led", &led_node); if (!ret) - priv->boot_led_label = led_get_label(led_node); + priv->boot_led_label = led_get_label(NULL, led_node); priv->boot_led_period = ofnode_options_read_int("boot-led-period-ms", 250); #endif #ifdef CONFIG_LED_ACTIVITY ret = ofnode_options_get_by_phandle("activity-led", &led_node); if (!ret) - priv->activity_led_label = led_get_label(led_node); + priv->activity_led_label = led_get_label(NULL, led_node); priv->activity_led_period = ofnode_options_read_int("activity-led-period-ms", 250); #endif diff --git a/include/dt-bindings/leds/common.h b/include/dt-bindings/leds/common.h new file mode 100644 index 00000000000..4f017bea012 --- /dev/null +++ b/include/dt-bindings/leds/common.h @@ -0,0 +1,114 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * This header provides macros for the common LEDs device tree bindings. + * + * Copyright (C) 2015, Samsung Electronics Co., Ltd. + * Author: Jacek Anaszewski <j.anaszewski(a)samsung.com> + * + * Copyright (C) 2019 Jacek Anaszewski <jacek.anaszewski(a)gmail.com> + * Copyright (C) 2020 Pavel Machek <pavel(a)ucw.cz> + */ + +#ifndef __DT_BINDINGS_LEDS_H +#define __DT_BINDINGS_LEDS_H + +/* External trigger type */ +#define LEDS_TRIG_TYPE_EDGE 0 +#define LEDS_TRIG_TYPE_LEVEL 1 + +/* Boost modes */ +#define LEDS_BOOST_OFF 0 +#define LEDS_BOOST_ADAPTIVE 1 +#define LEDS_BOOST_FIXED 2 + +/* Standard LED colors */ +#define LED_COLOR_ID_WHITE 0 +#define LED_COLOR_ID_RED 1 +#define LED_COLOR_ID_GREEN 2 +#define LED_COLOR_ID_BLUE 3 +#define LED_COLOR_ID_AMBER 4 +#define LED_COLOR_ID_VIOLET 5 +#define LED_COLOR_ID_YELLOW 6 +#define LED_COLOR_ID_IR 7 +#define LED_COLOR_ID_MULTI 8 /* For multicolor LEDs */ +#define LED_COLOR_ID_RGB 9 /* For multicolor LEDs that can do arbitrary color, + so this would include RGBW and similar */ +#define LED_COLOR_ID_PURPLE 10 +#define LED_COLOR_ID_ORANGE 11 +#define LED_COLOR_ID_PINK 12 +#define LED_COLOR_ID_CYAN 13 +#define LED_COLOR_ID_LIME 14 +#define LED_COLOR_ID_MAX 15 + +/* Standard LED functions */ +/* Keyboard LEDs, usually it would be input4::capslock etc. */ +/* Obsolete equivalent: "shift-key-light" */ +#define LED_FUNCTION_CAPSLOCK "capslock" +#define LED_FUNCTION_SCROLLLOCK "scrolllock" +#define LED_FUNCTION_NUMLOCK "numlock" +#define LED_FUNCTION_FNLOCK "fnlock" +/* Obsolete equivalents: "tpacpi::thinklight" (IBM/Lenovo Thinkpads), + "lp5523:kb{1,2,3,4,5,6}" (Nokia N900) */ +#define LED_FUNCTION_KBD_BACKLIGHT "kbd_backlight" + +/* System LEDs, usually found on system body. + platform::mute (etc) is sometimes seen, :mute would be better */ +#define LED_FUNCTION_POWER "power" +#define LED_FUNCTION_DISK "disk" + +/* Obsolete: "platform:*:charging" (allwinner sun50i) */ +#define LED_FUNCTION_CHARGING "charging" +/* Used RGB notification LEDs common on phones. + Obsolete equivalents: "status-led:{red,green,blue}" (Motorola Droid 4), + "lp5523:{r,g,b}" (Nokia N900) */ +#define LED_FUNCTION_STATUS "status" + +#define LED_FUNCTION_MICMUTE "micmute" +#define LED_FUNCTION_MUTE "mute" + +/* Used for player LEDs as found on game controllers from e.g. Nintendo, Sony. */ +#define LED_FUNCTION_PLAYER1 "player-1" +#define LED_FUNCTION_PLAYER2 "player-2" +#define LED_FUNCTION_PLAYER3 "player-3" +#define LED_FUNCTION_PLAYER4 "player-4" +#define LED_FUNCTION_PLAYER5 "player-5" + +/* Miscelleaus functions. Use functions above if you can. */ +#define LED_FUNCTION_ACTIVITY "activity" +#define LED_FUNCTION_ALARM "alarm" +#define LED_FUNCTION_BACKLIGHT "backlight" +#define LED_FUNCTION_BLUETOOTH "bluetooth" +#define LED_FUNCTION_BOOT "boot" +#define LED_FUNCTION_CPU "cpu" +#define LED_FUNCTION_DEBUG "debug" +#define LED_FUNCTION_DISK_ACTIVITY "disk-activity" +#define LED_FUNCTION_DISK_ERR "disk-err" +#define LED_FUNCTION_DISK_READ "disk-read" +#define LED_FUNCTION_DISK_WRITE "disk-write" +#define LED_FUNCTION_FAULT "fault" +#define LED_FUNCTION_FLASH "flash" +#define LED_FUNCTION_HEARTBEAT "heartbeat" +#define LED_FUNCTION_INDICATOR "indicator" +#define LED_FUNCTION_LAN "lan" +#define LED_FUNCTION_MAIL "mail" +#define LED_FUNCTION_MOBILE "mobile" +#define LED_FUNCTION_MTD "mtd" +#define LED_FUNCTION_PANIC "panic" +#define LED_FUNCTION_PROGRAMMING "programming" +#define LED_FUNCTION_RX "rx" +#define LED_FUNCTION_SD "sd" +#define LED_FUNCTION_SPEED_LAN "speed-lan" +#define LED_FUNCTION_SPEED_WAN "speed-wan" +#define LED_FUNCTION_STANDBY "standby" +#define LED_FUNCTION_TORCH "torch" +#define LED_FUNCTION_TX "tx" +#define LED_FUNCTION_USB "usb" +#define LED_FUNCTION_WAN "wan" +#define LED_FUNCTION_WAN_ONLINE "wan-online" +#define LED_FUNCTION_WLAN "wlan" +#define LED_FUNCTION_WLAN_2GHZ "wlan-2ghz" +#define LED_FUNCTION_WLAN_5GHZ "wlan-5ghz" +#define LED_FUNCTION_WLAN_6GHZ "wlan-6ghz" +#define LED_FUNCTION_WPS "wps" + +#endif /* __DT_BINDINGS_LEDS_H */ diff --git a/include/led.h b/include/led.h index 64247cd3a70..ba42a5f69d2 100644 --- a/include/led.h +++ b/include/led.h @@ -10,6 +10,7 @@ #include <stdbool.h> #include <cyclic.h> #include <dm/ofnode.h> +#include <linux/uapi/linux/uleds.h> /** * DOC: Overview @@ -86,6 +87,7 @@ struct led_sw_blink { struct led_uc_plat { const char *label; enum led_state_t default_state; + char name[LED_MAX_NAME_SIZE]; #ifdef CONFIG_LED_SW_BLINK struct led_sw_blink *sw_blink; #endif diff --git a/include/linux/uapi/linux/uleds.h b/include/linux/uapi/linux/uleds.h new file mode 100644 index 00000000000..4d32a39965f --- /dev/null +++ b/include/linux/uapi/linux/uleds.h @@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */ +/* + * Userspace driver support for the LED subsystem + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ +#ifndef _UAPI__ULEDS_H_ +#define _UAPI__ULEDS_H_ + +#define LED_MAX_NAME_SIZE 64 + +struct uleds_user_dev { + char name[LED_MAX_NAME_SIZE]; + int max_brightness; +}; + +#endif /* _UAPI__ULEDS_H_ */ diff --git a/test/dm/led.c b/test/dm/led.c index e5b86326c3a..36652c2833a 100644 --- a/test/dm/led.c +++ b/test/dm/led.c @@ -20,7 +20,12 @@ static int dm_test_led_base(struct unit_test_state *uts) ut_assertok(uclass_get_device(UCLASS_LED, 1, &dev)); ut_assertok(uclass_get_device(UCLASS_LED, 2, &dev)); ut_assertok(uclass_get_device(UCLASS_LED, 3, &dev)); - ut_asserteq(-ENODEV, uclass_get_device(UCLASS_LED, 4, &dev)); + ut_assertok(uclass_get_device(UCLASS_LED, 4, &dev)); + ut_assertok(uclass_get_device(UCLASS_LED, 5, &dev)); + ut_assertok(uclass_get_device(UCLASS_LED, 6, &dev)); + ut_assertok(uclass_get_device(UCLASS_LED, 7, &dev)); + ut_assertok(uclass_get_device(UCLASS_LED, 8, &dev)); + ut_asserteq(-ENODEV, uclass_get_device(UCLASS_LED, 9, &dev)); return 0; } @@ -110,6 +115,21 @@ static int dm_test_led_label(struct unit_test_state *uts) ut_asserteq(-ENODEV, led_get_by_label("sandbox:blue", &dev)); + /* Test if function, color and function-enumerator naming works */ + ut_assertok(led_get_by_label("red:status-20", &dev)); + + /* Test if function, color naming works */ + ut_assertok(led_get_by_label("green:status", &dev)); + + /* Test if function, without color naming works */ + ut_assertok(led_get_by_label(":status", &dev)); + + /* Test if color without function naming works */ + ut_assertok(led_get_by_label("green:", &dev)); + + /* Test if function, color naming is ignored if label is found */ + ut_assertok(led_get_by_label("sandbox:function", &dev)); + return 0; } DM_TEST(dm_test_led_label, UTF_SCAN_PDATA | UTF_SCAN_FDT); diff --git a/test/dm/ofnode.c b/test/dm/ofnode.c index f16b643fa3f..72f4e80f637 100644 --- a/test/dm/ofnode.c +++ b/test/dm/ofnode.c @@ -1580,7 +1580,7 @@ static int dm_test_ofnode_delete(struct unit_test_state *uts) ut_assert(!ofnode_valid(node)); ut_assert(!ofnode_valid(ofnode_path("/leds/default_on"))); - ut_asserteq(2, ofnode_get_child_count(ofnode_path("/leds"))); + ut_asserteq(7, ofnode_get_child_count(ofnode_path("/leds"))); return 0; } -- 2.20.1

2 2

[PATCH 1/1] doc: describe creating a pflash file for qemu-system-riscv64
by Heinrich Schuchardt 23 Jan '25

23 Jan '25

U-Boot can be executed in place from a flash device. Describe how this can be emulated on RISC-V QEMU. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- doc/board/emulation/qemu-riscv.rst | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/doc/board/emulation/qemu-riscv.rst b/doc/board/emulation/qemu-riscv.rst index 8388e13d96d..cf2f893b723 100644 --- a/doc/board/emulation/qemu-riscv.rst +++ b/doc/board/emulation/qemu-riscv.rst @@ -42,6 +42,23 @@ use the configurations qemu-riscv32_smode_defconfig and qemu-riscv64_smode_defconfig instead. Note that U-Boot running in supervisor mode requires a supervisor binary interface (SBI), such as RISC-V OpenSBI. +To create a U-Boot binary that can be utilized with a pflash device in QEMU +apply these addtional settings to qemu-riscv64_smode_defconfig: + +:: + + CONFIG_TEXT_BASE=0x20000000 + CONFIG_XIP=y + # CONFIG_AVAILABLE_HARTS is not set + CONFIG_SYS_MONITOR_BASE=0x80200000 + +Truncate the resulting u-boot.bin to 32 MiB. Add the following to your +qemu-system-riscv64 command: + +.. code-block:: bash + + -drive if=pflash,format=raw,unit=0,file=u-boot.bin + Running U-Boot -------------- The minimal QEMU command line to get U-Boot up and running is: -- 2.47.1

1 0

[PATCH 1/1] riscv: AVAILABLE_HARTS is not compatible with XIP
by Heinrich Schuchardt 23 Jan '25

23 Jan '25

If CONFIG_AVAILABLE_HARTS=y, variable available_harts_lock is created in the data section which will not be writable while executing from flash. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- arch/riscv/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index faf70cb5d4c..f4e76db3df4 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -459,6 +459,7 @@ config SPL_XIP config AVAILABLE_HARTS bool "Send IPI by available harts" + depends on !XIP default y help By default, IPI sending mechanism will depend on available_harts. -- 2.47.1

1 0

[PATCH 0/4] Introduce K3 remoteproc driver for M4 subsystem
by Judith Mendez 23 Jan '25

23 Jan '25

Some K3 devices like am62x and am64x have a M4 processor in the MCU voltage domain. This patch series introduces remoteproc M4 driver which will be used to load firmware into and start the M4 remote core. This series also adds support for R5F cores on am64x SoCs in patch 2/4, sets up environment to load FW in remote cores in patch 3/4, and enables config options for R5F and M4 remoteproc support in patch 4/4. This patch series was tested on am64x EVM using commands: => setenv dorprocboot 1 => run boot_rprocs Hari Nagalla (4): remoteproc: k3-m4: Introduce K3 remote proc driver for M4 subsystem remoteproc: k3-r5: Add support for R5F cores on AM64x SoCs env: ti: am64x: set rproc_fw_binaries configs: am64x_evm_a53_defconfig: Enable R5F and M4 remote proc support board/ti/am64x/am64x.env | 6 + configs/am64x_evm_a53_defconfig | 2 + drivers/remoteproc/Kconfig | 10 + drivers/remoteproc/Makefile | 1 + drivers/remoteproc/ti_k3_m4_rproc.c | 411 +++++++++++++++++++++++++++ drivers/remoteproc/ti_k3_r5f_rproc.c | 2 + 6 files changed, 432 insertions(+) create mode 100644 drivers/remoteproc/ti_k3_m4_rproc.c -- 2.48.0

1 4

[PULL] Please pull qcom/qcom-next
by Caleb Connolly 22 Jan '25

22 Jan '25

Hi Tom, The highlights are: * Fixed boot regression due to broken memory parsing * Enable HW RNG and KASLR on all platforms * Add support for Snapdragon X1 Elite hardware (clk/pinctrl) * Add support for QCS9100 ride automotive development platform (clk/ufs) * Add support for PCIe on SM8550, SM8650 and X1E * Implement software debounce for PMIC buttons Additionally, some minor improvements to "ufetch" have been pulled in: * Show CPU architecture (arm/mips/etc) * Make CONFIG_BLK optional * Fix 32-bit support The following changes since commit 82d262ae162d859d3b0bbcd40a9464e890b009da: Merge patch series "MediaTek MT7629 OF_UPSTREAM migration (v2)" (2025-01-21 09:29:05 -0600) are available in the Git repository at: git@source.denx.de:/u-boot/custodians/u-boot-snapdragon.git HEAD for you to fetch changes up to 599a1f9076d34c29d3683e0f833706478d62d9e0: MAINTAINERS: maintain qcs9100_defconfig (2025-01-22 17:14:24 +0100) ---------------------------------------------------------------- Caleb Connolly (2): button: qcom-pmic: add software debounce MAINTAINERS: maintain qcs9100_defconfig J. Neuschäfer (3): cmd: ufetch: Fix type mismatch on 32-bit cmd: Allow building ufetch without CONFIG_BLK cmd: ufetch: Show CPU architecture under "CPU" Neil Armstrong (17): clk: qcom: Add X1E80100 clock driver qcom_defconfig: enable X1E80100 clock driver pinctrl: qcom: Add X1E80100 pinctrl driver qcom_defconfig: enable X1E80100 pinctrl driver pinctrl: qcom: sm8550: add pcie1_clk_req_n function pinctrl: qcom: sm8650: add pcie[01]_clk_req_n function pinctrl: qcom: x1e80100: add pcie[3456ab]_clk functions regulator: qcom-rpmh-regulator: add support for pmc8380 regulators clk: qcom: add clk_phy_mux_enable() for PCIe PIPE clock clk: qcom: sm8550: add support for PCIe clocks clk: qcom: sm8650: add support for PCIe clocks clk: qcom: x1e80100: add support for PCIe clocks rng: msm: add support for newer Qualcomm hwrandom IPs configs: qcom_defconfig: enable RNG driver and command pci: pcie_dw_common: introduce pcie_dw_find_capability() pci: Add support for Qualcomm PCIe controller phy: qcom: add QMP PCIe PHY driver Sam Day (1): mach-snapdragon: pass fdt to qcom_parse_memory Tengfei Fan (1): arm64: dts: qcom: qcs9100: Add support for the QCS9100 Ride and Ride Rev3 boards Varadarajan Narayanan (5): dts: qcs9100-ride-r3-u-boot: add override dtsi clk/qcom: add initial clock driver for qcs9100 phy: qcom: Add SA8775 to QMP UFS PHY driver qcom_defconfig: enable SA8775P clock driver configs: add qcs9100_defconfig MAINTAINERS | 1 + arch/arm/dts/qcs9100-ride-r3-u-boot.dtsi | 20 + arch/arm/mach-snapdragon/board.c | 15 +- cmd/Kconfig | 1 - cmd/ufetch.c | 17 +- configs/qcom_defconfig | 6 + configs/qcs9100_defconfig | 18 + drivers/button/button-qcom-pmic.c | 14 +- drivers/clk/qcom/Kconfig | 16 + drivers/clk/qcom/Makefile | 2 + drivers/clk/qcom/clock-qcom.c | 19 + drivers/clk/qcom/clock-qcom.h | 2 + drivers/clk/qcom/clock-sa8775p.c | 142 +++ drivers/clk/qcom/clock-sm8550.c | 36 + drivers/clk/qcom/clock-sm8650.c | 36 + drivers/clk/qcom/clock-x1e80100.c | 402 +++++++ drivers/pci/Kconfig | 8 + drivers/pci/Makefile | 1 + drivers/pci/pcie_dw_common.c | 42 + drivers/pci/pcie_dw_common.h | 2 + drivers/pci/pcie_dw_qcom.c | 571 ++++++++++ drivers/phy/qcom/Kconfig | 6 + drivers/phy/qcom/Makefile | 1 + drivers/phy/qcom/phy-qcom-qmp-pcie-qhp.h | 123 +++ drivers/phy/qcom/phy-qcom-qmp-pcie.c | 1131 ++++++++++++++++++++ drivers/phy/qcom/phy-qcom-qmp-pcs-misc-v3.h | 17 + drivers/phy/qcom/phy-qcom-qmp-pcs-pcie-v4.h | 72 ++ drivers/phy/qcom/phy-qcom-qmp-pcs-pcie-v4_20.h | 19 + drivers/phy/qcom/phy-qcom-qmp-pcs-pcie-v5.h | 17 + drivers/phy/qcom/phy-qcom-qmp-pcs-pcie-v5_20.h | 23 + drivers/phy/qcom/phy-qcom-qmp-pcs-pcie-v6.h | 17 + drivers/phy/qcom/phy-qcom-qmp-pcs-pcie-v6_20.h | 25 + drivers/phy/qcom/phy-qcom-qmp-pcs-v5.h | 34 + drivers/phy/qcom/phy-qcom-qmp-pcs-v6.h | 32 + drivers/phy/qcom/phy-qcom-qmp-pcs-v6_20.h | 19 + drivers/phy/qcom/phy-qcom-qmp-qserdes-com-v5.h | 124 +++ drivers/phy/qcom/phy-qcom-qmp-qserdes-ln-shrd-v6.h | 32 + drivers/phy/qcom/phy-qcom-qmp-qserdes-txrx-v5.h | 231 ++++ drivers/phy/qcom/phy-qcom-qmp-qserdes-txrx-v6.h | 83 ++ drivers/phy/qcom/phy-qcom-qmp-qserdes-txrx-v6_20.h | 51 + drivers/phy/qcom/phy-qcom-qmp-ufs.c | 171 +++ drivers/pinctrl/qcom/Kconfig | 7 + drivers/pinctrl/qcom/Makefile | 1 + drivers/pinctrl/qcom/pinctrl-sm8550.c | 1 + drivers/pinctrl/qcom/pinctrl-sm8650.c | 2 + drivers/pinctrl/qcom/pinctrl-x1e80100.c | 105 ++ drivers/power/regulator/qcom-rpmh-regulator.c | 19 + drivers/rng/msm_rng.c | 13 +- dts/upstream/src/arm64/qcom/qcs9100-ride-r3.dts | 11 + dts/upstream/src/arm64/qcom/qcs9100-ride.dts | 11 + include/pci.h | 4 + 51 files changed, 3756 insertions(+), 17 deletions(-) create mode 100644 arch/arm/dts/qcs9100-ride-r3-u-boot.dtsi create mode 100644 configs/qcs9100_defconfig create mode 100644 drivers/clk/qcom/clock-sa8775p.c create mode 100644 drivers/clk/qcom/clock-x1e80100.c create mode 100644 drivers/pci/pcie_dw_qcom.c create mode 100644 drivers/phy/qcom/phy-qcom-qmp-pcie-qhp.h create mode 100644 drivers/phy/qcom/phy-qcom-qmp-pcie.c create mode 100644 drivers/phy/qcom/phy-qcom-qmp-pcs-misc-v3.h create mode 100644 drivers/phy/qcom/phy-qcom-qmp-pcs-pcie-v4.h create mode 100644 drivers/phy/qcom/phy-qcom-qmp-pcs-pcie-v4_20.h create mode 100644 drivers/phy/qcom/phy-qcom-qmp-pcs-pcie-v5.h create mode 100644 drivers/phy/qcom/phy-qcom-qmp-pcs-pcie-v5_20.h create mode 100644 drivers/phy/qcom/phy-qcom-qmp-pcs-pcie-v6.h create mode 100644 drivers/phy/qcom/phy-qcom-qmp-pcs-pcie-v6_20.h create mode 100644 drivers/phy/qcom/phy-qcom-qmp-pcs-v5.h create mode 100644 drivers/phy/qcom/phy-qcom-qmp-pcs-v6.h create mode 100644 drivers/phy/qcom/phy-qcom-qmp-pcs-v6_20.h create mode 100644 drivers/phy/qcom/phy-qcom-qmp-qserdes-com-v5.h create mode 100644 drivers/phy/qcom/phy-qcom-qmp-qserdes-ln-shrd-v6.h create mode 100644 drivers/phy/qcom/phy-qcom-qmp-qserdes-txrx-v5.h create mode 100644 drivers/phy/qcom/phy-qcom-qmp-qserdes-txrx-v6.h create mode 100644 drivers/phy/qcom/phy-qcom-qmp-qserdes-txrx-v6_20.h create mode 100644 drivers/pinctrl/qcom/pinctrl-x1e80100.c create mode 100644 dts/upstream/src/arm64/qcom/qcs9100-ride-r3.dts create mode 100644 dts/upstream/src/arm64/qcom/qcs9100-ride.dts

2 1

Please pull u-boot-watchdog/master
by Stefan Roese 22 Jan '25

22 Jan '25

Hi Tom, please pull the following watchdog related patches: ---------------------------------------------------------------- - cyclic: Fix rollover every 72 min on 32 bits platforms (Patrice) ---------------------------------------------------------------- Here the Azure build, without any issues: https://dev.azure.com/sr0718/u-boot/_build/results?buildId=381&view=results Thanks, Stefan The following changes since commit 82d262ae162d859d3b0bbcd40a9464e890b009da: Merge patch series "MediaTek MT7629 OF_UPSTREAM migration (v2)" (2025-01-21 09:29:05 -0600) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-watchdog.git for you to fetch changes up to fb30f75655cdd1bf838827a8461b3434c07b1a62: cyclic: Fix typo in struct cyclic_info description (2025-01-22 10:22:34 +0100) ---------------------------------------------------------------- Patrice Chotard (2): cyclic: Fix rollover every 72 min on 32 bits platforms cyclic: Fix typo in struct cyclic_info description common/cyclic.c | 6 +++--- include/cyclic.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)

2 1

[PATCH] spi: cadence-quadspi: fix potential malfunction after ~49 days uptime
by Ronald Wahl 22 Jan '25

22 Jan '25

From: Ronald Wahl <ronald.wahl(a)legrand.com> The get_timer function returns an unsigned long which may be calculated from the ARM system counter. This counter is reset only on a cold reset. U-boot divides this counter down to a 1000 Hz counter that will cross the 32bit barrier after a bit more than 49 days. Assigning the value to an unsigned int will truncate it on 64bit systems. Passing this truncated value back to the get_timer function will return a very large value that is certainly larger than the timeout and so will go down the error path and besides stopping U-Boot will lead to messages like "SPI: QSPI is still busy after poll for 5000 ms." Signed-off-by: Ronald Wahl <ronald.wahl(a)legrand.com> Cc: Vignesh R <vigneshr(a)ti.com> Cc: Pratyush Yadav <p.yadav(a)ti.com> --- drivers/spi/cadence_qspi_apb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/spi/cadence_qspi_apb.c b/drivers/spi/cadence_qspi_apb.c index 93ab2b5635..f2f69cf9f1 100644 --- a/drivers/spi/cadence_qspi_apb.c +++ b/drivers/spi/cadence_qspi_apb.c @@ -151,9 +151,9 @@ static int cadence_qspi_set_protocol(struct cadence_spi_priv *priv, /* Return 1 if idle, otherwise return 0 (busy). */ static unsigned int cadence_qspi_wait_idle(void *reg_base) { - unsigned int start, count = 0; + unsigned long start, count = 0; /* timeout in unit of ms */ - unsigned int timeout = 5000; + unsigned long timeout = 5000; start = get_timer(0); for ( ; get_timer(start) < timeout ; ) { @@ -170,7 +170,7 @@ static unsigned int cadence_qspi_wait_idle(void *reg_base) } /* Timeout, still in busy mode. */ - printf("QSPI: QSPI is still busy after poll for %d ms.\n", timeout); + printf("QSPI: QSPI is still busy after poll for %lu ms.\n", timeout); return 0; } -- 2.47.1

3 3

[PATCH v2 0/2] spi: Collected fixes
by Alexander Dahl 22 Jan '25

22 Jan '25

Hello, two patches for header issues I came across when working on (Q)SPI drivers for atmel boards. Greets Alex v1: - implicit, not a series but a single patch no one reacted to - Link: https://lore.kernel.org/u-boot/20241218160947.681253-1-ada@thorsis.com/ v2: - resend patch 1/2 - add new patch 2/2 Cc: Tom Rini <trini(a)konsulko.com> Cc: Jagan Teki <jagan(a)amarulasolutions.com> Alexander Dahl (2): spi: atmel: Really drop atmel_spi.h Revert "mem: spi-mem: add declaration for spi_mem_default_supports_op" drivers/spi/atmel_spi.h | 86 ----------------------------------------- include/spi-mem.h | 3 -- 2 files changed, 89 deletions(-) delete mode 100644 drivers/spi/atmel_spi.h base-commit: e26a9ac4c6900cac2fa043ac50a3a3c038f4505d -- 2.39.5

2 3

[PATCH] vexpress64: Fix bootargs when building without NET
by Chanho Park 22 Jan '25

22 Jan '25

When building without DHCP/PXE configurations (NET disabled), compilation errors may occur due to mismatched bootargs. Ensure bootargs related to DHCP/PXE are not enabled if the corresponding commands are disabled. include/config_distro_bootcmd.h:443:9: error: expected ‘}’ before ‘BOOT_TARGET_DEVICES_references_PXE_without_CONFIG_CMD_DHCP_or_PXE’ 443 | BOOT_TARGET_DEVICES_references_PXE_without_CONFIG_CMD_DHCP_or_PXE | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Chanho Park <parkch98(a)gmail.com> --- include/configs/vexpress_aemv8.h | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h index 8020689e39ee..b5a17f93efca 100644 --- a/include/configs/vexpress_aemv8.h +++ b/include/configs/vexpress_aemv8.h @@ -154,6 +154,18 @@ #define FUNC_MMC(func) #endif +#if CONFIG_IS_ENABLED(CMD_PXE) +#define BOOT_TARGET_PXE(func) func(PXE, pxe, na) +#else +#define BOOT_TARGET_PXE(func) +#endif + +#if CONFIG_IS_ENABLED(CMD_DHCP) +#define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na) +#else +#define BOOT_TARGET_DHCP(func) +#endif + /* * Boot by loading an Android image, or kernel, initrd and FDT through * semihosting into DRAM. @@ -188,8 +200,8 @@ func(SATA, sata, 0) \ func(SATA, sata, 1) \ FUNC_VIRTIO(func) \ - func(PXE, pxe, na) \ - func(DHCP, dhcp, na) \ + BOOT_TARGET_PXE(func) \ + BOOT_TARGET_DHCP(func) \ func(AFS, afs, na) #define VEXPRESS_KERNEL_ADDR 0x80080000 @@ -212,8 +224,8 @@ func(MEM, mem, na) \ FUNC_VIRTIO(func) \ FUNC_MMC(func) \ - func(PXE, pxe, na) \ - func(DHCP, dhcp, na) + BOOT_TARGET_PXE(func) \ + BOOT_TARGET_DHCP(func) #define VEXPRESS_KERNEL_ADDR 0x80080000 #define VEXPRESS_PXEFILE_ADDR 0x8fa00000 @@ -234,8 +246,8 @@ #define BOOT_TARGET_DEVICES(func) \ func(MEM, mem, na) \ FUNC_VIRTIO(func) \ - func(PXE, pxe, na) \ - func(DHCP, dhcp, na) + BOOT_TARGET_PXE(func) \ + BOOT_TARGET_DHCP(func) #define VEXPRESS_KERNEL_ADDR 0x00200000 #define VEXPRESS_PXEFILE_ADDR 0x0fb00000 -- 2.43.0

3 2

[PATCH 0/2] Update my email address
by Christopher Obbard 22 Jan '25

22 Jan '25

Update my email address for various locations in the U-Boot project. This will (hopefully) stop any mails from going to /dev/null. --- Christopher Obbard (2): .mailmap: update email address for Christopher Obbard board: rockpi4-rk3399: update email address for Christopher Obbard .mailmap | 1 + board/radxa/rockpi4-rk3399/MAINTAINERS | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) --- base-commit: 4eb937058ffd9d413929f566246eb684efe8eab5 change-id: 20250115-wip-obbardc-update-email-b78477a2d396 Best regards, -- Christopher Obbard <christopher.obbard(a)linaro.org>

2 3