April 2020 - U-Boot

[PATCH v3 1/1] drivers: usb: host: Add BRCM xHCI driver
by Rayagonda Kokatanur 09 Apr '20

09 Apr '20

Base driver for Broadcom xHCI controllers Signed-off-by: Bharat Kumar Reddy Gooty <bharat.gooty(a)broadcom.com> Signed-off-by: Rayagonda Kokatanur <rayagonda.kokatanur(a)broadcom.com> Signed-off-by: Vladimir Olovyannikov <vladimir.olovyannikov(a)broadcom.com> --- Changes from v2: -Address review comments from Marek Vasut, Cache hc_base in private data instead of always reading it from DT, Follow reverse xmas tree for variable declaration. Changes from v1: -Address review comments from Marek Vasut, Use comman macro name for read and write register, Rename the macro names. drivers/usb/host/Kconfig | 8 +++ drivers/usb/host/Makefile | 1 + drivers/usb/host/xhci-brcm.c | 98 ++++++++++++++++++++++++++++++++++++ 3 files changed, 107 insertions(+) create mode 100644 drivers/usb/host/xhci-brcm.c diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 0987ff25b1..94ac969058 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -88,6 +88,14 @@ config USB_XHCI_FSL depends on !SPL_NO_USB help Enables support for the on-chip xHCI controller on NXP Layerscape SoCs. + +config USB_XHCI_BRCM + bool "Broadcom USB3 Host XHCI controller" + depends on DM_USB + help + USB controller based on the Broadcom USB3 IP Core. + Supports USB2/3 functionality. + endif # USB_XHCI_HCD config USB_EHCI_HCD diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index 7feeff679c..b62f346094 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -44,6 +44,7 @@ obj-$(CONFIG_USB_EHCI_RMOBILE) += ehci-rmobile.o obj-$(CONFIG_USB_EHCI_ZYNQ) += ehci-zynq.o # xhci +obj-$(CONFIG_USB_XHCI_BRCM) += xhci-brcm.o obj-$(CONFIG_USB_XHCI_HCD) += xhci.o xhci-mem.o xhci-ring.o obj-$(CONFIG_USB_XHCI_DWC3) += xhci-dwc3.o obj-$(CONFIG_USB_XHCI_DWC3_OF_SIMPLE) += dwc3-of-simple.o diff --git a/drivers/usb/host/xhci-brcm.c b/drivers/usb/host/xhci-brcm.c new file mode 100644 index 0000000000..7192305dba --- /dev/null +++ b/drivers/usb/host/xhci-brcm.c @@ -0,0 +1,98 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Broadcom. + */ + +#include <common.h> +#include <dm.h> +#include <fdtdec.h> +#include <usb.h> +#include <asm/io.h> +#include <usb/xhci.h> + +#define DRD2U3H_XHC_REGS_AXIWRA 0xC08 +#define DRD2U3H_XHC_REGS_AXIRDA 0xC0C + +#define USBAXI_CACHE 0xF +#define USBAXI_PROT 0x8 +#define USBAXI_SA_MASK 0x1FF +#define USBAXI_UA_MASK (0x1FF << 16) +#define USBAXI_SA_VAL ((USBAXI_CACHE << 4) | USBAXI_PROT) +#define USBAXI_UA_VAL (USBAXI_SA_VAL << 16) +#define USBAXI_SA_UA_MASK (USBAXI_UA_MASK | USBAXI_SA_MASK) +#define USBAXI_SA_UA_VAL (USBAXI_UA_VAL | USBAXI_SA_VAL) + +struct brcm_xhci_platdata { + unsigned int arcache; + unsigned int awcache; + uintptr_t hc_base; +}; + +static int xhci_brcm_probe(struct udevice *dev) +{ + struct brcm_xhci_platdata *plat = dev_get_platdata(dev); + struct xhci_hcor *hcor; + struct xhci_hccr *hcd; + int len, ret = 0; + + if (!plat) { + dev_err(dev, "Can't get xHCI Plat data\n"); + return -ENOMEM; + } + + hcd = dev_read_addr_ptr(dev); + if (!hcd) { + dev_err(dev, "Can't get the xHCI register base address\n"); + return -ENXIO; + } + + plat->hc_base = (uintptr_t)hcd; + len = HC_LENGTH(xhci_readl(&hcd->cr_capbase)); + hcor = (struct xhci_hcor *)(plat->hc_base + len); + + /* Save the default values of AXI read and write attributes */ + plat->awcache = readl(plat->hc_base + DRD2U3H_XHC_REGS_AXIWRA); + plat->arcache = readl(plat->hc_base + DRD2U3H_XHC_REGS_AXIRDA); + + /* Enable AXI write attributes */ + clrsetbits_le32(plat->hc_base + DRD2U3H_XHC_REGS_AXIWRA, + USBAXI_SA_UA_MASK, USBAXI_SA_UA_VAL); + + /* Enable AXI read attributes */ + clrsetbits_le32(plat->hc_base + DRD2U3H_XHC_REGS_AXIRDA, + USBAXI_SA_UA_MASK, USBAXI_SA_UA_VAL); + + ret = xhci_register(dev, hcd, hcor); + if (ret) + dev_err(dev, "Failed to register xHCI\n"); + + return ret; +} + +static int xhci_brcm_deregister(struct udevice *dev) +{ + struct brcm_xhci_platdata *plat = dev_get_platdata(dev); + + /* Restore the default values for AXI read and write attributes */ + writel(plat->awcache, plat->hc_base + DRD2U3H_XHC_REGS_AXIWRA); + writel(plat->arcache, plat->hc_base + DRD2U3H_XHC_REGS_AXIRDA); + + return xhci_deregister(dev); +} + +static const struct udevice_id xhci_brcm_ids[] = { + { .compatible = "brcm,generic-xhci" }, + { } +}; + +U_BOOT_DRIVER(usb_xhci) = { + .name = "xhci_brcm", + .id = UCLASS_USB, + .probe = xhci_brcm_probe, + .remove = xhci_brcm_deregister, + .ops = &xhci_usb_ops, + .of_match = xhci_brcm_ids, + .platdata_auto_alloc_size = sizeof(struct brcm_xhci_platdata), + .priv_auto_alloc_size = sizeof(struct xhci_ctrl), + .flags = DM_FLAG_ALLOC_PRIV_DMA, +}; -- 2.17.1

