April 2020 - U-Boot

[PATCH] arm: K3: Increase default SYSFW image size allocation
by Andrew F. Davis 11 May '20

11 May '20

The memory allocated to store the FIT image containing SYSFW and board configuration data is statically defined to the largest size expected. Some additions to the board configuration data has pushed us slightly over the current defined size on some HS devices, expand to 278000. Signed-off-by: Andrew F. Davis <afd(a)ti.com> --- arch/arm/mach-k3/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-k3/Kconfig b/arch/arm/mach-k3/Kconfig index a13cbef9b5..c7d186149b 100644 --- a/arch/arm/mach-k3/Kconfig +++ b/arch/arm/mach-k3/Kconfig @@ -119,7 +119,7 @@ config K3_SYSFW_IMAGE_MMCSD_RAW_MODE_PART config K3_SYSFW_IMAGE_SIZE_MAX int "Amount of memory dynamically allocated for loading SYSFW blob" depends on K3_LOAD_SYSFW - default 277000 + default 278000 help Amount of memory (in bytes) reserved through dynamic allocation at runtime for loading the combined System Firmware and configuration image -- 2.17.1

2 1

[PATCH] configs: ti: Fix usage of undefined variable overlay_files
by Suman Anna 11 May '20

11 May '20

The env variable overlay_files is used while adding the environment support commands for FIT loading, but it was cleaned up just prior in commit ee53b59511a6 ("configs: Remove unneeded overlay_files environment variable"). Fix this by replacing the undefined variable with the proper name_overlays env variable. Fixes: 76470b6929d5 ("configs: ti: Add environment support commands for FIT loading") Signed-off-by: Suman Anna <s-anna(a)ti.com> --- include/configs/ti_armv7_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index a612bb5b4a8e..08829781e314 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -63,7 +63,7 @@ "name_fit=fitImage\0" \ "update_to_fit=setenv loadaddr ${addr_fit}; setenv bootfile ${name_fit}\0" \ "get_overlaystring=" \ - "for overlay in $overlay_files;" \ + "for overlay in $name_overlays;" \ "do;" \ "setenv overlaystring ${overlaystring}'#'${overlay};" \ "done;\0" \ -- 2.26.0

2 1

[PATCH] omap3logic: Return omap3logic boards to OF_PLATDATA in SPL
by Adam Ford 11 May '20

11 May '20

