November 2018 - U-Boot

[U-Boot] [PATCH u-boot] mmc: meson-gx: Add AXG compatible
by Neil Armstrong 09 Nov '18

09 Nov '18

Add the compatible string for the upcoming Amlogic AXG SoC family. Signed-off-by: Neil Armstrong <narmstrong(a)baylibre.com> --- drivers/mmc/meson_gx_mmc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c index 332f1e1..767dfff 100644 --- a/drivers/mmc/meson_gx_mmc.c +++ b/drivers/mmc/meson_gx_mmc.c @@ -278,6 +278,7 @@ int meson_mmc_bind(struct udevice *dev) static const struct udevice_id meson_mmc_match[] = { { .compatible = "amlogic,meson-gx-mmc" }, + { .compatible = "amlogic,meson-axg-mmc" }, { /* sentinel */ } }; -- 2.7.4

1 0

[U-Boot] Portability of sh scripts
by Martin Husemann 09 Nov '18

09 Nov '18

Hey folks, I noticed that tools/imx_cntr_image.sh contains non-portable code: if [ $f == "u-boot-dtb.bin" ]; then This is a "bash-ism", the operator "==" is not implemented by most test(1) or sh(1) impmlementations. Simply replacing it with "=" fixes this. Should I send a trivial patch or do you just fix it? Thanks, Martin

2 1

[U-Boot] error in the make: bad value in the asm-offsets.c file
by Sarah Wicker 09 Nov '18

09 Nov '18

Good Morning, i am trying to compile u-boot on my pc to use it for a ZedBoard from Xilinx. I cloned the repository u-boot-xlnx using this link: https://github.com/Xilinx/u-boot-xlnx.git Made the first make to build the U-boot for a ZedBoard, it works well. Asked for the second make and i received the message that in the file asm-offsets.c:1:0: error: bad value (armv5) for -march=switch I opened the file but couldn't see were was this value [cid:image001.jpg@01D476BE.1BC339F0] For information i am trying to compile on a virtual machine using Debian9.5.0 I thank you in advance for your help Sarah Wicker

3 5

[U-Boot] [PATCH 1/2] efi_loader: export efi_locate_handle() function
by AKASHI Takahiro 09 Nov '18

09 Nov '18