2 5

[PATCH] mmc: zynq: parse dt when probing
by Benedikt Grassl 08 Apr '20

08 Apr '20

Currently, the entry "bus-width = <8>" in the ZynqMP's sdhci nodes is not evaluated. This results in the bus width staying at its default value (4 bit in HS200 mode). Fix this by parsing the device tree while probing. Signed-off-by: Benedikt Grassl <Benedikt.Grassl(a)rohde-schwarz.com> --- drivers/mmc/zynq_sdhci.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c index da3ff53da1..f076f5f73d 100644 --- a/drivers/mmc/zynq_sdhci.c +++ b/drivers/mmc/zynq_sdhci.c @@ -251,6 +251,11 @@ static int arasan_sdhci_probe(struct udevice *dev) CONFIG_ZYNQ_SDHCI_MIN_FREQ); if (ret) return ret; + + ret = mmc_of_parse(dev, &plat->cfg); + if (ret) + return ret; + upriv->mmc = host->mmc; return sdhci_probe(dev); -- 2.17.1

4 4

[GIT PULL] Pull request: u-boot-imx u-boot-imx-20200408
by Stefano Babic 08 Apr '20

08 Apr '20

Hi Tom, fixes requested by Igor + environment fix for mx7sabresd. The following changes since commit 0965d2ac93db3900ae20ff0b2e176baf672b63cc: Prepare v2020.04-rc5 (2020-04-06 17:44:14 -0400) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git tags/u-boot-imx-20200408 for you to fetch changes up to c94f405ce993ce57d9577bca43cebe54689f4f8a: mx7dsabre: Fix ramdisk_addr* for distro boot (2020-04-07 10:43:25 +0200) ---------------------------------------------------------------- Fixes for 2020.04 ----------------- - mx7dsabre: Fix ramdisk_addr* for distro boot - Toradex boards Travis: https://travis-ci.org/github/sbabic/u-boot-imx/builds/671988124 ---------------------------------------------------------------- Igor Opaniuk (5): colibri_imx6: set gpr1 ENET_CLK_SEL ARM: dts: imx8qm-apalis: replace dm-spl with dm-pre-proper ARM: dts: imx8qxp-colibri: replace dm-spl with dm-pre-proper ARM: dts: imx8qm-apalis: dm-pre-proper for pd_dma nodes ARM: dts: imx8qxp-colibri: dm-pre-proper for pd_dma nodes Jan Kiszka (1): mx7dsabre: Fix ramdisk_addr* for distro boot arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi | 70 +++++++++++++++++++++++++++++++++++++++------------------------------- arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi | 68 ++++++++++++++++++++++++++++++++++++++++---------------------------- board/toradex/colibri_imx6/colibri_imx6.c | 3 +++ include/configs/mx7dsabresd.h | 4 ++-- 4 files changed, 84 insertions(+), 61 deletions(-) Regards, Stefano -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