SPL is just simply too tight and we don't really have any room to shave off any more functionality, so we need OF_PLATDATA in SPL. This patch adds the manual enumeration of serial and MMC while removing the device tree support in SPL and enabling SPL_OF_PLATDATA. Signed-off-by: Adam Ford <aford173(a)gmail.com> diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c index 21d8a21010..5a1fa292fc 100644 --- a/board/logicpd/omap3som/omap3logic.c +++ b/board/logicpd/omap3som/omap3logic.c @@ -239,3 +239,33 @@ int board_eth_init(bd_t *bis) return smc911x_initialize(0, CONFIG_SMC911X_BASE); } #endif + +/* This is only needed until SPL gets OF support that fits */ +#ifdef CONFIG_SPL_BUILD +static const struct ns16550_platdata omap3logic_serial = { + .base = OMAP34XX_UART1, + .reg_shift = 2, + .clock = V_NS16550_CLK, + .fcr = UART_FCR_DEFVAL, +}; + +U_BOOT_DEVICE(omap3logic_uart) = { + "ns16550_serial", + &omap3logic_serial +}; + +static const struct omap_hsmmc_plat omap3_logic_mmc0_platdata = { + .base_addr = (struct hsmmc *)OMAP_HSMMC1_BASE, + .cfg.host_caps = MMC_MODE_HS_52MHz | MMC_MODE_HS | MMC_MODE_4BIT, + .cfg.f_min = 400000, + .cfg.f_max = 52000000, + .cfg.voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195, + .cfg.b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT, +}; + +U_BOOT_DEVICE(am335x_mmc0) = { + .name = "omap_hsmmc", + .platdata = &omap3_logic_mmc0_platdata, +}; + +#endif diff --git a/configs/omap35_logic_defconfig b/configs/omap35_logic_defconfig index bcf4efc621..fbf60f9be2 100644 --- a/configs/omap35_logic_defconfig +++ b/configs/omap35_logic_defconfig @@ -43,6 +43,7 @@ CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="logicpd-torpedo-35xx-devkit" +CONFIG_SPL_OF_PLATDATA=y # CONFIG_ENV_IS_IN_FAT is not set CONFIG_ENV_IS_IN_NAND=y CONFIG_SPL_DM=y @@ -79,3 +80,5 @@ CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_OMAP2PLUS=y CONFIG_TWL4030_USB=y CONFIG_BCH=y +CONFIG_SPL_TINY_MEMSET=y +# CONFIG_SPL_OF_LIBFDT is not set diff --git a/configs/omap35_logic_somlv_defconfig b/configs/omap35_logic_somlv_defconfig index 51c5d449e0..07c6bf9039 100644 --- a/configs/omap35_logic_somlv_defconfig +++ b/configs/omap35_logic_somlv_defconfig @@ -42,6 +42,7 @@ CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="logicpd-som-lv-35xx-devkit" +CONFIG_SPL_OF_PLATDATA=y # CONFIG_ENV_IS_IN_FAT is not set CONFIG_ENV_IS_IN_NAND=y CONFIG_SPL_DM=y @@ -82,3 +83,5 @@ CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_OMAP2PLUS=y CONFIG_TWL4030_USB=y CONFIG_BCH=y +CONFIG_SPL_TINY_MEMSET=y +# CONFIG_SPL_OF_LIBFDT is not set diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index 15925fb7db..275e7c65ab 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -42,6 +42,7 @@ CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="logicpd-torpedo-37xx-devkit" +CONFIG_SPL_OF_PLATDATA=y # CONFIG_ENV_IS_IN_FAT is not set CONFIG_ENV_IS_IN_NAND=y CONFIG_SPL_DM=y @@ -78,3 +79,5 @@ CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_OMAP2PLUS=y CONFIG_TWL4030_USB=y CONFIG_BCH=y +CONFIG_SPL_TINY_MEMSET=y +# CONFIG_SPL_OF_LIBFDT is not set diff --git a/configs/omap3_logic_somlv_defconfig b/configs/omap3_logic_somlv_defconfig index ea8fc37f12..ef23831ed4 100644 --- a/configs/omap3_logic_somlv_defconfig +++ b/configs/omap3_logic_somlv_defconfig @@ -43,6 +43,7 @@ CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="logicpd-som-lv-37xx-devkit" +CONFIG_SPL_OF_PLATDATA=y # CONFIG_ENV_IS_IN_FAT is not set CONFIG_ENV_IS_IN_NAND=y CONFIG_SPL_DM=y @@ -84,3 +85,5 @@ CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_OMAP2PLUS=y CONFIG_TWL4030_USB=y CONFIG_BCH=y +CONFIG_SPL_TINY_MEMSET=y +# CONFIG_SPL_OF_LIBFDT is not set -- 2.25.1

2 1

[PATCH v2 00/22] common: Further reduce the size of common.h
by Simon Glass 10 May '20

10 May '20

4 30

rk3399 single channel lpddr4 setup
by Jack Mitchell 10 May '20

10 May '20

Has anyone worked with an rk3399 based board with a single channel RAM setup? I've looked at the current code and made some changes for only setting up a single channel which basically consists of altering the loops down to one channel, however u-boot is hanging while checking for a successful frequency change here: > /* change freq */ > writel((((0x3 << 4) | (1 << 2) | 1) << 16) | > (fn << 4) | (1 << 2) | 1, &dram->cic->cic_ctrl0); > while (!(readl(&dram->cic->cic_status0) & (1 << 2))) > ; > I believe this is due to waiting for both channels to switch frequency which will never happen as there is only a single channel setup. Has anyone worked with a similar setup, or have any further documentation as the TRM only has a fairly basic register listing. Regards, Jack.

