May 2022 - U-Boot

Pull request: u-boot-sunxi/master fixes for v2022.07
by Andre Przywara 25 May '22

25 May '22

Hi Tom, please pull the master branch from u-boot-sunxi, containing fixes and updates for 2022.07. The bulk of it is (finally!) some DT sync from the kernel. We refrained from syncing one incompatible change, as this would spoil booting Linux kernels before v5.13 with U-Boot's DT (via UEFI, for instance). I test booted Linux v5.18 and v5.4 with that new DT on some boards, and the headless peripherals (MMC, USB, Ethernet) seemed to work. The rest are fixes: - silencing missing clock warnings due to the new pinctrl driver - fixing "UART0 on PortF", allowing UART access through the SD card pins - add an F1C100s clock driver, to enable MMC support (SPI comes later) - some cleanups for CONS_INDEX_n in Kconfig Tested on BananaPi-M1, Pine64-LTS, Pine-H64, X96-Mate (H616) and OrangePi-Zero. Thanks, Andre =============== The following changes since commit 6f00b97d7e5760d92566317dde6c4b9224790827: Merge https://source.denx.de/u-boot/custodians/u-boot-usb (2022-05-20 22:07:56 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-sunxi.git master for you to fetch changes up to 7495051219b64ec0e8fac8930586dc10666530da: serial: Remove obsolete CONS_INDEX_n Kconfig options (2022-05-24 01:46:06 +0100) ---------------------------------------------------------------- Andre Przywara (5): sunxi: F1C100s: update DT files from Linux Revert "sunxi: f1c100s: Drop SYSRESET to enable reset functionality" clk: sunxi: add PIO bus gate clocks clk: sunxi: add and use dummy gate clocks sunxi: board: Fix UART PortF pinmux setup George Hilliard (1): clk: sunxi: implement clock driver for suniv f1c100s Samuel Holland (17): dt-bindings: sunxi: Update clock/reset binding headers ARM: dts: sunxi: Remove unused devicetree headers ARM: dts: sun7i: Sync from Linux v5.18-rc1 ARM: dts: sun4i: Sync from Linux v5.18-rc1 ARM: dts: sunxi: A13/A31/A23/A33: Sync from Linux v5.18-rc1 ARM: dts: sun9i: Sync from Linux v5.18-rc1 ARM: dts: sun8i: A83T: Sync from Linux v5.18-rc1 ARM: dts: sunxi: H2+/H3/H5: Sync from Linux v5.18-rc1 ARM: dts: sun8i: V3/V3s/S3: Sync from Linux v5.18-rc1 ARM: dts: sun8i: R40/T3: Sync from Linux v5.18-rc1 ARM: dts: sun50i: A64: Sync from Linux v5.18-rc1 ARM: dts: sun50i: H6: Sync from Linux v5.18-rc1 sunxi: Skip MMC0 init when its pinmux conflicts with UART0 mmc: sunxi: Remove unnecessary pinmux option dependency clk: sunxi: h6_r: Correct the driver name sunxi: Remove obsolete Kconfig selections serial: Remove obsolete CONS_INDEX_n Kconfig options arch/arm/dts/Makefile | 22 +- arch/arm/dts/axp22x.dtsi | 11 +- arch/arm/dts/axp803.dtsi | 10 +- arch/arm/dts/axp81x.dtsi | 15 +- arch/arm/dts/sun4i-a10-inet97fv2.dts | 22 +- arch/arm/dts/sun50i-a64-cpu-opp.dtsi | 2 +- arch/arm/dts/sun50i-a64-orangepi-win.dts | 2 +- arch/arm/dts/sun50i-a64-pinebook.dts | 1 + arch/arm/dts/sun50i-a64-pinephone.dtsi | 27 ++ arch/arm/dts/sun50i-a64-pinetab.dts | 29 +- arch/arm/dts/sun50i-a64-teres-i.dts | 4 +- arch/arm/dts/sun50i-a64.dtsi | 93 ++++-- arch/arm/dts/sun50i-h5-cpu-opp.dtsi | 2 +- arch/arm/dts/sun50i-h5-nanopi-r1s-h5.dts | 9 +- arch/arm/dts/sun50i-h5.dtsi | 6 +- arch/arm/dts/sun50i-h6-beelink-gs1.dts | 38 +-- arch/arm/dts/sun50i-h6-cpu-opp.dtsi | 2 +- arch/arm/dts/sun50i-h6-orangepi-3.dts | 14 +- arch/arm/dts/sun50i-h6-orangepi.dtsi | 22 +- arch/arm/dts/sun50i-h6-pine-h64-model-b.dts | 51 ++++ arch/arm/dts/sun50i-h6-tanix-tx6-mini.dts | 15 + arch/arm/dts/sun50i-h6-tanix-tx6.dts | 115 +------ arch/arm/dts/sun50i-h6-tanix.dtsi | 189 ++++++++++++ arch/arm/dts/sun50i-h6.dtsi | 26 +- arch/arm/dts/sun5i-a10s-auxtek-t003.dts | 16 +- arch/arm/dts/sun5i-a10s-auxtek-t004.dts | 35 +-- arch/arm/dts/sun5i-a10s-mk802.dts | 31 +- arch/arm/dts/sun5i-a10s-olinuxino-micro.dts | 68 +---- arch/arm/dts/sun5i-a10s-r7-tv-dongle.dts | 22 +- arch/arm/dts/sun5i-a10s-wobo-i5.dts | 34 +-- arch/arm/dts/sun5i-a10s.dtsi | 30 +- arch/arm/dts/sun5i-a13-ampe-a76.dts | 2 +- arch/arm/dts/sun5i-a13-empire-electronix-d709.dts | 41 +-- arch/arm/dts/sun5i-a13-hsg-h702.dts | 37 +-- arch/arm/dts/sun5i-a13-inet-86vs.dts | 2 +- ...i-q8-common.dtsi => sun5i-a13-licheepi-one.dts} | 146 +++++---- arch/arm/dts/sun5i-a13-olinuxino-micro.dts | 50 +--- arch/arm/dts/sun5i-a13-olinuxino.dts | 56 +--- arch/arm/dts/sun5i-a13-pocketbook-touch-lux-3.dts | 258 ++++++++++++++++ arch/arm/dts/sun5i-a13-q8-tablet.dts | 18 +- arch/arm/dts/sun5i-a13-utoo-p66.dts | 26 +- arch/arm/dts/sun5i-a13.dtsi | 23 +- arch/arm/dts/sun5i-gr8-chip-pro.dts | 38 +-- arch/arm/dts/sun5i-gr8-evb.dts | 333 +++++++++++++++++++++ arch/arm/dts/sun5i-gr8.dtsi | 12 +- arch/arm/dts/sun5i-r8-chip.dts | 52 +--- arch/arm/dts/sun5i-reference-design-tablet.dtsi | 57 +--- arch/arm/dts/sun5i.dtsi | 209 ++++++++----- arch/arm/dts/sun6i-a31-app4-evb1.dts | 10 +- arch/arm/dts/sun6i-a31-colombus.dts | 57 +--- arch/arm/dts/sun6i-a31-hummingbird.dts | 75 ++--- arch/arm/dts/sun6i-a31-i7.dts | 47 +-- arch/arm/dts/sun6i-a31-m9.dts | 46 +-- arch/arm/dts/sun6i-a31-mele-a1000g-quad.dts | 46 +-- arch/arm/dts/sun6i-a31-mixtile-loftq.dts | 6 +- arch/arm/dts/sun6i-a31.dtsi | 218 ++++++++------ arch/arm/dts/sun6i-a31s-colorfly-e708-q1.dts | 2 +- arch/arm/dts/sun6i-a31s-cs908.dts | 17 +- arch/arm/dts/sun6i-a31s-inet-q972.dts | 8 +- arch/arm/dts/sun6i-a31s-primo81.dts | 32 +- arch/arm/dts/sun6i-a31s-sina31s-core.dtsi | 4 +- arch/arm/dts/sun6i-a31s-sina31s.dts | 39 +-- arch/arm/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 144 +++++---- .../arm/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts | 22 +- arch/arm/dts/sun6i-reference-design-tablet.dtsi | 22 +- arch/arm/dts/sun7i-a20-bananapi-m1-plus.dts | 16 +- arch/arm/dts/sun7i-a20-bananapi.dts | 41 ++- arch/arm/dts/sun7i-a20-bananapro.dts | 16 +- arch/arm/dts/sun7i-a20-cubieboard2.dts | 28 +- arch/arm/dts/sun7i-a20-cubietruck.dts | 20 +- arch/arm/dts/sun7i-a20-haoyu-marsboard.dts | 182 +++++++++++ arch/arm/dts/sun7i-a20-hummingbird.dts | 21 +- arch/arm/dts/sun7i-a20-i12-tvbox.dts | 16 +- arch/arm/dts/sun7i-a20-icnova-swac.dts | 15 +- arch/arm/dts/sun7i-a20-itead-ibox.dts | 8 +- arch/arm/dts/sun7i-a20-lamobo-r1.dts | 16 +- arch/arm/dts/sun7i-a20-linutronix-testbox-v2.dts | 47 +++ arch/arm/dts/sun7i-a20-m3.dts | 14 +- arch/arm/dts/sun7i-a20-m5.dts | 2 + arch/arm/dts/sun7i-a20-olimex-som-evb.dts | 14 +- arch/arm/dts/sun7i-a20-olimex-som204-evb.dts | 30 +- arch/arm/dts/sun7i-a20-olinuxino-lime-emmc.dts | 32 ++ arch/arm/dts/sun7i-a20-olinuxino-lime.dts | 32 +- arch/arm/dts/sun7i-a20-olinuxino-lime2.dts | 46 +-- arch/arm/dts/sun7i-a20-olinuxino-micro.dts | 32 +- arch/arm/dts/sun7i-a20-orangepi-mini.dts | 28 +- arch/arm/dts/sun7i-a20-orangepi.dts | 26 +- arch/arm/dts/sun7i-a20-pcduino3-nano.dts | 32 +- arch/arm/dts/sun7i-a20-pcduino3.dts | 28 +- arch/arm/dts/sun7i-a20-wexler-tab7200.dts | 13 +- arch/arm/dts/sun7i-a20-wits-pro-a20-dkt.dts | 24 +- arch/arm/dts/sun7i-a20.dtsi | 254 ++++++++++++++-- arch/arm/dts/sun8i-a23-a33.dtsi | 308 +++++++++++++++---- arch/arm/dts/sun8i-a23-evb.dts | 20 +- arch/arm/dts/sun8i-a23-gt90h-v4.dts | 2 +- ...-q8-common.dtsi => sun8i-a23-ippo-q8h-v1.2.dts} | 54 ++-- arch/arm/dts/sun8i-a23-ippo-q8h-v5.dts | 73 +++++ arch/arm/dts/sun8i-a23-polaroid-mid2407pxe03.dts | 15 +- arch/arm/dts/sun8i-a23-polaroid-mid2809pxe04.dts | 15 +- arch/arm/dts/sun8i-a23-q8-tablet.dts | 10 + arch/arm/dts/sun8i-a23.dtsi | 26 +- ...lassic-edition.dts => sun8i-a33-et-q8-v1.6.dts} | 32 +- arch/arm/dts/sun8i-a33-ga10h-v1.1.dts | 4 +- arch/arm/dts/sun8i-a33-inet-d978-rev2.dts | 14 +- arch/arm/dts/sun8i-a33-ippo-q8h-v1.2.dts | 57 ++++ arch/arm/dts/sun8i-a33-olinuxino.dts | 12 +- arch/arm/dts/sun8i-a33-q8-tablet.dts | 7 + arch/arm/dts/sun8i-a33-sinlinx-sina33.dts | 34 +-- arch/arm/dts/sun8i-a33.dtsi | 270 ++++++----------- arch/arm/dts/sun8i-a83t-allwinner-h8homlet-v2.dts | 12 + arch/arm/dts/sun8i-a83t-bananapi-m3.dts | 55 +++- arch/arm/dts/sun8i-a83t-cubietruck-plus.dts | 77 ++++- arch/arm/dts/sun8i-a83t-tbs-a711.dts | 101 ++++++- arch/arm/dts/sun8i-a83t.dtsi | 311 ++++++++++++++++--- arch/arm/dts/sun8i-h2-plus-bananapi-m2-zero.dts | 28 +- arch/arm/dts/sun8i-h3-beelink-x2.dts | 27 +- arch/arm/dts/sun8i-h3-nanopi-neo-air.dts | 28 ++ arch/arm/dts/sun8i-h3-nanopi-r1.dts | 169 +++++++++++ arch/arm/dts/sun8i-h3-nanopi.dtsi | 1 + arch/arm/dts/sun8i-h3-orangepi-2.dts | 3 +- arch/arm/dts/sun8i-h3-orangepi-pc.dts | 3 +- arch/arm/dts/sun8i-h3.dtsi | 10 +- arch/arm/dts/sun8i-q8-common.dtsi | 31 +- arch/arm/dts/sun8i-r16-bananapi-m2m.dts | 55 ++-- arch/arm/dts/sun8i-r16-nintendo-nes-classic.dts | 54 ++++ .../dts/sun8i-r16-nintendo-super-nes-classic.dts | 11 + arch/arm/dts/sun8i-r16-parrot.dts | 62 +--- arch/arm/dts/sun8i-r40-feta40i.dtsi | 106 +++++++ arch/arm/dts/sun8i-r40-oka40i-c.dts | 203 +++++++++++++ arch/arm/dts/sun8i-r40.dtsi | 118 +++++++- arch/arm/dts/sun8i-reference-design-tablet.dtsi | 33 +- arch/arm/dts/sun8i-s3-elimo-impetus.dtsi | 44 +++ arch/arm/dts/sun8i-s3-elimo-initium.dts | 29 ++ arch/arm/dts/sun8i-s3-pinecube.dts | 13 +- arch/arm/dts/sun8i-t3-cqa3t-bv3.dts | 226 ++++++++++++++ arch/arm/dts/sun8i-v3-sl631-imx179.dts | 12 + arch/arm/dts/sun8i-v3-sl631.dtsi | 138 +++++++++ arch/arm/dts/sun8i-v3.dtsi | 36 +++ arch/arm/dts/sun8i-v3s-licheepi-zero-dock.dts | 17 +- arch/arm/dts/sun8i-v3s.dtsi | 93 +++++- arch/arm/dts/sun9i-a80-cubieboard4.dts | 67 +++-- arch/arm/dts/sun9i-a80-optimus.dts | 50 +++- arch/arm/dts/sun9i-a80.dtsi | 195 +++++++----- arch/arm/dts/suniv-f1c100s-licheepi-nano.dts | 31 ++ arch/arm/dts/suniv-f1c100s.dtsi | 104 ++++++- arch/arm/dts/sunxi-bananapi-m2-plus-v1.2.dtsi | 18 +- arch/arm/dts/sunxi-bananapi-m2-plus.dtsi | 4 +- arch/arm/dts/sunxi-common-regulators.dtsi | 39 --- arch/arm/dts/sunxi-h3-h5.dtsi | 42 ++- arch/arm/dts/sunxi-libretech-all-h3-cc.dtsi | 13 + arch/arm/dts/sunxi-libretech-all-h3-it.dtsi | 2 +- arch/arm/dts/sunxi-reference-design-tablet.dtsi | 11 +- arch/arm/mach-sunxi/Kconfig | 5 +- arch/arm/mach-sunxi/board.c | 13 +- board/sunxi/board.c | 22 +- configs/Nintendo_NES_Classic_Edition_defconfig | 2 +- configs/licheepi_nano_defconfig | 1 - drivers/clk/sunxi/Kconfig | 7 + drivers/clk/sunxi/Makefile | 1 + drivers/clk/sunxi/clk_a10.c | 2 + drivers/clk/sunxi/clk_a10s.c | 2 + drivers/clk/sunxi/clk_a23.c | 2 + drivers/clk/sunxi/clk_a31.c | 2 + drivers/clk/sunxi/clk_a64.c | 4 + drivers/clk/sunxi/clk_a80.c | 2 + drivers/clk/sunxi/clk_a83t.c | 2 + drivers/clk/sunxi/clk_f1c100s.c | 74 +++++ drivers/clk/sunxi/clk_h3.c | 4 + drivers/clk/sunxi/clk_h6.c | 4 + drivers/clk/sunxi/clk_h616.c | 4 + drivers/clk/sunxi/clk_h6_r.c | 6 +- drivers/clk/sunxi/clk_r40.c | 2 + drivers/clk/sunxi/clk_sunxi.c | 3 + drivers/clk/sunxi/clk_v3s.c | 2 + drivers/mmc/Kconfig | 2 +- drivers/serial/Kconfig | 26 -- include/clk/sunxi.h | 5 + include/dt-bindings/clock/sun50i-a64-ccu.h | 2 +- include/dt-bindings/clock/sun5i-ccu.h | 13 +- include/dt-bindings/clock/sun6i-a31-ccu.h | 2 + include/dt-bindings/clock/sun8i-a23-a33-ccu.h | 2 + include/dt-bindings/clock/sun8i-h3-ccu.h | 2 +- include/dt-bindings/clock/sun8i-v3s-ccu.h | 4 + include/dt-bindings/reset/sun5i-ccu.h | 11 +- include/dt-bindings/reset/sun8i-v3s-ccu.h | 3 + 185 files changed, 5516 insertions(+), 2508 deletions(-) create mode 100644 arch/arm/dts/sun50i-h6-pine-h64-model-b.dts create mode 100644 arch/arm/dts/sun50i-h6-tanix-tx6-mini.dts create mode 100644 arch/arm/dts/sun50i-h6-tanix.dtsi rename arch/arm/dts/{sun5i-q8-common.dtsi => sun5i-a13-licheepi-one.dts} (62%) create mode 100644 arch/arm/dts/sun5i-a13-pocketbook-touch-lux-3.dts create mode 100644 arch/arm/dts/sun5i-gr8-evb.dts create mode 100644 arch/arm/dts/sun7i-a20-haoyu-marsboard.dts create mode 100644 arch/arm/dts/sun7i-a20-linutronix-testbox-v2.dts create mode 100644 arch/arm/dts/sun7i-a20-olinuxino-lime-emmc.dts rename arch/arm/dts/{sunxi-q8-common.dtsi => sun8i-a23-ippo-q8h-v1.2.dts} (75%) create mode 100644 arch/arm/dts/sun8i-a23-ippo-q8h-v5.dts rename arch/arm/dts/{sun8i-r16-nintendo-nes-classic-edition.dts => sun8i-a33-et-q8-v1.6.dts} (81%) create mode 100644 arch/arm/dts/sun8i-a33-ippo-q8h-v1.2.dts create mode 100644 arch/arm/dts/sun8i-h3-nanopi-r1.dts create mode 100644 arch/arm/dts/sun8i-r16-nintendo-nes-classic.dts create mode 100644 arch/arm/dts/sun8i-r16-nintendo-super-nes-classic.dts create mode 100644 arch/arm/dts/sun8i-r40-feta40i.dtsi create mode 100644 arch/arm/dts/sun8i-r40-oka40i-c.dts create mode 100644 arch/arm/dts/sun8i-s3-elimo-impetus.dtsi create mode 100644 arch/arm/dts/sun8i-s3-elimo-initium.dts create mode 100644 arch/arm/dts/sun8i-t3-cqa3t-bv3.dts create mode 100644 arch/arm/dts/sun8i-v3-sl631-imx179.dts create mode 100644 arch/arm/dts/sun8i-v3-sl631.dtsi create mode 100644 drivers/clk/sunxi/clk_f1c100s.c