2 1

[PULL u-boot] Please pull u-boot-amlogic-20200406
by Neil Armstrong 08 Apr '20

08 Apr '20

Hi Tom, This PR adds support for Libre Computer AML-S905D-PC and AML-S912-PC while doing a full sync of Linux v5.6 DT plus fixups on MMC clocks and typos. The CI job is at https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic/pipelines/2631 Thanks, Neil The following changes since commit 74bf17db394d49c7041ee01a277fcf8d99b9a514: Merge branch 'master' of git://git.denx.de/u-boot-sh (2020-04-04 19:20:45 -0400) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic.git tags/u-boot-amlogic-20200406 for you to fetch changes up to e13e7c9daec54f387468098aa1f857e99a1333ec: arm64: dts: meson: add libretech-pc support (2020-04-06 09:56:35 +0200) ---------------------------------------------------------------- - clk: meson-g12a: missing break - sync all Amlogic DT from Linux v5.6-rc2 - MMC clock fixups - add support for Libre Computer AML-S905D-PC and AML-S912-PC ---------------------------------------------------------------- Heinrich Schuchardt (1): clk: meson-g12a: missing break Jerome Brunet (6): dt-bindings: leds: import common led bindings from linux v5.5 mmc: meson-gx: enable input clocks clk: meson: reset mmc clock on probe arm64: dts: meson: sync dt and bindings from v5.6-rc2 arm64: dts: meson: import libretech-pc from linux v5.6-rc2 arm64: dts: meson: add libretech-pc support arch/arm/dts/Makefile | 2 + arch/arm/dts/meson-axg-s400.dts | 70 ++- arch/arm/dts/meson-axg.dtsi | 273 ++++++++++-- arch/arm/dts/meson-g12-common.dtsi | 478 +++++++-------------- arch/arm/dts/meson-g12.dtsi | 398 +++++++++++++++++ arch/arm/dts/meson-g12a-sei510.dts | 64 +++ arch/arm/dts/meson-g12a-u200.dts | 54 +++ arch/arm/dts/meson-g12a.dtsi | 33 +- arch/arm/dts/meson-g12b-a311d-khadas-vim3.dts | 25 ++ arch/arm/dts/meson-g12b-odroid-n2.dts | 2 +- arch/arm/dts/meson-g12b.dtsi | 26 +- arch/arm/dts/meson-gx-libretech-pc.dtsi | 375 ++++++++++++++++ arch/arm/dts/meson-gx.dtsi | 87 +++- arch/arm/dts/meson-gxbb-nanopi-k2.dts | 26 +- arch/arm/dts/meson-gxbb-odroidc2.dts | 100 ++++- arch/arm/dts/meson-gxbb-p200.dts | 9 +- arch/arm/dts/meson-gxbb-p201.dts | 2 +- arch/arm/dts/meson-gxbb-p20x.dtsi | 9 +- arch/arm/dts/meson-gxbb.dtsi | 118 ++++- arch/arm/dts/meson-gxl-s805x-libretech-ac.dts | 2 +- .../dts/meson-gxl-s905d-libretech-pc-u-boot.dtsi | 7 + arch/arm/dts/meson-gxl-s905d-libretech-pc.dts | 16 + arch/arm/dts/meson-gxl-s905d.dtsi | 12 + arch/arm/dts/meson-gxl-s905x-khadas-vim.dts | 20 +- arch/arm/dts/meson-gxl-s905x-libretech-cc.dts | 26 +- arch/arm/dts/meson-gxl-s905x-p212.dtsi | 10 +- arch/arm/dts/meson-gxl.dtsi | 76 +++- arch/arm/dts/meson-gxm-khadas-vim2.dts | 71 +-- .../dts/meson-gxm-s912-libretech-pc-u-boot.dtsi | 7 + arch/arm/dts/meson-gxm-s912-libretech-pc.dts | 62 +++ arch/arm/dts/meson-gxm.dtsi | 39 +- arch/arm/dts/meson-khadas-vim3.dtsi | 7 + arch/arm/dts/meson-sm1-sei610.dts | 236 +++++++++- arch/arm/dts/meson-sm1.dtsi | 356 +++++++++++++++ board/amlogic/q200/MAINTAINERS | 2 + configs/libretech-s905d-pc_defconfig | 73 ++++ configs/libretech-s912-pc_defconfig | 73 ++++ drivers/clk/meson/axg.c | 7 + drivers/clk/meson/g12a.c | 8 + drivers/clk/meson/gxbb.c | 7 + drivers/mmc/meson_gx_mmc.c | 14 +- include/dt-bindings/clock/axg-audio-clkc.h | 10 + include/dt-bindings/clock/gxbb-aoclkc.h | 7 + include/dt-bindings/clock/gxbb-clkc.h | 21 + include/dt-bindings/gpio/meson-gxbb-gpio.h | 8 +- include/dt-bindings/gpio/meson-gxl-gpio.h | 8 +- include/dt-bindings/leds/common.h | 75 ++++ .../reset/amlogic,meson-axg-audio-arb.h | 2 + .../dt-bindings/reset/amlogic,meson-axg-reset.h | 3 +- .../reset/amlogic,meson-g12a-audio-reset.h | 15 + .../dt-bindings/reset/amlogic,meson-gxbb-reset.h | 51 +-- 51 files changed, 2858 insertions(+), 624 deletions(-) create mode 100644 arch/arm/dts/meson-g12.dtsi create mode 100644 arch/arm/dts/meson-gx-libretech-pc.dtsi create mode 100644 arch/arm/dts/meson-gxl-s905d-libretech-pc-u-boot.dtsi create mode 100644 arch/arm/dts/meson-gxl-s905d-libretech-pc.dts create mode 100644 arch/arm/dts/meson-gxl-s905d.dtsi create mode 100644 arch/arm/dts/meson-gxm-s912-libretech-pc-u-boot.dtsi create mode 100644 arch/arm/dts/meson-gxm-s912-libretech-pc.dts create mode 100644 configs/libretech-s905d-pc_defconfig create mode 100644 configs/libretech-s912-pc_defconfig create mode 100644 include/dt-bindings/leds/common.h