2 3

[PATCH v2 0/8] rockchip: Add PCIe host support
by Jagan Teki 09 May '20

09 May '20

This series support PCIe host controller support on rockchip rk3399 platform. It is based on previous version[1] changes. Works well on rk3399 boards like rock960, nanopc-t4 and roc-kr3399-pc-mezzanine board as Gen1 configurable host with M.2 SSD. Changes for v2: - handle USB, GMAC clocks - collect kever r-o-b tag - simplify rd and wr conf API [1] http://patchwork.ozlabs.org/project/uboot/cover/20200425110354.12381-1-jaga… Any inputs? Jagan. Jagan Teki (8): iopoll: Add dealy to read poll iopoll: Add readl_poll_sleep_timeout clk: rk3399: Add enable/disable clks clk: rk3399: Enable/Disable the PCIEPHY clk pci: Add Rockchip PCIe controller driver pci: Add Rockchip PCIe PHY controller driver rockchip: Enable PCIe/M.2 on rk3399 board w/ M.2 rockchip: Enable PCIe/M.2 on rock960 board arch/arm/dts/rk3399-u-boot.dtsi | 1 + board/vamrs/rock960_rk3399/rock960-rk3399.c | 20 + configs/nanopc-t4-rk3399_defconfig | 4 + configs/roc-pc-mezzanine-rk3399_defconfig | 4 + configs/rock960-rk3399_defconfig | 5 + drivers/clk/rockchip/clk_rk3399.c | 154 ++++++ drivers/pci/Kconfig | 8 + drivers/pci/Makefile | 1 + drivers/pci/pcie_rockchip.c | 491 ++++++++++++++++++++ drivers/pci/pcie_rockchip.h | 142 ++++++ drivers/pci/pcie_rockchip_phy.c | 205 ++++++++ include/linux/iopoll.h | 23 +- 12 files changed, 1049 insertions(+), 9 deletions(-) create mode 100644 drivers/pci/pcie_rockchip.c create mode 100644 drivers/pci/pcie_rockchip.h create mode 100644 drivers/pci/pcie_rockchip_phy.c -- 2.17.1

3 14

[PATCH 1/2] configs: migrate CONFIG_SET_DFU_ALT_INFO to defconfigs
by Patrick Delaunay 08 May '20

08 May '20