2 1

[PATCH] net: Add missing PCI dependency for CONFIG_E1000
by Pali Rohár 25 May '22

25 May '22

Signed-off-by: Pali Rohár <pali(a)kernel.org> --- drivers/net/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 7fe0e00649cf..84d859c21eb8 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -231,6 +231,7 @@ config DWC_ETH_QOS_TEGRA186 config E1000 bool "Intel PRO/1000 Gigabit Ethernet support" + depends on PCI help This driver supports Intel(R) PRO/1000 gigabit ethernet family of adapters. For more information on how to identify your adapter, go -- 2.20.1

4 5

[PATCH V2] ARM: imx: imx8m: Adjust thermal trip points for Industrial parts
by Adam Ford 25 May '22

25 May '22

If the thermal sensor is enabled in U-Boot, adjust the cpu-thermal trip points for industrial rated parts. This should apply to 8MQ, 8MM, 8MN, and 8MP. Signed-off-by: Adam Ford <aford173(a)gmail.com> Reviewed-by: Tim Harvey <tharvey(a)gateworks.com> --- V2: Switch the check from looking for industrial or checkoing for anything but commerical. This expands the trip point updates other grades as well. diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index 8e23e6da32..7175295c3c 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -30,6 +30,7 @@ #include <fsl_wdog.h> #include <imx_sip.h> #include <linux/bitops.h> +#include <imx_thermal.h> DECLARE_GLOBAL_DATA_PTR; @@ -1207,10 +1208,10 @@ static int cleanup_nodes_for_efi(void *blob) int ft_system_setup(void *blob, struct bd_info *bd) { + __maybe_unused int nodeoff; #ifdef CONFIG_IMX8MQ int i = 0; int rc; - int nodeoff; if (get_boot_device() == USB_BOOT) { disable_dcss_nodes(blob); @@ -1346,6 +1347,24 @@ usb_modify_speed: disable_cpu_nodes(blob, 2); #endif +#if defined(CONFIG_IMX_TMU) + int minc, maxc, prop; + + nodeoff = fdt_path_offset(blob, "/thermal-zones/cpu-thermal/trips"); + + /* Only update non-Commerical grade parts */ + if (get_cpu_temp_grade(&minc, &maxc) != TEMP_COMMERCIAL) { + fdt_for_each_subnode(prop, blob, nodeoff) { + const char *type = fdt_getprop(blob, prop, "type", NULL); + + if (type && (!strcmp("critical", type))) + fdt_setprop_u32(blob, prop, "temperature", maxc * 1000); + else if (type && (!strcmp("passive", type))) + fdt_setprop_u32(blob, prop, "temperature", (maxc - 10) * 1000); + } + } +#endif + cleanup_nodes_for_efi(blob); return 0; } -- 2.34.1