2 1

[U-Boot] [PATCH v2] imx: Introduce CONFIG_SPL_FORCE_MMC_BOOT to force MMC boot on falcon mode
by Lukasz Majewski 08 Apr '20

08 Apr '20

This change tries to fix the following problem: - The board boots (to be more precise - ROM loads SPL) from a slow SPI-NOR memory. As a result the spl_boot_device() will return SPI-NOR as a boot device (which is correct). - The problem is that in 'falcon boot' the eMMC is used as a boot medium to load kernel from its partition. Calling spl_boot_device() will break things as it returns SPI-NOR device. To fix this issue the new CONFIG_SPL_FORCE_MMC_BOOT Kconfig flag is introduced to handle this special use case. By default it is not defined, so there is no change in the legacy code flow. Signed-off-by: Lukasz Majewski <lukma(a)denx.de> --- Changes in v2: - Update/enhance the Kconfig description of the SPL_FORCE_MMC_BOOT. This patch is a follow up of previous discussion/fix: https://patchwork.ozlabs.org/patch/796237/ Travis-CI: https://travis-ci.org/lmajewski/u-boot-dfu/builds/580272414 --- arch/arm/mach-imx/spl.c | 11 +++++++++++ common/spl/Kconfig | 9 +++++++++ 2 files changed, 20 insertions(+) diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index 1f230aca3397..daa3d8f7ed94 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -178,7 +178,18 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) /* called from spl_mmc to see type of boot mode for storage (RAW or FAT) */ u32 spl_boot_mode(const u32 boot_device) { +/* + * When CONFIG_SPL_FORCE_MMC_BOOT is defined the 'boot_device' is used + * unconditionally to decide about device to use for booting. + * This is crucial for falcon boot mode, when board boots up (i.e. ROM + * loads SPL) from slow SPI-NOR memory and afterwards the SPL's 'falcon' boot + * mode is used to load Linux OS from eMMC partition. + */ +#ifdef CONFIG_SPL_FORCE_MMC_BOOT + switch (boot_device) { +#else switch (spl_boot_device()) { +#endif /* for MMC return either RAW or FAT mode */ case BOOT_DEVICE_MMC1: case BOOT_DEVICE_MMC2: diff --git a/common/spl/Kconfig b/common/spl/Kconfig index f467eca2be72..fe800840beb6 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -607,6 +607,15 @@ config SPL_MMC_SUPPORT this option to build the drivers in drivers/mmc as part of an SPL build. +config SPL_FORCE_MMC_BOOT + bool "Force SPL booting from MMC" + depends on SPL_MMC_SUPPORT + default n + help + Force SPL to use MMC device for Linux kernel booting even when the + SoC ROM recognized boot medium is not eMMC/SD. This is crucial for + factory or 'falcon mode' booting. + config SPL_MMC_TINY bool "Tiny MMC framework in SPL" depends on SPL_MMC_SUPPORT -- 2.11.0