Move CONFIG_SET_DFU_ALT_INFO into Kconfig done by moveconfig.py. Signed-off-by: Patrick Delaunay <patrick.delaunay(a)st.com> --- configs/odroid-xu3_defconfig | 1 + configs/odroid_defconfig | 1 + configs/stm32mp15_basic_defconfig | 1 + configs/stm32mp15_dhcom_basic_defconfig | 1 + configs/stm32mp15_optee_defconfig | 1 + configs/stm32mp15_trusted_defconfig | 1 + drivers/dfu/Kconfig | 5 +++++ include/configs/odroid.h | 1 - include/configs/odroid_xu3.h | 1 - include/configs/stm32mp1.h | 2 -- scripts/config_whitelist.txt | 1 - 11 files changed, 11 insertions(+), 5 deletions(-) diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig index 2e982e1b53..1a2183ce19 100644 --- a/configs/odroid-xu3_defconfig +++ b/configs/odroid-xu3_defconfig @@ -39,6 +39,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_ADC=y CONFIG_ADC_EXYNOS=y CONFIG_DFU_MMC=y +CONFIG_SET_DFU_ALT_INFO=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_MMC_DW=y CONFIG_MTD=y diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig index e4392e477e..345cc3b940 100644 --- a/configs/odroid_defconfig +++ b/configs/odroid_defconfig @@ -40,6 +40,7 @@ CONFIG_DEFAULT_DEVICE_TREE="exynos4412-odroid" CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DFU_MMC=y +CONFIG_SET_DFU_ALT_INFO=y CONFIG_SYS_I2C_S3C24X0=y CONFIG_MMC_DW=y CONFIG_MMC_SDHCI=y diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig index f691306800..4efb1bf9c2 100644 --- a/configs/stm32mp15_basic_defconfig +++ b/configs/stm32mp15_basic_defconfig @@ -71,6 +71,7 @@ CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_MTD=y CONFIG_DFU_VIRT=y +CONFIG_SET_DFU_ALT_INFO=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 CONFIG_FASTBOOT_BUF_SIZE=0x02000000 diff --git a/configs/stm32mp15_dhcom_basic_defconfig b/configs/stm32mp15_dhcom_basic_defconfig index 921dea242a..9b5e54748d 100644 --- a/configs/stm32mp15_dhcom_basic_defconfig +++ b/configs/stm32mp15_dhcom_basic_defconfig @@ -70,6 +70,7 @@ CONFIG_SPL_BLOCK_CACHE=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_VIRT=y +CONFIG_SET_DFU_ALT_INFO=y CONFIG_DM_HWSPINLOCK=y CONFIG_HWSPINLOCK_STM32=y CONFIG_DM_I2C=y diff --git a/configs/stm32mp15_optee_defconfig b/configs/stm32mp15_optee_defconfig index 521b24e2cb..54135b28aa 100644 --- a/configs/stm32mp15_optee_defconfig +++ b/configs/stm32mp15_optee_defconfig @@ -58,6 +58,7 @@ CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_MTD=y CONFIG_DFU_VIRT=y +CONFIG_SET_DFU_ALT_INFO=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 CONFIG_FASTBOOT_BUF_SIZE=0x02000000 diff --git a/configs/stm32mp15_trusted_defconfig b/configs/stm32mp15_trusted_defconfig index c8b328d01a..d7d0b6c296 100644 --- a/configs/stm32mp15_trusted_defconfig +++ b/configs/stm32mp15_trusted_defconfig @@ -57,6 +57,7 @@ CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_MTD=y CONFIG_DFU_VIRT=y +CONFIG_SET_DFU_ALT_INFO=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0xC0000000 CONFIG_FASTBOOT_BUF_SIZE=0x02000000 diff --git a/drivers/dfu/Kconfig b/drivers/dfu/Kconfig index 174fb588a6..5d45d7d7c2 100644 --- a/drivers/dfu/Kconfig +++ b/drivers/dfu/Kconfig @@ -81,5 +81,10 @@ config DFU_VIRT used at board level to manage specific behavior (OTP update for example). +config SET_DFU_ALT_INFO + bool "Dynamic set of DFU alternate information" + help + This option allows to call the function set_dfu_alt_info to + dynamically build dfu_alt_info in board. endif endmenu diff --git a/include/configs/odroid.h b/include/configs/odroid.h index a7e2a3d9a2..4044365328 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -64,7 +64,6 @@ ""PARTS_BOOT" part 0 1;" \ ""PARTS_ROOT" part 0 2\0" \ -#define CONFIG_SET_DFU_ALT_INFO #define CONFIG_SET_DFU_ALT_BUF_LEN (SZ_1K) #define CONFIG_DFU_ALT_BOOT_EMMC \ diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index 47c30543f8..564319c231 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -76,7 +76,6 @@ /* Enable: board/samsung/common/misc.c to use set_dfu_alt_info() */ #define CONFIG_MISC_COMMON -#define CONFIG_SET_DFU_ALT_INFO #define CONFIG_SET_DFU_ALT_BUF_LEN (SZ_1K) /* Set soc_rev, soc_id, board_rev, board_name, fdtfile */ diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h index 42717c167e..592638072a 100644 --- a/include/configs/stm32mp1.h +++ b/include/configs/stm32mp1.h @@ -90,8 +90,6 @@ #define CONFIG_SYS_MTDPARTS_RUNTIME #endif -#define CONFIG_SET_DFU_ALT_INFO - #ifdef CONFIG_DM_VIDEO #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_BMP_16BPP diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 405c62e9be..85d55b182e 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1529,7 +1529,6 @@ CONFIG_SETUP_MEMORY_TAGS CONFIG_SET_BIST CONFIG_SET_BOOTARGS CONFIG_SET_DFU_ALT_BUF_LEN -CONFIG_SET_DFU_ALT_INFO CONFIG_SFIO CONFIG_SF_DATAFLASH CONFIG_SGI_IP28 -- 2.17.1

