diff options
| author | Tom Rini <trini@konsulko.com> | 2016-07-27 22:30:20 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-27 22:30:20 -0400 |
| commit | fe34b6a4845476208ca7d19a35179e56bebf3877 (patch) | |
| tree | 05643ac1448012bbb7514dd04526168737c86b58 /common | |
| parent | c6f086ddcbfb47918b82f6a135c61f432540da42 (diff) | |
| parent | 02ebd42cf19e523593d8e4e8f3d02083299fcdbb (diff) | |
| download | u-boot-fe34b6a4845476208ca7d19a35179e56bebf3877.tar.gz | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/spl_mmc.c | 2 | ||||
| -rw-r--r-- | common/usb_hub.c | 9 |
2 files changed, 2 insertions, 9 deletions
diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index 6b3e9e4a17..7c7f32959b 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -155,7 +155,7 @@ static int mmc_load_image_raw_partition(struct mmc *mmc, int partition) disk_partition_t info; int err; - err = part_get_info(&mmc->block_dev, partition, &info); + err = part_get_info(mmc_get_blk_desc(mmc), partition, &info); if (err) { #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT puts("spl: partition error\n"); diff --git a/common/usb_hub.c b/common/usb_hub.c index 0f39c9faf7..ff9cd50eab 100644 --- a/common/usb_hub.c +++ b/common/usb_hub.c @@ -36,7 +36,6 @@ #include <asm/state.h> #endif #include <asm/unaligned.h> -#include <dm/root.h> DECLARE_GLOBAL_DATA_PTR; @@ -755,12 +754,6 @@ int usb_hub_scan(struct udevice *hub) return usb_hub_configure(udev); } -static int usb_hub_post_bind(struct udevice *dev) -{ - /* Scan the bus for devices */ - return dm_scan_fdt_node(dev, gd->fdt_blob, dev->of_offset, false); -} - static int usb_hub_post_probe(struct udevice *dev) { debug("%s\n", __func__); @@ -782,7 +775,7 @@ U_BOOT_DRIVER(usb_generic_hub) = { UCLASS_DRIVER(usb_hub) = { .id = UCLASS_USB_HUB, .name = "usb_hub", - .post_bind = usb_hub_post_bind, + .post_bind = dm_scan_fdt_dev, .post_probe = usb_hub_post_probe, .child_pre_probe = usb_child_pre_probe, .per_child_auto_alloc_size = sizeof(struct usb_device), |