3 4

[PATCH v2 0/3] arm: socfpga: arria10: Update device tree
by Ley Foon Tan 08 Apr '20

08 Apr '20

This patchset mainly to update Arria 10 dts/dtsi from Linux v5.6.2. All uboot specific properties are moved to *u-boot.dtsi. The 3rd patch is to fix missing u-boot,dm-pre-reloc for L2 cache node and enable cache driver in SPL. v2: - Add Linux commit ID in commit description. - Enable CONFIG_SPL_CACHE in Kconfig instead of defconfig. History: v1: https://patchwork.ozlabs.org/cover/1266732/ Thanks. Regards Ley Foon Ley Foon Tan (3): arm: dts: arria10: Move uboot specific properties to u-boot.dtsi arm: dts: arria10: Update dtsi/dts from Linux arm: socfpga: arria10: Enable cache driver in SPL arch/arm/dts/socfpga_arria10-u-boot.dtsi | 142 ++++++++++++++++++ arch/arm/dts/socfpga_arria10.dtsi | 118 ++++++++------- .../arm/dts/socfpga_arria10_socdk-u-boot.dtsi | 17 +++ arch/arm/dts/socfpga_arria10_socdk.dtsi | 66 ++++---- .../socfpga_arria10_socdk_sdmmc-u-boot.dtsi | 46 ++++++ arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts | 53 +------ arch/arm/mach-socfpga/Kconfig | 1 + 7 files changed, 297 insertions(+), 146 deletions(-) create mode 100644 arch/arm/dts/socfpga_arria10-u-boot.dtsi create mode 100644 arch/arm/dts/socfpga_arria10_socdk-u-boot.dtsi create mode 100644 arch/arm/dts/socfpga_arria10_socdk_sdmmc-u-boot.dtsi -- 2.19.0

3 7

Basic syntax question
by Damien LEFEVRE 08 Apr '20

08 Apr '20

Hi, I'm new to u-boot. I'm trying to store the return value of gpio command to a variable. I have the following, (switch released): Tegra186 (P2771-0000-500) # gpio input FF1 gpio: pin FF1 (gpio 241) value is 1 Tegra186 (P2771-0000-500) # setexpr X 'gpio input FF1' Tegra186 (P2771-0000-500) # echo $X 0 But I'm expecting X to be 1, the return value of gpio. If I press the switch I see the value change to 0, so I know the gpio state changes Tegra186 (P2771-0000-500) # gpio input FF1 gpio: pin FF1 (gpio 241) value is 0 Thanks, -Damien

2 1

[GIT PULL] Xilinx patches for v2020.07
by Michal Simek 08 Apr '20

08 Apr '20