5 7

[RFC] dm: uclass: add functions to get device by platdata
by Walter Lozano 08 May '20

08 May '20

When OF_PLATDATA is enabled DT information is parsed and platdata structures are populated. In this context the links between DT nodes are represented as pointers to platdata structures, and there is no clear way to access to the device which owns the structure. This patch implements a set of functions: - device_find_by_platdata - uclass_find_device_by_platdata to access to the device. Signed-off-by: Walter Lozano <walter.lozano(a)collabora.com> --- drivers/core/device.c | 19 +++++++++++++++++++ drivers/core/uclass.c | 34 ++++++++++++++++++++++++++++++++++ include/dm/device.h | 2 ++ include/dm/uclass-internal.h | 3 +++ include/dm/uclass.h | 2 ++ 5 files changed, 60 insertions(+) diff --git a/drivers/core/device.c b/drivers/core/device.c index 89ea820d48..54a3a8d870 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -591,6 +591,25 @@ static int device_find_by_ofnode(ofnode node, struct udevice **devp) } #endif + +int device_find_by_platdata(void *platdata, struct udevice **devp) +{ + struct uclass *uc; + struct udevice *dev; + int ret; + + list_for_each_entry(uc, &gd->uclass_root, sibling_node) { + ret = uclass_find_device_by_platdata(uc->uc_drv->id, platdata, + &dev); + if (!ret || dev) { + *devp = dev; + return 0; + } + } + + return -ENODEV; +} + int device_get_child(const struct udevice *parent, int index, struct udevice **devp) { diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c index 58b19a4210..7b0ae5b122 100644 --- a/drivers/core/uclass.c +++ b/drivers/core/uclass.c @@ -271,6 +271,29 @@ int uclass_find_device_by_name(enum uclass_id id, const char *name, return -ENODEV; } +int uclass_find_device_by_platdata(enum uclass_id id, void * platdata, struct udevice **devp) +{ + struct uclass *uc; + struct udevice *dev; + int ret; + + *devp = NULL; + ret = uclass_get(id, &uc); + if (ret) + return ret; + if (list_empty(&uc->dev_head)) + return -ENODEV; + + uclass_foreach_dev(dev, uc) { + if (dev->platdata == platdata) { + *devp = dev; + return 0; + } + } + + return -ENODEV; +} + int uclass_find_next_free_req_seq(enum uclass_id id) { struct uclass *uc; @@ -466,6 +489,17 @@ int uclass_get_device_by_name(enum uclass_id id, const char *name, return uclass_get_device_tail(dev, ret, devp); } +int uclass_get_device_by_platdata(enum uclass_id id, void * platdata, + struct udevice **devp) +{ + struct udevice *dev; + int ret; + + *devp = NULL; + ret = uclass_find_device_by_platdata(id, platdata, &dev); + return uclass_get_device_tail(dev, ret, devp); +} + int uclass_get_device_by_seq(enum uclass_id id, int seq, struct udevice **devp) { struct udevice *dev; diff --git a/include/dm/device.h b/include/dm/device.h index ab806d0b7e..3c043a3127 100644 --- a/include/dm/device.h +++ b/include/dm/device.h @@ -396,6 +396,8 @@ enum uclass_id device_get_uclass_id(const struct udevice *dev); */ const char *dev_get_uclass_name(const struct udevice *dev); +int device_find_by_platdata(void *platdata, struct udevice **devp); + /** * device_get_child() - Get the child of a device by index * diff --git a/include/dm/uclass-internal.h b/include/dm/uclass-internal.h index 6e3f15c2b0..f643fc95da 100644 --- a/include/dm/uclass-internal.h +++ b/include/dm/uclass-internal.h @@ -100,6 +100,9 @@ int uclass_find_next_device(struct udevice **devp); int uclass_find_device_by_name(enum uclass_id id, const char *name, struct udevice **devp); +int uclass_find_device_by_platdata(enum uclass_id id, void *platdata, + struct udevice **devp); + /** * uclass_find_device_by_seq() - Find uclass device based on ID and sequence * diff --git a/include/dm/uclass.h b/include/dm/uclass.h index 70fca79b44..92c07f8426 100644 --- a/include/dm/uclass.h +++ b/include/dm/uclass.h @@ -167,6 +167,8 @@ int uclass_get_device(enum uclass_id id, int index, struct udevice **devp); int uclass_get_device_by_name(enum uclass_id id, const char *name, struct udevice **devp); +int uclass_get_device_by_platdata(enum uclass_id id, void *platdata, + struct udevice **devp); /** * uclass_get_device_by_seq() - Get a uclass device based on an ID and sequence * -- 2.20.1