4 13

[PATCH 1/2] doc/efi: add firmware management protocol to the documentation
by Vincent Stehlé 25 May '22

25 May '22

The firmware management protocol can be used to manage device firmware. U-Boot can be configured to provide an implementation. Document the related functions in the API section. Signed-off-by: Vincent Stehlé <vincent.stehle(a)arm.com> Cc: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- doc/api/efi.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/api/efi.rst b/doc/api/efi.rst index cb2a1c897e6..2b96783828b 100644 --- a/doc/api/efi.rst +++ b/doc/api/efi.rst @@ -166,6 +166,12 @@ Unicode Collation protocol .. kernel-doc:: lib/efi_loader/efi_unicode_collation.c :internal: +Firmware management protocol +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +.. kernel-doc:: lib/efi_loader/efi_firmware.c + :internal: + Unit testing ------------ -- 2.35.1

2 3

[PATCH v2] mmc: nuvoton: Add NPCM7xx mmc driver
by Jim Liu 25 May '22

25 May '22

Add Nuvoton BMC NPCM750 mmc control driver. Signed-off-by: Jim Liu <JJLIU0(a)nuvoton.com> --- Changes for v2: - modify kconfig description - use mmc_of_parse - modify U_BOOT_DRIVER and Copyright time --- drivers/mmc/Kconfig | 12 ++++++ drivers/mmc/Makefile | 1 + drivers/mmc/npcm_sdhci.c | 86 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 99 insertions(+) create mode 100644 drivers/mmc/npcm_sdhci.c diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index f04cc44e19..f6a1eb2ac5 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -607,6 +607,18 @@ config MMC_SDHCI_MV If unsure, say N. +config MMC_SDHCI_NPCM + bool "SDHCI support on Nuvoton NPCM device" + depends on MMC_SDHCI + depends on DM_MMC + help + This selects the Secure Digital Host Controller Interface (SDHCI) + on Nuvoton NPCM device. + + If you have a controller with this interface, say Y here. + + If unsure, say N. + config MMC_SDHCI_PIC32 bool "Microchip PIC32 on-chip SDHCI support" depends on DM_MMC && MACH_PIC32 diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index 9627509302..280da24567 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -67,6 +67,7 @@ obj-$(CONFIG_MMC_SDHCI_IPROC) += iproc_sdhci.o obj-$(CONFIG_MMC_SDHCI_KONA) += kona_sdhci.o obj-$(CONFIG_MMC_SDHCI_MSM) += msm_sdhci.o obj-$(CONFIG_MMC_SDHCI_MV) += mv_sdhci.o +obj-$(CONFIG_MMC_SDHCI_NPCM) += npcm_sdhci.o obj-$(CONFIG_MMC_SDHCI_PIC32) += pic32_sdhci.o obj-$(CONFIG_MMC_SDHCI_ROCKCHIP) += rockchip_sdhci.o obj-$(CONFIG_MMC_SDHCI_S5P) += s5p_sdhci.o diff --git a/drivers/mmc/npcm_sdhci.c b/drivers/mmc/npcm_sdhci.c new file mode 100644 index 0000000000..7eb17cce0b --- /dev/null +++ b/drivers/mmc/npcm_sdhci.c @@ -0,0 +1,86 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (c) 2022 Nuvoton Technology Corp. + */ + +#include <common.h> +#include <dm.h> +#include <sdhci.h> +#include <clk.h> +#include <power/regulator.h> + +#define NPCM_SDHC_MIN_FREQ 400000 + +struct npcm_sdhci_plat { + struct mmc_config cfg; + struct mmc mmc; +}; + +static int npcm_sdhci_probe(struct udevice *dev) +{ + struct npcm_sdhci_plat *plat = dev_get_plat(dev); + struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); + struct sdhci_host *host = dev_get_priv(dev); + struct udevice *vqmmc_supply; + int vqmmc_uv, ret; + struct clk clk; + + host->name = dev->name; + host->ioaddr = dev_read_addr_ptr(dev); + host->max_clk = dev_read_u32_default(dev, "clock-frequency", 0); + + ret = clk_get_by_index(dev, 0, &clk); + if (!ret && host->max_clk) { + ret = clk_set_rate(&clk, host->max_clk); + if (ret < 0) + return ret; + } + + if (IS_ENABLED(CONFIG_DM_REGULATOR)) { + device_get_supply_regulator(dev, "vqmmc-supply", &vqmmc_supply); + vqmmc_uv = dev_read_u32_default(dev, "vqmmc-microvolt", 0); + /* Set IO voltage */ + if (vqmmc_supply && vqmmc_uv) + regulator_set_value(vqmmc_supply, vqmmc_uv); + } + + host->index = dev_read_u32_default(dev, "index", 0); + ret = mmc_of_parse(dev, &plat->cfg); + if (ret) + return ret; + + host->mmc = &plat->mmc; + host->mmc->priv = host; + host->mmc->dev = dev; + upriv->mmc = host->mmc; + + ret = sdhci_setup_cfg(&plat->cfg, host, 0, NPCM_SDHC_MIN_FREQ); + if (ret) + return ret; + + return sdhci_probe(dev); +} + +static int npcm_sdhci_bind(struct udevice *dev) +{ + struct npcm_sdhci_plat *plat = dev_get_plat(dev); + + return sdhci_bind(dev, &plat->mmc, &plat->cfg); +} + +static const struct udevice_id npcm_mmc_ids[] = { + { .compatible = "nuvoton,npcm750-sdhci" }, + { .compatible = "nuvoton,npcm845-sdhci" }, + { } +}; + +U_BOOT_DRIVER(npcm_sdhci_drv) = { + .name = "npcm_sdhci", + .id = UCLASS_MMC, + .of_match = npcm_mmc_ids, + .ops = &sdhci_ops, + .bind = npcm_sdhci_bind, + .probe = npcm_sdhci_probe, + .priv_auto = sizeof(struct sdhci_host), + .plat_auto = sizeof(struct npcm_sdhci_plat), +}; -- 2.17.1