This function will be used later to implement efi_disk_update(). Signed-off-by: AKASHI Takahiro <takahiro.akashi(a)linaro.org> --- include/efi_loader.h | 4 ++++ lib/efi_loader/efi_boottime.c | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/include/efi_loader.h b/include/efi_loader.h index ce0f420b5004..5cc3bded03fa 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -318,6 +318,10 @@ efi_status_t efi_create_handle(efi_handle_t *handle); void efi_delete_handle(efi_handle_t obj); /* Call this to validate a handle and find the EFI object for it */ struct efi_object *efi_search_obj(const efi_handle_t handle); +/* locate handles */ +efi_status_t efi_locate_handle(enum efi_locate_search_type search_type, + const efi_guid_t *protocol, void *search_key, + efi_uintn_t *buffer_size, efi_handle_t *buffer); /* Find a protocol on a handle */ efi_status_t efi_search_protocol(const efi_handle_t handle, const efi_guid_t *protocol_guid, diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 8a43a5a84091..a3c56bbab552 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -1309,10 +1309,9 @@ static int efi_search(enum efi_locate_search_type search_type, * * Return: status code */ -static efi_status_t efi_locate_handle( - enum efi_locate_search_type search_type, - const efi_guid_t *protocol, void *search_key, - efi_uintn_t *buffer_size, efi_handle_t *buffer) +efi_status_t efi_locate_handle(enum efi_locate_search_type search_type, + const efi_guid_t *protocol, void *search_key, + efi_uintn_t *buffer_size, efi_handle_t *buffer) { struct efi_object *efiobj; efi_uintn_t size = 0; -- 2.19.0

2 4

Re: [U-Boot] [PATCH v3 3/5] Use _AC and UL macros from linux/const.h
by Rick Chen 09 Nov '18

09 Nov '18

> > > Drop the _AC and UL macros from common.h. Linux headers is the > > > original source of this macro, so keep its definition in the same header. > > > > > > Update existing users of these macros to include const.h directly. > > > > > > Cc: Daniel Schwierzeck <daniel.schwierzeck(a)gmail.com> > > > Cc: Rick Chen <rick(a)andestech.com> > > > Signed-off-by: Baruch Siach <baruch(a)tkos.co.il> > > > > I know you'll need to now drop the MIPS part but otherwise: > > > > Reviewed-by: Tom Rini <trini(a)konsulko.com> > > Reviewed-by: Rick Chen <rick(a)andestech.com> > > -- > > Tom

1 0

[U-Boot] [PATCH] armv8: lx2160ardb: Add TFABOOT Secure Boot support
by Vinitha V Pillai 09 Nov '18

09 Nov '18

Signed-off-by: Vinitha V Pillai <vinitha.pillai(a)nxp.com> --- configs/lx2160ardb_tfa_SECURE_BOOT_defconfig | 83 ++++++++++++++++++++ include/configs/lx2160a_common.h | 12 ++- 2 files changed, 93 insertions(+), 2 deletions(-) create mode 100644 configs/lx2160ardb_tfa_SECURE_BOOT_defconfig diff --git a/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig b/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig new file mode 100644 index 0000000000..eb1632866b --- /dev/null +++ b/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig @@ -0,0 +1,83 @@ +CONFIG_ARM=y +CONFIG_TARGET_LX2160ARDB=y +CONFIG_SYS_TEXT_BASE=0x82000000 +CONFIG_SEC_FIRMWARE_ARMV8_PSCI=y +CONFIG_SECURE_BOOT=y +CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT=y +CONFIG_DEFAULT_DEVICE_TREE="fsl-lx2160a-rdb" +CONFIG_NR_DRAM_BANKS=3 +CONFIG_BOOTDELAY=0 +CONFIG_DM=y +CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y +CONFIG_OF_BOARD_SETUP=y +CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_TFABOOT=y +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyAMA0,115200 root=/dev/ram0 earlycon=pl011,mmio32,0x21c0000 ramdisk_size=0x2000000 default_hugepagesz=1024m hugepagesz=1024m hugepages=2 pci=pcie_bus_perf" +# CONFIG_CMD_IMLS is not set +CONFIG_CMD_GREPENV=y +CONFIG_CMD_EEPROM=y +CONFIG_CMD_GPT=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y +CONFIG_CMD_USB=y +CONFIG_CMD_CACHE=y +CONFIG_MP=y +CONFIG_OF_CONTROL=y +CONFIG_ENV_IS_NOWHERE=y +CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_DM_SERIAL=y +CONFIG_SERIAL_PROBE_ALL=y +CONFIG_CONS_INDEX=0 +CONFIG_FSL_CAAM=y +CONFIG_FSL_ESDHC=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_STMICRO=y +CONFIG_SPI_FLASH_MICRON=y +CONFIG_SPI_FLASH_USE_4K_SECTORS=n +CONFIG_SPI_FLASH_SPANSION=y +CONFIG_NXP_FSPI=y +CONFIG_FSPI_AHB_EN_4BYTE=y +CONFIG_SYS_FSPI_AHB_INIT=y +CONFIG_PHYLIB=y +CONFIG_NETDEVICES=y +CONFIG_PHY_GIGE=y +CONFIG_CMD_NET=y +CONFIG_CMD_PING=y +CONFIG_CMD_PXE=y +CONFIG_CMD_MII=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_FAT=y +CONFIG_CMD_EXT2=y +CONFIG_NET=y +CONFIG_DM_MMC=y +CONFIG_DM_MMC_OPS=n +CONFIG_BLK=n +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_STORAGE=y +CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_SCSI_AHCI=y +CONFIG_SCSI=y +# CONFIG_SYS_FSL_DDR_PHY is not set +CONFIG_SYS_GEN2_DDR_PHY=y +CONFIG_SYS_MALLOC_F=y +CONFIG_SYS_MALLOC_F_LEN=0x6000 +CONFIG_PHYLIB_10G=y +CONFIG_PHY_AQUANTIA=y +CONFIG_PHY_CORTINA=y +CONFIG_PHY_ATHEROS=y +CONFIG_PHY_INPHI=y +CONFIG_INPHI_25G=y +CONFIG_HUSH_PARSER=y +CONFIG_EMC2305=y +CONFIG_RSA=y +CONFIG_SPL_RSA=y +CONFIG_RSA_SOFTWARE_EXP=y diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h index 51037d321a..42429ce16b 100644 --- a/include/configs/lx2160a_common.h +++ b/include/configs/lx2160a_common.h @@ -194,9 +194,15 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */ /* Initial environment variables */ -#define XSPI_NOR_BOOTCOMMAND "fsl_mc apply dpl 0x20d00000;" \ +#define XSPI_NOR_BOOTCOMMAND "env exists mcinitcmd && env exists secureboot" \ + "&& esbc_validate 0x207C0000; " \ + "env exists mcinitcmd && " \ + "fsl_mc apply dpl 0x20d00000;" \ "sf probe 0:0;" \ "sf read 0xa0000000 0x1000000 0x3000000;" \ + "env exists secureboot &&" \ + "sf read 0x80200000 0x800000 0x4000 &&" \ + "esbc_validate 0x80200000;" \ "bootm 0xa0000000" #define SD_BOOTCOMMAND "mmc read 0xa0000000 0x6800 0xA0;" \ @@ -205,11 +211,13 @@ unsigned long get_board_ddr_clk(void); "bootm 0xb0000000" #define XSPI_MC_INIT_CMD \ + "echo trying to load mc....;env exists secureboot && " \ + "esbc_validate 0x20700000 && " \ + "esbc_validate 0x20780000 ;" \ "fsl_mc start mc 0x20a00000 0x20e00000\0" #define SD_MC_INIT_CMD \ "mmc read 0x80000000 0x5000 0x800;" \ "mmc read 0x80100000 0x7000 0x800;" \ "fsl_mc start mc 0x80000000 0x80100000\0" - #endif /* __LX2_COMMON_H */ -- 2.17.1

1 0

[U-Boot] [BUG] efi-x86_app_defconfig does not build with gcc 8.2
by Heinrich Schuchardt 09 Nov '18

09 Nov '18

make mrproper && make efi-x86_app_defconfig && make results in CC common/image.o {standard input}: Assembler messages: {standard input}:21662: Error: junk at end of line, first unrecognized character is `@' {standard input}:21707: Error: junk at end of line, first unrecognized character is `@' {standard input}:21662: Error: can't resolve `end.6878' {.u_boot_list_2_fit_loadable_3 section} - `start.6875' {.u_boot_list_2_fit_loadable_1 section} {standard input}:21707: Error: can't resolve `end.6878' {.u_boot_list_2_fit_loadable_3 section} - `start.6875' {.u_boot_list_2_fit_loadable_1 section} I am using Debian Buster with gcc-8.2.0. Building with gcc-7.3.0 works fine. We had a similar issue for qemu-x86_defconfig in https://lists.denx.de/pipermail/u-boot/2018-July/336393.html which has been resolved. Best regards Heinrich Schuchardt

4 12

[U-Boot] ARM64: armada3720: strange u-boot freeze (how to debug?)
by Marek Behún 08 Nov '18

08 Nov '18

Hello, during my development for U-Boot on Turris Mox I keep encountering this strange bug when sometimes U-Boot gets compiled in such a way that it freezes after printing the first line: U-Boot 2018.11-rc3-00065-gfc69da4cb1-dirty (Nov 08 2018 - 15:51:52 +0100) This bug disappears if I change something, for example a add a puts("lol\n"); somewhere, or change the version of the compiler. It seems like some unaligned access, or maybe the compiler sometimes generates wrong instruction (but all gcc versions from 6 to 8 do this sometimes). How should I find out what the issue is? Thank you. Marek Behun

1 0

[U-Boot] [PATCH v3 1/5] MIPS: drop asm/const.h
by Baruch Siach 08 Nov '18

08 Nov '18

Commit 86f21c96f467368 (mips: Use common _AC macro now.) removed the _AC definition from const.h. All other macros defined in const.h are not used anywhere. Remove this header. Cc: Daniel Schwierzeck <daniel.schwierzeck(a)gmail.com> Signed-off-by: Baruch Siach <baruch(a)tkos.co.il> --- v3: New patch in this series --- arch/mips/include/asm/const.h | 27 --------------------- arch/mips/include/asm/mach-generic/spaces.h | 2 -- 2 files changed, 29 deletions(-) delete mode 100644 arch/mips/include/asm/const.h diff --git a/arch/mips/include/asm/const.h b/arch/mips/include/asm/const.h deleted file mode 100644 index ed43b5d534ac..000000000000 --- a/arch/mips/include/asm/const.h +++ /dev/null @@ -1,27 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * const.h: Macros for dealing with constants. - */ - -#ifndef _LINUX_CONST_H -#define _LINUX_CONST_H - -/* Some constant macros are used in both assembler and - * C code. Therefore we cannot annotate them always with - * 'UL' and other type specifiers unilaterally. We - * use the following macros to deal with this. - * - * Similarly, _AT() will cast an expression with a type in C, but - * leave it unchanged in asm. - */ - -#ifdef __ASSEMBLY__ -#define _AT(T,X) X -#else -#define _AT(T,X) ((T)(X)) -#endif - -#define _BITUL(x) (_AC(1,UL) << (x)) -#define _BITULL(x) (_AC(1,ULL) << (x)) - -#endif /* !(_LINUX_CONST_H) */ diff --git a/arch/mips/include/asm/mach-generic/spaces.h b/arch/mips/include/asm/mach-generic/spaces.h index b7eac323cd67..85f5849abfbe 100644 --- a/arch/mips/include/asm/mach-generic/spaces.h +++ b/arch/mips/include/asm/mach-generic/spaces.h @@ -7,8 +7,6 @@ #ifndef _ASM_MACH_GENERIC_SPACES_H #define _ASM_MACH_GENERIC_SPACES_H -#include <asm/const.h> - /* * This gives the physical RAM offset. */ -- 2.19.1

3 9

[U-Boot] [PATCH usb RFC] usb: Make vbus-supply code common
by Marek Behún 08 Nov '18

08 Nov '18

The code for vbus-supply regulator enabling/disabling is repeated in several drivers. Create a header file with static inline definitions of the funtions and use them in some of those drivers. Signed-off-by: Marek Behún <marek.behun(a)nic.cz> --- drivers/usb/host/dwc2.c | 61 ++++----------------------------- drivers/usb/host/ehci-generic.c | 51 +++------------------------ drivers/usb/host/vbus-supply.h | 49 ++++++++++++++++++++++++++ drivers/usb/host/xhci-mvebu.c | 28 +++++++++------ 4 files changed, 76 insertions(+), 113 deletions(-) create mode 100644 drivers/usb/host/vbus-supply.h diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c index b6f008a400..51a2e21a6b 100644 --- a/drivers/usb/host/dwc2.c +++ b/drivers/usb/host/dwc2.c @@ -14,9 +14,9 @@ #include <usbroothubdes.h> #include <wait_bit.h> #include <asm/io.h> -#include <power/regulator.h> #include <reset.h> +#include "vbus-supply.h" #include "dwc2.h" /* Use only HC channel 0. */ @@ -168,57 +168,6 @@ static void dwc_otg_core_reset(struct dwc2_core_regs *regs) mdelay(100); } -#if defined(CONFIG_DM_USB) && defined(CONFIG_DM_REGULATOR) -static int dwc_vbus_supply_init(struct udevice *dev) -{ - struct dwc2_priv *priv = dev_get_priv(dev); - int ret; - - ret = device_get_supply_regulator(dev, "vbus-supply", - &priv->vbus_supply); - if (ret) { - debug("%s: No vbus supply\n", dev->name); - return 0; - } - - ret = regulator_set_enable(priv->vbus_supply, true); - if (ret) { - dev_err(dev, "Error enabling vbus supply\n"); - return ret; - } - - return 0; -} - -static int dwc_vbus_supply_exit(struct udevice *dev) -{ - struct dwc2_priv *priv = dev_get_priv(dev); - int ret; - - if (priv->vbus_supply) { - ret = regulator_set_enable(priv->vbus_supply, false); - if (ret) { - dev_err(dev, "Error disabling vbus supply\n"); - return ret; - } - } - - return 0; -} -#else -static int dwc_vbus_supply_init(struct udevice *dev) -{ - return 0; -} - -#if defined(CONFIG_DM_USB) -static int dwc_vbus_supply_exit(struct udevice *dev) -{ - return 0; -} -#endif -#endif - /* * This function initializes the DWC_otg controller registers for * host mode. @@ -311,8 +260,10 @@ static void dwc_otg_core_host_init(struct udevice *dev, } } - if (dev) - dwc_vbus_supply_init(dev); + if (dev) { + struct dwc2_priv *priv = dev_get_priv(dev); + enable_vbus_supply(dev, &priv->vbus_supply); + } } /* @@ -1332,7 +1283,7 @@ static int dwc2_usb_remove(struct udevice *dev) struct dwc2_priv *priv = dev_get_priv(dev); int ret; - ret = dwc_vbus_supply_exit(dev); + ret = disable_vbus_supply(priv->vbus_supply); if (ret) return ret; diff --git a/drivers/usb/host/ehci-generic.c b/drivers/usb/host/ehci-generic.c index 0270f3bc95..e47263ba58 100644 --- a/drivers/usb/host/ehci-generic.c +++ b/drivers/usb/host/ehci-generic.c @@ -11,7 +11,7 @@ #include <asm/io.h> #include <dm.h> #include "ehci.h" -#include <power/regulator.h> +#include "vbus-supply.h" /* * Even though here we don't explicitly use "struct ehci_ctrl" @@ -30,49 +30,6 @@ struct generic_ehci { int reset_count; }; -#ifdef CONFIG_DM_REGULATOR -static int ehci_enable_vbus_supply(struct udevice *dev) -{ - struct generic_ehci *priv = dev_get_priv(dev); - int ret; - - ret = device_get_supply_regulator(dev, "vbus-supply", - &priv->vbus_supply); - if (ret && ret != -ENOENT) - return ret; - - if (priv->vbus_supply) { - ret = regulator_set_enable(priv->vbus_supply, true); - if (ret) { - dev_err(dev, "Error enabling VBUS supply\n"); - return ret; - } - } else { - dev_dbg(dev, "No vbus supply\n"); - } - - return 0; -} - -static int ehci_disable_vbus_supply(struct generic_ehci *priv) -{ - if (priv->vbus_supply) - return regulator_set_enable(priv->vbus_supply, false); - else - return 0; -} -#else -static int ehci_enable_vbus_supply(struct udevice *dev) -{ - return 0; -} - -static int ehci_disable_vbus_supply(struct generic_ehci *priv) -{ - return 0; -} -#endif - static int ehci_usb_probe(struct udevice *dev) { struct generic_ehci *priv = dev_get_priv(dev); @@ -142,7 +99,7 @@ static int ehci_usb_probe(struct udevice *dev) } } - err = ehci_enable_vbus_supply(dev); + err = enable_vbus_supply(dev, &priv->vbus_supply); if (err) goto reset_err; @@ -166,7 +123,7 @@ phy_err: dev_err(dev, "failed to shutdown usb phy\n"); regulator_err: - ret = ehci_disable_vbus_supply(priv); + ret = disable_vbus_supply(priv->vbus_supply); if (ret) dev_err(dev, "failed to disable VBUS supply\n"); @@ -195,7 +152,7 @@ static int ehci_usb_remove(struct udevice *dev) if (ret) return ret; - ret = ehci_disable_vbus_supply(priv); + ret = disable_vbus_supply(priv->vbus_supply); if (ret) return ret; diff --git a/drivers/usb/host/vbus-supply.h b/drivers/usb/host/vbus-supply.h new file mode 100644 index 0000000000..dcd48ab86d --- /dev/null +++ b/drivers/usb/host/vbus-supply.h @@ -0,0 +1,49 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2015 Alexey Brodkin <abrodkin(a)synopsys.com> + * Copyright (C) 2018 Marek Behun <marek.behun(a)nic.cz> + */ + +#ifndef _VBUS_SUPPLY_H_ +#define _VBUS_SUPPLY_H_ + +#include <common.h> +#include <dm.h> +#include <power/regulator.h> + +#ifdef CONFIG_DM_REGULATOR +static inline int enable_vbus_supply(struct udevice *dev, + struct udevice **vbus_supply) +{ + int ret; + + ret = device_get_supply_regulator(dev, "vbus-supply", vbus_supply); + if (ret && ret != -ENOENT) + return ret; + + if (*vbus_supply) { + ret = regulator_set_enable(*vbus_supply, true); + if (ret) { + dev_err(dev, "Error enabling VBUS supply\n"); + return ret; + } + } else { + dev_dbg(dev, "No vbus supply\n"); + } + + return 0; +} + +static inline int disable_vbus_supply(struct udevice *vbus_supply) +{ + if (vbus_supply) + return regulator_set_enable(vbus_supply, false); + else + return 0; +} +#else +#define enable_vbus_supply(dev,supply) 0 +#define disable_vbus_supply(supply) 0 +#endif + +#endif /* _VBUS_SUPPLY_H_ */ diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c index b6c6aaf78e..11aea269d0 100644 --- a/drivers/usb/host/xhci-mvebu.c +++ b/drivers/usb/host/xhci-mvebu.c @@ -9,9 +9,9 @@ #include <dm.h> #include <fdtdec.h> #include <usb.h> -#include <power/regulator.h> #include <asm/gpio.h> +#include "vbus-supply.h" #include "xhci.h" struct mvebu_xhci_platdata { @@ -26,6 +26,9 @@ struct mvebu_xhci { struct xhci_ctrl ctrl; /* Needs to come first in this struct! */ struct usb_platdata usb_plat; struct xhci_hccr *hcd; +#ifdef CONFIG_DM_REGULATOR + struct udevice *vbus_supply; +#endif }; /* @@ -43,20 +46,14 @@ static int xhci_usb_probe(struct udevice *dev) struct mvebu_xhci *ctx = dev_get_priv(dev); struct xhci_hcor *hcor; int len, ret; - struct udevice *regulator; ctx->hcd = (struct xhci_hccr *)plat->hcd_base; len = HC_LENGTH(xhci_readl(&ctx->hcd->cr_capbase)); hcor = (struct xhci_hcor *)((uintptr_t)ctx->hcd + len); - ret = device_get_supply_regulator(dev, "vbus-supply", &regulator); - if (!ret) { - ret = regulator_set_enable(regulator, true); - if (ret) { - printf("Failed to turn ON the VBUS regulator\n"); - return ret; - } - } + ret = enable_vbus_supply(dev, &ctx->vbus_supply); + if (ret < 0) + return ret; /* Enable USB xHCI (VBUS, reset etc) in board specific code */ board_xhci_enable(devfdt_get_addr_index(dev, 1)); @@ -64,6 +61,15 @@ static int xhci_usb_probe(struct udevice *dev) return xhci_register(dev, ctx->hcd, hcor); } +static int xhci_usb_remove(struct udevice *dev) +{ + struct mvebu_xhci *ctx = dev_get_priv(dev); + + disable_vbus_supply(ctx->vbus_supply); + + return xhci_deregister(dev); +} + static int xhci_usb_ofdata_to_platdata(struct udevice *dev) { struct mvebu_xhci_platdata *plat = dev_get_platdata(dev); @@ -93,7 +99,7 @@ U_BOOT_DRIVER(usb_xhci) = { .of_match = xhci_usb_ids, .ofdata_to_platdata = xhci_usb_ofdata_to_platdata, .probe = xhci_usb_probe, - .remove = xhci_deregister, + .remove = xhci_usb_remove, .ops = &xhci_usb_ops, .platdata_auto_alloc_size = sizeof(struct mvebu_xhci_platdata), .priv_auto_alloc_size = sizeof(struct mvebu_xhci), -- 2.18.1

1 0