2 20

[PATCH u-boot-marvell 00/11] Armada 37xx: port comphy to generic-phys (PLEASE TEST)
by Marek Behún 08 May '20

08 May '20

Hi, I have ported the COMPHY and UTMI PHY drivers from Linux to U-Boot. With this we are able to abandon the current comphy_a3700 driver, which is incompatible with Linux' device trees. So if we want to have DTS files for A3720 boards identical to Linux', we have to do this. This series adds the set_mode functionality to generic-phy, then adds the ports of UTMI PHY and COMPHY drivers from Linux, then makes some drivers use the generic-phy API on device probe (these drivers are mvneta, ahci_mvebu, pci-aardvark, xhci-mvebu and ehci-marvell), then converts defconfigs and device trees to use the new bindings and drivers, and the last patch removes the comphy_a3700 driver. I have successfully compiled U-Boot without errors for all these boards (their defconigs) and also for Armada 8k boards, but am unable to test on anything else but Turris MOX. Please note that in order for the COMPHY driver to work, you have to use current ARM Trusted Firmware (such that it supports PHY powering on/off via SMC calls). It would be nice if people tested this series. Marek Marek Behún (11): phy: add support for setting phy mode phy: port Armada 37xx UTMI PHY from Linux phy: port Armada 37xx COMPHY from Linux usb: host: make PHY handling more generic usb: ehci-marvell: call generic-phy initialization usb: xhci-mvebu: call generic-phy initialization pci: aardvark: add PHY support ata: ahci_mvebu: add PHY support net: mvneta: add PHY support arm64: mvebu: armada-37xx: convert to use new generic-phy drivers phy: marvell: remove comphy_a3700 driver arch/arm/dts/armada-3720-db.dts | 12 - arch/arm/dts/armada-3720-espressobin.dts | 18 - arch/arm/dts/armada-3720-turris-mox.dts | 19 +- arch/arm/dts/armada-3720-uDPU.dts | 18 +- arch/arm/dts/armada-37xx.dtsi | 72 +- board/CZ.NIC/turris_mox/turris_mox.c | 33 - configs/mvebu_db-88f3720_defconfig | 6 +- configs/mvebu_espressobin-88f3720_defconfig | 6 +- configs/turris_mox_defconfig | 6 +- configs/uDPU_defconfig | 6 +- drivers/ata/ahci_mvebu.c | 35 + drivers/net/mvneta.c | 23 + drivers/pci/pci-aardvark.c | 55 +- drivers/phy/Kconfig | 16 + drivers/phy/Makefile | 2 + drivers/phy/marvell/Makefile | 1 - drivers/phy/marvell/comphy_a3700.c | 1021 ------------------- drivers/phy/marvell/comphy_a3700.h | 264 ----- drivers/phy/marvell/comphy_core.c | 3 - drivers/phy/marvell/comphy_core.h | 25 +- drivers/phy/phy-mvebu-a3700-comphy.c | 315 ++++++ drivers/phy/phy-mvebu-a3700-utmi.c | 235 +++++ drivers/phy/phy-uclass.c | 11 + drivers/usb/host/Makefile | 2 + drivers/usb/host/ehci-generic.c | 11 +- drivers/usb/host/ehci-hcd.c | 66 -- drivers/usb/host/ehci-marvell.c | 33 +- drivers/usb/host/ehci-msm.c | 7 +- drivers/usb/host/ehci-pci.c | 6 +- drivers/usb/host/ehci.h | 4 - drivers/usb/host/phy.c | 115 +++ drivers/usb/host/phy.h | 31 + drivers/usb/host/xhci-mvebu.c | 19 +- include/generic-phy.h | 51 + include/mvebu/comphy.h | 22 - 35 files changed, 1046 insertions(+), 1523 deletions(-) delete mode 100644 drivers/phy/marvell/comphy_a3700.c delete mode 100644 drivers/phy/marvell/comphy_a3700.h create mode 100644 drivers/phy/phy-mvebu-a3700-comphy.c create mode 100644 drivers/phy/phy-mvebu-a3700-utmi.c create mode 100644 drivers/usb/host/phy.c create mode 100644 drivers/usb/host/phy.h delete mode 100644 include/mvebu/comphy.h -- 2.24.1