2 1

[PATCH] bootmenu: fix bootmenu title handling
by Masahisa Kojima 25 May '22

25 May '22

The commit a3d0aa87acbe ("bootmenu: update bootmenu_entry structure") changes the bootmenu title type from char to u16(UTF16 string) to support EFI based system. If EFI_LOADER is not enabled, printf("%ls") is not supported, so bootmenu does not appear correctly. This commit switches the menu title type from "char" to "u16" only when the EFI_LOADER is enabled. Fixes: a3d0aa87acbe ("bootmenu: update bootmenu_entry structure") Signed-off-by: Masahisa Kojima <masahisa.kojima(a)linaro.org> --- cmd/bootmenu.c | 48 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/cmd/bootmenu.c b/cmd/bootmenu.c index 8859eebea5..e422e0b348 100644 --- a/cmd/bootmenu.c +++ b/cmd/bootmenu.c @@ -20,6 +20,20 @@ /* maximum bootmenu entries */ #define MAX_COUNT 99 +#if (CONFIG_IS_ENABLED(EFI_LOADER)) +#define TITLE_CHAR u16 +#define titlefmt "ls" +#define TITLE_STRDUP u16_strdup +#define TITLE_STRNCPY(d, s, l) utf8_utf16_strncpy(&d, s, l) +#define TITLE_STR(x) u##x +#else +#define TITLE_CHAR char +#define titlefmt "s" +#define TITLE_STRDUP strdup +#define TITLE_STRNCPY(d, s, l) strncpy(d, s, l) +#define TITLE_STR(x) x +#endif + /* maximal size of bootmenu env * 9 = strlen("bootmenu_") * 2 = strlen(MAX_COUNT) @@ -43,7 +57,7 @@ enum boot_type { struct bootmenu_entry { unsigned short int num; /* unique number 0 .. MAX_COUNT */ char key[3]; /* key identifier of number */ - u16 *title; /* title of entry */ + TITLE_CHAR *title; /* title of entry */ char *command; /* hush command of entry */ enum boot_type type; /* boot type of entry */ u16 bootorder; /* order for each boot type */ @@ -76,7 +90,7 @@ static void bootmenu_print_entry(void *data) if (reverse) puts(ANSI_COLOR_REVERSE); - printf("%ls", entry->title); + printf("%" titlefmt "", entry->title); if (reverse) puts(ANSI_COLOR_RESET); @@ -170,7 +184,7 @@ static int prepare_bootmenu_entry(struct bootmenu_data *menu, struct bootmenu_entry *iter = *current; while ((option = bootmenu_getoption(i))) { - u16 *buf; + TITLE_CHAR *buf; sep = strchr(option, '='); if (!sep) { @@ -183,13 +197,13 @@ static int prepare_bootmenu_entry(struct bootmenu_data *menu, return -ENOMEM; len = sep-option; - buf = calloc(1, (len + 1) * sizeof(u16)); + buf = calloc(1, (len + 1) * sizeof(TITLE_CHAR)); entry->title = buf; if (!entry->title) { free(entry); return -ENOMEM; } - utf8_utf16_strncpy(&buf, option, len); + TITLE_STRNCPY(buf, option, len); len = strlen(sep + 1); entry->command = malloc(len + 1); @@ -227,6 +241,7 @@ static int prepare_bootmenu_entry(struct bootmenu_data *menu, return 1; } +#if (CONFIG_IS_ENABLED(CMD_BOOTEFI_BOOTMGR)) /** * prepare_uefi_bootorder_entry() - generate the uefi bootmenu entries * @@ -315,6 +330,7 @@ static int prepare_uefi_bootorder_entry(struct bootmenu_data *menu, return 1; } +#endif static struct bootmenu_data *bootmenu_create(int delay) { @@ -341,13 +357,13 @@ static struct bootmenu_data *bootmenu_create(int delay) if (ret < 0) goto cleanup; - if (IS_ENABLED(CONFIG_CMD_BOOTEFI_BOOTMGR)) { - if (i < MAX_COUNT - 1) { - ret = prepare_uefi_bootorder_entry(menu, &iter, &i); - if (ret < 0 && ret != -ENOENT) - goto cleanup; - } +#if (CONFIG_IS_ENABLED(CMD_BOOTEFI_BOOTMGR)) + if (i < MAX_COUNT - 1) { + ret = prepare_uefi_bootorder_entry(menu, &iter, &i); + if (ret < 0 && ret != -ENOENT) + goto cleanup; } +#endif /* Add U-Boot console entry at the end */ if (i <= MAX_COUNT - 1) { @@ -357,9 +373,9 @@ static struct bootmenu_data *bootmenu_create(int delay) /* Add Quit entry if entering U-Boot console is disabled */ if (IS_ENABLED(CONFIG_CMD_BOOTMENU_ENTER_UBOOT_CONSOLE)) - entry->title = u16_strdup(u"U-Boot console"); + entry->title = TITLE_STRDUP(TITLE_STR("U-Boot console")); else - entry->title = u16_strdup(u"Quit"); + entry->title = TITLE_STRDUP(TITLE_STR("Quit")); if (!entry->title) { free(entry); @@ -461,7 +477,7 @@ static enum bootmenu_ret bootmenu_show(int delay) int cmd_ret; int init = 0; void *choice = NULL; - u16 *title = NULL; + TITLE_CHAR *title = NULL; char *command = NULL; struct menu *menu; struct bootmenu_entry *iter; @@ -517,7 +533,7 @@ static enum bootmenu_ret bootmenu_show(int delay) if (menu_get_choice(menu, &choice) == 1) { iter = choice; - title = u16_strdup(iter->title); + title = TITLE_STRDUP(iter->title); command = strdup(iter->command); /* last entry is U-Boot console or Quit */ @@ -561,7 +577,7 @@ cleanup: } if (title && command) { - debug("Starting entry '%ls'\n", title); + debug("Starting entry '%" titlefmt "'\n", title); free(title); if (efi_ret == EFI_SUCCESS) cmd_ret = run_command(command, 0); -- 2.17.1