Hi Tom, please pull the following changes for v2020.07. Travis and gitlab look good. https://travis-ci.org/github/michalsimek/u-boot/builds/671573769 https://gitlab.denx.de/u-boot/custodians/u-boot-microblaze/pipelines/2633 The major change is switch Zynq to single platform as I have done for ZynqMP and started with Versal. Also several boards have been retested to make sure that they are still working. As a good side effect a lot of defconfigs was removed which decrease time spent on builds. As you see above travis and gitlabs CIs are fine. I have also updated Azure to match this but have no idea how can initiate it that's why this is not checked. Thanks, Michal The following changes since commit 74bf17db394d49c7041ee01a277fcf8d99b9a514: Merge branch 'master' of git://git.denx.de/u-boot-sh (2020-04-04 19:20:45 -0400) are available in the Git repository at: git@gitlab.denx.de:u-boot/custodians/u-boot-microblaze.git tags/xilinx-for-v2020.07 for you to fetch changes up to 895a7866c20cf6c01779b5a60fbf2770b88930a4: serial: zynq: Change uart initialization logic (2020-04-06 12:52:45 +0200) ---------------------------------------------------------------- Xilinx changes for v2020.07 common: - Align ENV_FAT_INTERFACE - Fix MAC address source print log - Improve based autodetection code xilinx: - Enable netconsole Microblaze: - Setup default ENV_OFFSET/ENV_SECT_SIZE Zynq: - Multiple DT updates/fixes - Use DEVICE_TREE environment variable for DTB selection - Switch to single zynq configuration - Enable NOR flash via DM - Minor SPL print removal - Enable i2c mux driver ZynqMP: - Print multiboot register - Enable cache commands in mini mtest - Multiple DT updates/fixes - Fix firmware probing when driver is not enabled - Specify 3rd backup RAM boot mode in SPL - Add SPL support for zcu102 v1.1 and zcu111 revA - Redesign debug uart enabling and psu_init delay - Enable full u-boot run from EL3 - Enable u-boot.itb generation without ATF with U-Boot in EL3 Versal: - Enable distro default - Enable others SPI flashes - Enable systems without DDR Drivers: - Gem: - Flush memory after freeing - Handle mdio bus separately - Watchdog: - Get rid of unused global data pointer - Enable window watchdog timer - Serial: - Change reinitialization logic in zynq serial driver ---------------------------------------------------------------- Amit Kumar Mahapatra (1): arm64: zynqmp: Do not duplicate flash partition label property Ashok Reddy Soma (3): arm64: dts: zynqmp: Add clk cells for sdhci net: zynq_gem: Add cache flush to zynq_gem_free_pkt watchdog: versal: Add support for Xilinx window watchdog Manish Narani (1): arm64: zynqmp: Add 'no-1-8-v' property for ZynqMP Boards Michal Simek (40): arm64: zynqmp: Print multiboot register value in EL3 arm64: zynqmp: Enable cache command for mini mtest configuration arm64: zynqmp: Replace gpio-key,wakeup with wakeup source arm64: zynqmp: Update Copyright years to 2020 ARM: zynq: Fix spi name node arm64: zynqmp: Remove unused zynqmp-clk.dtsi arm64: zynqmp: Remove second copy of reset-controller arm64: zynqmp: Sync DP subsystem arm64: zynqmp: Fix addresses in partition definitions ARM: zynq: Fix addresses in partition definitions arm64: zynqmp: Fix GIC compatible property arm64: zynqmp: Move pinctrl node under firmware node ARM: zynq: Change zc770 xm011 Nand x16 configurations Makefile: Add environment variable DEVICE_TREE to header ARM: zynq: Switch to single zynq configurations ARM: zynq: Do not include full zynq-7000.dtsi to cse-nor configuration nand: raw: Do not free xnand structure nand: raw: zynq: Do not try to probe driver if nand flash is disabled ARM: zynq: Do not report NOR flash detection failure ARM: zynq: Enable DM for CFI NOR flash env: Make mmc as default option for CONFIG_ENV_FAT_INTERFACE arm64: zynqmp: Check firmware node when driver is enabled ARM: zynq: Do not print message about boot device net: zynq-gem: Setup and use mdio base separately watchdog: cadence: Remove DECLARE_GLOBAL_DATA_PTR from driver arm64: zynqmp: Add third backup bootmode arm64: zynqmp Add support for zcu102 rev1.1 ARM: zynq: Enable i2c mux support for all boards net: eth-uclass: Fix message if mac is coming from DT or ROM arm64: zynqmp Add support for zcu111 revA arm64: zynqmp: Enable netconsole for ZynqMP lib: Improve _parse_integer_fixup_radix base 16 detection arm64: zynqmp: Add support for debug uart also for U-Boot proper arm64: zynqmp: Move timeout for clock propagation below psu_init firmware: zynqmp: Enable IPI code calling also in EL3 arm64: zynqmp: Reorder parameters for zynqmp_mmio_write() arm64: zynqmp: Add support for u-boot.itb generation without ATF arm64: versal: Disable DDR cache mapping if DDR is not enabled arm64: xilinx: Never touch DDR if system has no DDR serial: zynq: Change uart initialization logic Nava kishore Manne (1): arm64: zynqmp: Sync zynqmp fpga manager with mainline Quanyang Wang (1): ARM: dts: zc702: Fix I2C bus warnings Sudeep Holla (1): ARM: dts: zynq: replace gpio-key,wakeup with wakeup-source property T Karthik Reddy (2): configs: versal: Add CONFIG_DISTRO_DEFAULTS to versal defconfig arm64: versal: Enable support for Gigadevice/ISSI flashes Varalaxmi Bingi (1): env: Kconfig: Adding default values for Microblaze .azure-pipelines.yml | 6 +- .gitlab-ci.yml | 6 +- .travis.yml | 6 +- MAINTAINERS | 1 + Makefile | 14 +- arch/arm/dts/Makefile | 1 + arch/arm/dts/avnet-ultra96-rev1.dts | 2 +- arch/arm/dts/zynq-cse-nor.dts | 27 ++-- arch/arm/dts/zynq-cse-qspi.dtsi | 10 +- arch/arm/dts/zynq-topic-miami.dts | 10 +- arch/arm/dts/zynq-zc702.dts | 12 +- arch/arm/dts/zynq-zc770-xm010.dts | 2 +- arch/arm/dts/zynq-zc770-xm011-x16.dts | 12 +- arch/arm/dts/zynq-zc770-xm011.dts | 2 +- arch/arm/dts/zynq-zc770-xm013.dts | 2 +- arch/arm/dts/zynq-zturn.dts | 2 +- arch/arm/dts/zynqmp-clk-ccf.dtsi | 12 +- arch/arm/dts/zynqmp-clk.dtsi | 244 ---------------------------------- arch/arm/dts/zynqmp-mini-qspi.dts | 2 +- arch/arm/dts/zynqmp-zc1232-revA.dts | 10 +- arch/arm/dts/zynqmp-zc1254-revA.dts | 10 +- arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts | 34 ++--- arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts | 6 +- arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts | 2 +- arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts | 12 +- arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts | 2 +- arch/arm/dts/zynqmp-zcu100-revC.dts | 2 +- arch/arm/dts/zynqmp-zcu102-rev1.0.dts | 6 +- arch/arm/dts/zynqmp-zcu102-rev1.1.dts | 15 +++ arch/arm/dts/zynqmp-zcu102-revA.dts | 36 +++--- arch/arm/dts/zynqmp-zcu102-revB.dts | 2 +- arch/arm/dts/zynqmp-zcu104-revA.dts | 10 +- arch/arm/dts/zynqmp-zcu104-revC.dts | 10 +- arch/arm/dts/zynqmp-zcu106-revA.dts | 14 +- arch/arm/dts/zynqmp-zcu111-revA.dts | 14 +- arch/arm/dts/zynqmp-zcu1275-revA.dts | 10 +- arch/arm/dts/zynqmp-zcu1275-revB.dts | 10 +- arch/arm/dts/zynqmp-zcu1285-revA.dts | 6 +- arch/arm/dts/zynqmp-zcu208-revA.dts | 8 +- arch/arm/dts/zynqmp-zcu216-revA.dts | 8 +- arch/arm/dts/zynqmp.dtsi | 172 +++++++++++------------- arch/arm/mach-versal/Kconfig | 6 + arch/arm/mach-versal/cpu.c | 9 ++ arch/arm/mach-zynq/spl.c | 10 +- arch/arm/mach-zynqmp/include/mach/hardware.h | 4 +- arch/arm/mach-zynqmp/mkimage_fit_atf.sh | 23 +++- arch/arm/mach-zynqmp/spl.c | 11 +- board/xilinx/common/board.c | 6 +- board/xilinx/zynqmp/zynqmp-zcu102-rev1.1/psu_init_gpl.c | 1042 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/xilinx/zynqmp/zynqmp-zcu111-revA/psu_init_gpl.c | 978 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/xilinx/zynqmp/zynqmp.c | 36 +++++- configs/xilinx_versal_virt_defconfig | 20 +-- configs/xilinx_zynq_virt_defconfig | 23 +++- configs/xilinx_zynqmp_mini_defconfig | 1 + configs/xilinx_zynqmp_virt_defconfig | 3 +- configs/zynq_cc108_defconfig | 61 --------- configs/zynq_cse_nor_defconfig | 3 + configs/zynq_dlc20_rev1_0_defconfig | 76 ----------- configs/zynq_microzed_defconfig | 66 ---------- configs/zynq_minized_defconfig | 67 ---------- configs/zynq_picozed_defconfig | 54 -------- configs/zynq_z_turn_defconfig | 67 ---------- configs/zynq_zc702_defconfig | 83 ------------ configs/zynq_zc706_defconfig | 87 ------------- configs/zynq_zc770_xm010_defconfig | 61 --------- configs/zynq_zc770_xm011_defconfig | 48 ------- configs/zynq_zc770_xm011_x16_defconfig | 48 ------- configs/zynq_zc770_xm012_defconfig | 50 ------- configs/zynq_zc770_xm013_defconfig | 53 -------- configs/zynq_zed_defconfig | 70 ---------- configs/zynq_zybo_defconfig | 69 ---------- configs/zynq_zybo_z7_defconfig | 66 ---------- doc/board/xilinx/zynq.rst | 3 +- drivers/firmware/firmware-zynqmp.c | 2 +- drivers/mtd/nand/raw/zynq_nand.c | 25 ++-- drivers/net/zynq_gem.c | 28 +++- drivers/serial/serial_zynq.c | 11 +- drivers/watchdog/Kconfig | 9 ++ drivers/watchdog/Makefile | 1 + drivers/watchdog/cdns_wdt.c | 2 - drivers/watchdog/xilinx_wwdt.c | 179 +++++++++++++++++++++++++ env/Kconfig | 5 +- include/configs/zynq-common.h | 3 +- lib/strto.c | 15 ++- net/eth-uclass.c | 12 +- 85 files changed, 2675 insertions(+), 1593 deletions(-) mode change 120000 => 100644 arch/arm/dts/zynq-zc770-xm011-x16.dts delete mode 100644 arch/arm/dts/zynqmp-clk.dtsi create mode 100644 arch/arm/dts/zynqmp-zcu102-rev1.1.dts create mode 100644 board/xilinx/zynqmp/zynqmp-zcu102-rev1.1/psu_init_gpl.c create mode 100644 board/xilinx/zynqmp/zynqmp-zcu111-revA/psu_init_gpl.c delete mode 100644 configs/zynq_cc108_defconfig delete mode 100644 configs/zynq_dlc20_rev1_0_defconfig delete mode 100644 configs/zynq_microzed_defconfig delete mode 100644 configs/zynq_minized_defconfig delete mode 100644 configs/zynq_picozed_defconfig delete mode 100644 configs/zynq_z_turn_defconfig delete mode 100644 configs/zynq_zc702_defconfig delete mode 100644 configs/zynq_zc706_defconfig delete mode 100644 configs/zynq_zc770_xm010_defconfig delete mode 100644 configs/zynq_zc770_xm011_defconfig delete mode 100644 configs/zynq_zc770_xm011_x16_defconfig delete mode 100644 configs/zynq_zc770_xm012_defconfig delete mode 100644 configs/zynq_zc770_xm013_defconfig delete mode 100644 configs/zynq_zed_defconfig delete mode 100644 configs/zynq_zybo_defconfig delete mode 100644 configs/zynq_zybo_z7_defconfig create mode 100644 drivers/watchdog/xilinx_wwdt.c -- Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Xilinx Microblaze Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs

2 1

zynq_z_turn_defconfig: broken networking
by Matwey V. Kornilov 08 Apr '20

08 Apr '20

Hello, I am running u-boot 2020.04-rc4-00100-g74bf17db39 with zynq_z_turn_defconfig configuration on MYIR Z-Turn board. And I see the following when I am trying to run `dhcp' command. ZYNQ GEM: e000b000, phyaddr 0, interface rgmii-id mdio_register: non unique device name 'eth0' ZYNQ GEM: e000b000, phyaddr 0, interface rgmii-id mdio_register: non unique device name 'eth0' ZYNQ GEM: e000b000, phyaddr 0, interface rgmii-id mdio_register: non unique device name 'eth0' ZYNQ GEM: e000b000, phyaddr 0, interface rgmii-id mdio_register: non unique device name 'eth0' No ethernet found. ZYNQ GEM: e000b000, phyaddr 0, interface rgmii-id mdio_register: non unique device name 'eth0' -- With best regards, Matwey V. Kornilov

3 15

i.MX8QXP hangs in SPL after a "reboot" command
by Fabio Estevam 08 Apr '20

08 Apr '20

Hi, Does anyone managed to successfully run a "reboot" command on i.MX8QXP with a mainline kernel? I see a hang in SPL on a imx8qxp-mek board: # reboot # Stopping network: OK Saving random seed: [ 6.305029] random: dd: uninitialized urandom read (512 bytes read) OK Stopping klogd: OK Stopping syslogd: OK umount: devtmpfs busy - remounted read-only [ 6.352820] EXT4-fs (mmcblk1p2): re-mounted. Opts: (null) The system is going down NOW! Sent SIGTERM to all processes Se[ 8.362121] kvm: exiting hardware virtualization [ 8.397849] reboot: Restarting system U-Boot SPL 2020.04-rc4-00061-ge0718b3ab7 (Apr 02 2020 - 16:14:22 -0300) Normal Boot WDT: Not found! Trying to boot from MMC2_2 spl: mmc init failed with error: -70 SPL: failed to boot from all boot devices ### ERROR ### Please RESET the board ### Any suggestions? Thanks, Fabio Estevam

2 5