4 18

[RFC PATCH 0/2] Move FSP configuration to devicetree
by Bernhard Messerklinger 08 May '20

08 May '20

This patch series moves the configuration of FPS-S and FSP-M for Apollo Lake based SoCs from the code to the devicetree. In order to make the FSP configuration easy to extend and maintain new binding structs for FSP-M and FSP-S are introduced. These structs contain the information of which devicetree settings need to be copied to which offset in the FSP config structure. The actual code handling these structs is rather small, and generic for both FSP-S and FSP-M. This patch series replaces the previous sent patches: "arch: x86: apl: Read FSP-M configuration from device-tree" [1] "Move FSP-S configuration to device-tree" [2] Changes to [1] and [2]: - No default settings within U-Boot, the default settings in FSP are used directly - The code for copying the data was simplified, and the information of what needs to be copied was moved to newly introduced structures [1]: https://lists.denx.de/pipermail/u-boot/2020-April/405852.html [2]: https://lists.denx.de/pipermail/u-boot/2020-April/406590.html Bernhard Messerklinger (2): arch: x86: apl: Only load VBT if CONFIG_HAVE_VBT is enabled arch: x86: apl: Use devicetree for FSP configuration arch/x86/cpu/apollolake/Makefile | 1 + arch/x86/cpu/apollolake/fsp_bindings.c | 2096 +++++++++++++++++ arch/x86/cpu/apollolake/fsp_m.c | 164 +- arch/x86/cpu/apollolake/fsp_s.c | 404 +--- arch/x86/dts/chromebook_coral.dts | 72 +- .../asm/arch-apollolake/fsp/fsp_m_upd.h | 168 ++ .../asm/arch-apollolake/fsp/fsp_s_upd.h | 202 ++ .../asm/arch-apollolake/fsp_bindings.h | 74 + .../fsp/fsp2/apollolake/fsp-m.txt | 320 +++ .../fsp/fsp2/apollolake/fsp-s.txt | 483 ++++ 10 files changed, 3432 insertions(+), 552 deletions(-) create mode 100644 arch/x86/cpu/apollolake/fsp_bindings.c create mode 100644 arch/x86/include/asm/arch-apollolake/fsp_bindings.h create mode 100644 doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-m.txt create mode 100644 doc/device-tree-bindings/fsp/fsp2/apollolake/fsp-s.txt -- 2.26.0

2 7