2 3

[PATCH] doc: environment: Fix typo
by Chris Packham 25 May '22

25 May '22

"valu" should be "value". Signed-off-by: Chris Packham <judge.packham(a)gmail.com> --- doc/usage/environment.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/usage/environment.rst b/doc/usage/environment.rst index dc6170394460..28a8952b7528 100644 --- a/doc/usage/environment.rst +++ b/doc/usage/environment.rst @@ -347,7 +347,7 @@ bootpretryperiod Unsigned value, in milliseconds. If not set, the period will be either the default (28000), or a value based on CONFIG_NET_RETRY_COUNT, if defined. This value has - precedence over the valu based on CONFIG_NET_RETRY_COUNT. + precedence over the value based on CONFIG_NET_RETRY_COUNT. memmatches Number of matches found by the last 'ms' command, in hex -- 2.36.1

2 1

[PATCH 1/2] sunxi: Skip MMC0 init when its pinmux conflicts with UART0
by Samuel Holland 24 May '22

24 May '22

Currently, selecting UART0_PORT_F entirely disables MMC support on sunxi platforms. But this is a bigger hammer then needed. Muxing UART0 to the pins on port F only causes a conflict with MMC0, so minimize the impact by specifically skipping MMC0 init. We can continue to use MMC1/2 if those are enabled. Let's also remove the preprocessor check while refacting this function. Signed-off-by: Samuel Holland <samuel(a)sholland.org> --- board/sunxi/board.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 89324159d5..7822001d99 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -516,19 +516,17 @@ static void mmc_pinmux_setup(int sdc) int board_mmc_init(struct bd_info *bis) { - __maybe_unused struct mmc *mmc0, *mmc1; - - mmc_pinmux_setup(CONFIG_MMC_SUNXI_SLOT); - mmc0 = sunxi_mmc_init(CONFIG_MMC_SUNXI_SLOT); - if (!mmc0) - return -1; + if (!IS_ENABLED(CONFIG_UART0_PORT_F)) { + mmc_pinmux_setup(CONFIG_MMC_SUNXI_SLOT); + if (!sunxi_mmc_init(CONFIG_MMC_SUNXI_SLOT)) + return -1; + } -#if CONFIG_MMC_SUNXI_SLOT_EXTRA != -1 - mmc_pinmux_setup(CONFIG_MMC_SUNXI_SLOT_EXTRA); - mmc1 = sunxi_mmc_init(CONFIG_MMC_SUNXI_SLOT_EXTRA); - if (!mmc1) - return -1; -#endif + if (CONFIG_MMC_SUNXI_SLOT_EXTRA != -1) { + mmc_pinmux_setup(CONFIG_MMC_SUNXI_SLOT_EXTRA); + if (!sunxi_mmc_init(CONFIG_MMC_SUNXI_SLOT_EXTRA)) + return -1; + } return 0; } -- 2.35.1

