April 2022 - U-Boot

[PATCH v1 1/4] rockchip: usb: gadget: add rk3066 product id
by Johan Jonker 26 May '22

26 May '22

From: Paweł Jarosz <paweljarosz3691(a)gmail.com> Product id of rk3066 usb otg is 0x300a. Signed-off-by: Paweł Jarosz <paweljarosz3691(a)gmail.com> Signed-off-by: Johan Jonker <jbx6244(a)gmail.com> --- drivers/usb/gadget/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index d81a9c5a..8c6cf474 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -61,6 +61,7 @@ config USB_GADGET_PRODUCT_NUM hex "Product ID of the USB device" default 0x1010 if ARCH_SUNXI default 0x310a if ROCKCHIP_RK3036 + default 0x300a if ROCKCHIP_RK3066 default 0x310c if ROCKCHIP_RK3128 default 0x320a if ROCKCHIP_RK3229 || ROCKCHIP_RK3288 default 0x330a if ROCKCHIP_RK3328 -- 2.20.1

2 7

[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] clk: sunxi: h6_r: Correct the driver name
by Samuel Holland 24 May '22

24 May '22

H6 is from the sun50i family, not sun6i. Signed-off-by: Samuel Holland <samuel(a)sholland.org> --- drivers/clk/sunxi/clk_h6_r.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clk/sunxi/clk_h6_r.c b/drivers/clk/sunxi/clk_h6_r.c index b9e527e16a..2e0bbaa903 100644 --- a/drivers/clk/sunxi/clk_h6_r.c +++ b/drivers/clk/sunxi/clk_h6_r.c @@ -50,8 +50,8 @@ static const struct udevice_id h6_r_clk_ids[] = { { } }; -U_BOOT_DRIVER(clk_sun6i_h6_r) = { - .name = "sun6i_h6_r_ccu", +U_BOOT_DRIVER(clk_sun50i_h6_r) = { + .name = "sun50i_h6_r_ccu", .id = UCLASS_CLK, .of_match = h6_r_clk_ids, .priv_auto = sizeof(struct ccu_priv), -- 2.35.1

3 2

[PATCH 00/12] sunxi: Devicetree sync from Linux v5.18-rc1
by Samuel Holland 24 May '22

24 May '22

This series brings all of our devicetrees up to date with Linux. Older SoCs (before A83T) have not been synchronized in over 3 years. And I don't have any of this hardware to test. But there are not major changes to those devicetrees either. The big motivation for including older SoCs in this update is converting the USB PHY driver to get its VBUS detection GPIO/regulator from the devicetree instead of from a pin name in Kconfig. Many older boards had those properties added or fixed since the last devicetree sync. This PHY driver change is necessary to complete the DM_GPIO migration. A couple of breaking changes were made to several SoCs' devicetrees in Linux relating to the "r_intc" interrupt controller. New kernels support old devicetrees, but not the other way around. So to be most compatible and avoid regressions, those changes are skipped here. Samuel Holland (12): dt-bindings: sunxi: Update clock/reset binding headers ARM: dts: sunxi: Remove unused devicetree headers ARM: dts: sun4i: Sync from Linux v5.18-rc1 ARM: dts: sun7i: 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 arch/arm/dts/Makefile | 25 +- arch/arm/dts/axp209.dtsi | 6 +- arch/arm/dts/axp22x.dtsi | 11 +- arch/arm/dts/axp803.dtsi | 10 +- arch/arm/dts/axp81x.dtsi | 15 +- arch/arm/dts/sun4i-a10-a1000.dts | 31 +- arch/arm/dts/sun4i-a10-ba10-tvbox.dts | 2 +- arch/arm/dts/sun4i-a10-chuwi-v7-cw0825.dts | 20 +- arch/arm/dts/sun4i-a10-cubieboard.dts | 16 +- arch/arm/dts/sun4i-a10-dserve-dsrv9703c.dts | 21 +- arch/arm/dts/sun4i-a10-hackberry.dts | 2 +- arch/arm/dts/sun4i-a10-hyundai-a7hd.dts | 20 +- arch/arm/dts/sun4i-a10-inet1.dts | 21 +- arch/arm/dts/sun4i-a10-inet97fv2.dts | 22 +- arch/arm/dts/sun4i-a10-inet9f-rev03.dts | 74 ++-- .../dts/sun4i-a10-itead-iteaduino-plus.dts | 2 +- arch/arm/dts/sun4i-a10-jesurun-q5.dts | 4 +- arch/arm/dts/sun4i-a10-marsboard.dts | 22 +- arch/arm/dts/sun4i-a10-olinuxino-lime.dts | 33 +- arch/arm/dts/sun4i-a10-pcduino.dts | 20 +- arch/arm/dts/sun4i-a10-pov-protab2-ips9.dts | 21 +- arch/arm/dts/sun4i-a10-topwise-a721.dts | 242 +++++++++++++ arch/arm/dts/sun4i-a10.dtsi | 135 ++++++- 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 +- .../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 +- ...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 +-- .../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 +-- .../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 +++++--- .../sun6i-a31s-yones-toptech-bs1078-v2.dts | 22 +- .../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 +- .../dts/sun7i-a20-linutronix-testbox-v2.dts | 47 +++ arch/arm/dts/sun7i-a20-m3.dts | 14 +- arch/arm/dts/sun7i-a20-olimex-som-evb.dts | 14 +- arch/arm/dts/sun7i-a20-olimex-som204-evb.dts | 30 +- .../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 +- ...ommon.dtsi => sun8i-a23-ippo-q8h-v1.2.dts} | 54 ++- arch/arm/dts/sun8i-a23-ippo-q8h-v5.dts | 73 ++++ .../dts/sun8i-a23-polaroid-mid2407pxe03.dts | 15 +- .../dts/sun8i-a23-polaroid-mid2809pxe04.dts | 15 +- arch/arm/dts/sun8i-a23-q8-tablet.dts | 10 + arch/arm/dts/sun8i-a23.dtsi | 26 +- ...c-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 +++++--------- .../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 ++++++++++++++-- .../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 ++- .../dts/sun8i-r16-nintendo-nes-classic.dts | 54 +++ .../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 ++++++- .../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/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 +- .../dts/sunxi-reference-design-tablet.dtsi | 11 +- arch/arm/mach-sunxi/Kconfig | 2 +- .../Nintendo_NES_Classic_Edition_defconfig | 2 +- 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 + 177 files changed, 5704 insertions(+), 2683 deletions(-) create mode 100644 arch/arm/dts/sun4i-a10-topwise-a721.dts 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 -- 2.35.1

4 40

[PATCH v4 0/3] spi: spi_flash_probe_bus_cs() rely on DT for spi speed and mode
by Patrice Chotard 23 May '22

23 May '22

Since commit e2e95e5e2542 ("spi: Update speed/mode on change") when calling "sf probe" or "env save" on SPI flash, spi_set_speed_mode() is called twice. spi_get_bus_and_cs() |--> spi_claim_bus() | |--> spi_set_speed_mode(speed and mode from DT) ... |--> spi_set_speed_mode(default speed and mode value) The first spi_set_speed_mode() call is done with speed and mode values from DT, whereas the second call is done with speed and mode set to default value (speed is set to CONFIG_SF_DEFAULT_SPEED) This is an issue because SPI flash performance are impacted by using default speed which can be lower than the one defined in DT. One solution is to set CONFIG_SF_DEFAULT_SPEED to the speed defined in DT, but we loose flexibility offered by DT. Another issue can be encountered with 2 SPI flashes using 2 different speeds. In this specific case usage of CONFIG_SF_DEFAULT_SPEED is not flexible compared to get the 2 different speeds from DT. Changes in v4: - Split previous series in 3 patches - Update commit message with additionnal information Changes in v3: - Update commit header to reflect what the patch really do. - Rename legacy spi_get_bus_and_cs() to _spi_get_bus_and_cs(). - New spi_get_bus_and_cs() rely on DT for spi speed and mode values. - spi_flash_probe_bus_cs() rely also on DT for spi and mode values. Changes in v2: - add spi_flash_probe_bus_cs_default() which calls spi_get_bus_and_cs() with "use_dt" param set to true, whereas spi_flash_probe_bus_cs() calls spi_get_bus_and_cs() with "use_dt" param set to true. Patrice Chotard (3): spi: spi-uclass: Add new spi_get_bus_and_cs() implementation spi: spi_flash_probe_bus_cs() rely on DT for spi speed and mode test: dm: spi: Replace _spi_get_bus_and_cs() by spi_get_bus_and_cs() in some case board/CZ.NIC/turris_mox/turris_mox.c | 6 +-- cmd/sf.c | 15 +++++-- cmd/spi.c | 4 +- drivers/mtd/spi/sf-uclass.c | 33 +++++++------- drivers/net/fm/fm.c | 4 +- drivers/net/pfe_eth/pfe_firmware.c | 19 ++------ drivers/net/sni_netsec.c | 6 +-- drivers/spi/spi-uclass.c | 66 +++++++++++++++++++++++++--- drivers/usb/gadget/max3420_udc.c | 4 +- env/sf.c | 1 - include/spi.h | 19 +++++++- include/spi_flash.h | 1 - test/dm/spi.c | 33 +++++++------- 13 files changed, 137 insertions(+), 74 deletions(-) -- 2.17.1

3 8

[PATCH] cmd: pxe_utils: Check fdtcontroladdr in label_boot
by Peter Hoyes 23 May '22

23 May '22

From: Peter Hoyes <Peter.Hoyes(a)arm.com> If using OF_CONTROL, fdtcontroladdr is set to the fdt used to configure U-Boot. When using PXE, if no fdt is defined in the menu file, and there is no fdt at fdt_addr, add fall back on fdtcontroladdr too. We are developing board support for the Armv8r64 FVP using config_distro_bootcmd. We are also using OF_BOARD and would like the PXE boot option to default to the fdt provided by board_fdt_blob_setup. Signed-off-by: Peter Hoyes <Peter.Hoyes(a)arm.com> --- cmd/pxe_utils.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cmd/pxe_utils.c b/cmd/pxe_utils.c index 067c24e5ff..8f8e69ca97 100644 --- a/cmd/pxe_utils.c +++ b/cmd/pxe_utils.c @@ -556,7 +556,10 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label) * Scenario 2: If there is an fdt_addr specified, pass it along to * bootm, and adjust argc appropriately. * - * Scenario 3: fdt blob is not available. + * Scenario 3: If there is an fdtcontroladdr specified, pass it along to + * bootm, and adjust argc appropriately. + * + * Scenario 4: fdt blob is not available. */ bootm_argv[3] = env_get("fdt_addr_r"); @@ -646,6 +649,9 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label) if (!bootm_argv[3]) bootm_argv[3] = env_get("fdt_addr"); + if (!bootm_argv[3]) + bootm_argv[3] = env_get("fdtcontroladdr"); + if (bootm_argv[3]) { if (!bootm_argv[2]) bootm_argv[2] = "-"; -- 2.25.1

7 12

[PATCH v1 0/8] Add support for the i.MXRT1170
by Jesse Taube 23 May '22

23 May '22

This patchset contains: - i.MXRT1170 clock driver adaption - i.MXRT1170-evk basic support Jesse Taube (8): imx: imxrt1170-evk: Add support for the NXP i.MXRT1170-EVK ARM: dts: imxrt11170-pinfunc: Add pinctrl binding header dt-bindings: imx: Add clock binding for i.MXRT1170 clk: imx: Add i.MXRT11xx pllv3 variant clk: imx: Add initial support for i.MXRT1170 clock driver RAM: Add changes for i.MXRT11xx series ARM: dts: imx: add i.MXRT1170-EVK support ARM: imxrt1170_defconfig: Add i.MXRT1170 defconfig arch/arm/dts/Makefile | 3 +- arch/arm/dts/imxrt1170-evk-u-boot.dtsi | 106 ++ arch/arm/dts/imxrt1170-evk.dts | 246 +++ arch/arm/dts/imxrt1170-pinfunc.h | 1561 +++++++++++++++++ arch/arm/dts/imxrt1170.dtsi | 274 +++ arch/arm/include/asm/arch-imx/cpu.h | 1 + arch/arm/mach-imx/imxrt/Kconfig | 9 + arch/arm/mach-imx/imxrt/soc.c | 2 + board/freescale/imxrt1170-evk/Kconfig | 22 + board/freescale/imxrt1170-evk/MAINTAINERS | 7 + board/freescale/imxrt1170-evk/Makefile | 6 + board/freescale/imxrt1170-evk/imximage.cfg | 32 + board/freescale/imxrt1170-evk/imxrt1170-evk.c | 80 + configs/imxrt1170-evk_defconfig | 67 + drivers/clk/imx/Kconfig | 16 + drivers/clk/imx/Makefile | 1 + drivers/clk/imx/clk-imxrt1170.c | 215 +++ drivers/clk/imx/clk-pllv3.c | 44 + drivers/clk/imx/clk.h | 1 + drivers/ram/imxrt_sdram.c | 9 + include/configs/imxrt1170-evk.h | 37 + include/dt-bindings/clock/imxrt1170-clock.h | 48 + include/dt-bindings/memory/imxrt-sdram.h | 1 + 23 files changed, 2787 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/imxrt1170-evk-u-boot.dtsi create mode 100644 arch/arm/dts/imxrt1170-evk.dts create mode 100644 arch/arm/dts/imxrt1170-pinfunc.h create mode 100644 arch/arm/dts/imxrt1170.dtsi create mode 100644 board/freescale/imxrt1170-evk/Kconfig create mode 100644 board/freescale/imxrt1170-evk/MAINTAINERS create mode 100644 board/freescale/imxrt1170-evk/Makefile create mode 100644 board/freescale/imxrt1170-evk/imximage.cfg create mode 100644 board/freescale/imxrt1170-evk/imxrt1170-evk.c create mode 100644 configs/imxrt1170-evk_defconfig create mode 100644 drivers/clk/imx/clk-imxrt1170.c create mode 100644 include/configs/imxrt1170-evk.h create mode 100644 include/dt-bindings/clock/imxrt1170-clock.h -- 2.34.1

3 13

[RESEND PATCH] gpio: rgpio2p: Enhance reading of GPIO pin value
by Christoph Fritz 21 May '22

21 May '22

Add support for reading GPIO pin value when function is output. With this patch applied, gpio toggle command is working. Signed-off-by: Christoph Fritz <chf.fritz(a)googlemail.com> Reviewed-by: Peng Fan <peng.fan(a)nxp.com> Reviewed-by: Fabio Estevam <festevam(a)denx.de> --- drivers/gpio/imx_rgpio2p.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/gpio/imx_rgpio2p.c b/drivers/gpio/imx_rgpio2p.c index 0e2874ca95c..175e460aff5 100644 --- a/drivers/gpio/imx_rgpio2p.c +++ b/drivers/gpio/imx_rgpio2p.c @@ -39,6 +39,14 @@ static int imx_rgpio2p_is_output(struct gpio_regs *regs, int offset) return val & (1 << offset) ? 1 : 0; } +static int imx_rgpio2p_bank_get_direction(struct gpio_regs *regs, int offset) +{ + if ((readl(&regs->gpio_pddr) >> offset) & 0x01) + return IMX_RGPIO2P_DIRECTION_OUT; + + return IMX_RGPIO2P_DIRECTION_IN; +} + static void imx_rgpio2p_bank_direction(struct gpio_regs *regs, int offset, enum imx_rgpio2p_direction direction) { @@ -67,7 +75,11 @@ static void imx_rgpio2p_bank_set_value(struct gpio_regs *regs, int offset, static int imx_rgpio2p_bank_get_value(struct gpio_regs *regs, int offset) { - return (readl(&regs->gpio_pdir) >> offset) & 0x01; + if (imx_rgpio2p_bank_get_direction(regs, offset) == + IMX_RGPIO2P_DIRECTION_IN) + return (readl(&regs->gpio_pdir) >> offset) & 0x01; + + return (readl(&regs->gpio_pdor) >> offset) & 0x01; } static int imx_rgpio2p_direction_input(struct udevice *dev, unsigned offset) -- 2.30.2

2 3

[PATCH v3 1/2] imx8mn_ddr4_evk: Add USB Mass Storage support
by Fabio Estevam 20 May '22

20 May '22

From: Fabio Estevam <festevam(a)denx.de> Add USB Mass Storage support, which is a convenient way to flash the eMMC card, for example. Signed-off-by: Fabio Estevam <festevam(a)denx.de> --- Changes since v2: - None configs/imx8mn_ddr4_evk_defconfig | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/configs/imx8mn_ddr4_evk_defconfig b/configs/imx8mn_ddr4_evk_defconfig index 917cdb5aa9d9..065f7392b706 100644 --- a/configs/imx8mn_ddr4_evk_defconfig +++ b/configs/imx8mn_ddr4_evk_defconfig @@ -42,6 +42,8 @@ CONFIG_CMD_FUSE=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_USB=y +CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_CMD_CACHE=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_EXT4_WRITE=y @@ -82,4 +84,14 @@ CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_PSCI=y CONFIG_SYSRESET_WATCHDOG=y CONFIG_DM_THERMAL=y +CONFIG_USB=y +# CONFIG_SPL_DM_USB is not set +CONFIG_USB_EHCI_HCD=y +CONFIG_MXC_USB_OTG_HACTIVE=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_IMX_WATCHDOG=y -- 2.25.1

5 8

[PATCH] imx: imx8m: drop uneeded check
by Peng Fan (OSS) 20 May '22

20 May '22

From: Peng Fan <peng.fan(a)nxp.com> All i.MX8M needs TZASC ID SWAP set and locked, no need the check to waste cpu cycles. Signed-off-by: Peng Fan <peng.fan(a)nxp.com> --- arch/arm/mach-imx/imx8m/soc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index 8e23e6da326..5240dc11363 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -72,15 +72,13 @@ void enable_tzc380(void) * According to TRM, TZASC_ID_SWAP_BYPASS should be set in * order to avoid AXI Bus errors when GPU is in use */ - if (is_imx8mq() || is_imx8mm() || is_imx8mn() || is_imx8mp()) - setbits_le32(&gpr->gpr[10], GPR_TZASC_ID_SWAP_BYPASS); + setbits_le32(&gpr->gpr[10], GPR_TZASC_ID_SWAP_BYPASS); /* * imx8mn and imx8mp implements the lock bit for * TZASC_ID_SWAP_BYPASS, enable it to lock settings */ - if (is_imx8mn() || is_imx8mp()) - setbits_le32(&gpr->gpr[10], GPR_TZASC_ID_SWAP_BYPASS_LOCK); + setbits_le32(&gpr->gpr[10], GPR_TZASC_ID_SWAP_BYPASS_LOCK); /* * set Region 0 attribute to allow secure and non-secure -- 2.36.0

4 4