3 5

[PATCH] sunxi: board: Fix UART PortF pinmux setup
by Andre Przywara 24 May '22

24 May '22

When CONFIG_UART0_PORT_F is defined, we try to configure two PortF pins (usually used for the SD card) as UART0. Some SoCs use the mux value of 3 for this, while others use 4. The combination of Kconfig symbols we currently use was not quite right: we mis-configure the A31, A64, H6 and H616. Going through the list in the pinctrl driver, there are only a few older SoCs that use a value of 4, so revert the #ifdef clause, and name those explicitly, instead of the other way around. Signed-off-by: Andre Przywara <andre.przywara(a)arm.com> --- arch/arm/mach-sunxi/board.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c index 173e946465d..8f7c894286d 100644 --- a/arch/arm/mach-sunxi/board.c +++ b/arch/arm/mach-sunxi/board.c @@ -87,15 +87,16 @@ static int gpio_init(void) sunxi_gpio_set_cfgpin(SUNXI_GPB(22), SUNXI_GPIO_INPUT); sunxi_gpio_set_cfgpin(SUNXI_GPB(23), SUNXI_GPIO_INPUT); #endif -#if (defined(CONFIG_MACH_SUN8I) && !defined(CONFIG_MACH_SUN8I_R40)) || \ - defined(CONFIG_MACH_SUNIV) - sunxi_gpio_set_cfgpin(SUNXI_GPF(2), SUN8I_GPF_UART0); - sunxi_gpio_set_cfgpin(SUNXI_GPF(4), SUN8I_GPF_UART0); -#else +#if defined(CONFIG_MACH_SUN4I) || defined(CONFIG_MACH_SUN5I) || \ + defined(CONFIG_MACH_SUN7I) || defined(CONFIG_MACH_SUN8I_R40) || \ + defined(CONFIG_MACH_SUN9I) sunxi_gpio_set_cfgpin(SUNXI_GPF(2), SUNXI_GPF_UART0); sunxi_gpio_set_cfgpin(SUNXI_GPF(4), SUNXI_GPF_UART0); +#else + sunxi_gpio_set_cfgpin(SUNXI_GPF(2), SUN8I_GPF_UART0); + sunxi_gpio_set_cfgpin(SUNXI_GPF(4), SUN8I_GPF_UART0); #endif - sunxi_gpio_set_pull(SUNXI_GPF(4), 1); + sunxi_gpio_set_pull(SUNXI_GPF(4), SUNXI_GPIO_PULL_UP); #elif CONFIG_CONS_INDEX == 1 && defined(CONFIG_MACH_SUNIV) sunxi_gpio_set_cfgpin(SUNXI_GPE(0), SUNIV_GPE_UART0); sunxi_gpio_set_cfgpin(SUNXI_GPE(1), SUNIV_GPE_UART0); -- 2.35.3

2 2

[PATCH 0/2] sunxi: clk: fix unhandled clocks warnings
by Andre Przywara 24 May '22

24 May '22

The introduction of the DM pinctrl driver saw many clocks, referenced in the respective pinctrl DT nodes, being enabled by the DM clock driver. We didn't model all them correctly, so there are now some warnings on the console when booting: ========= sunxi_set_gate: (CLK#58) unhandled ========= This series fixes them. The first patch just describes some missing gate clocks, mostly for the pin controller directly. The second patch introduces a GATE_DUMMY macro, that allows to just ignore some other clocks, and to suppress the warnings. Please have a look and test! Cheers, Andre Andre Przywara (2): clk: sunxi: add PIO bus gate clocks clk: sunxi: add and use dummy gate clocks drivers/clk/sunxi/clk_a10.c | 2 ++ drivers/clk/sunxi/clk_a10s.c | 2 ++ drivers/clk/sunxi/clk_a23.c | 2 ++ drivers/clk/sunxi/clk_a31.c | 2 ++ drivers/clk/sunxi/clk_a64.c | 4 ++++ drivers/clk/sunxi/clk_a80.c | 2 ++ drivers/clk/sunxi/clk_a83t.c | 2 ++ drivers/clk/sunxi/clk_h3.c | 4 ++++ drivers/clk/sunxi/clk_h6.c | 4 ++++ drivers/clk/sunxi/clk_h616.c | 4 ++++ drivers/clk/sunxi/clk_h6_r.c | 2 ++ drivers/clk/sunxi/clk_r40.c | 2 ++ drivers/clk/sunxi/clk_sunxi.c | 3 +++ drivers/clk/sunxi/clk_v3s.c | 2 ++ include/clk/sunxi.h | 5 +++++ 15 files changed, 42 insertions(+) -- 2.35.3

2 6