mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-07-05 02:36:39 +09:00
Merge branch 'master' of git://www.denx.de/git/u-boot-dm
This commit is contained in:
commit
4842c58990
|
@ -135,7 +135,7 @@ int device_bind(struct udevice *parent, const struct driver *drv,
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
fail_child_post_bind:
|
fail_child_post_bind:
|
||||||
if (IS_ENABLED(DM_DEVICE_REMOVE)) {
|
if (IS_ENABLED(CONFIG_DM_DEVICE_REMOVE)) {
|
||||||
if (drv->unbind && drv->unbind(dev)) {
|
if (drv->unbind && drv->unbind(dev)) {
|
||||||
dm_warn("unbind() method failed on dev '%s' on error path\n",
|
dm_warn("unbind() method failed on dev '%s' on error path\n",
|
||||||
dev->name);
|
dev->name);
|
||||||
|
@ -143,14 +143,14 @@ fail_child_post_bind:
|
||||||
}
|
}
|
||||||
|
|
||||||
fail_bind:
|
fail_bind:
|
||||||
if (IS_ENABLED(DM_DEVICE_REMOVE)) {
|
if (IS_ENABLED(CONFIG_DM_DEVICE_REMOVE)) {
|
||||||
if (uclass_unbind_device(dev)) {
|
if (uclass_unbind_device(dev)) {
|
||||||
dm_warn("Failed to unbind dev '%s' on error path\n",
|
dm_warn("Failed to unbind dev '%s' on error path\n",
|
||||||
dev->name);
|
dev->name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
fail_uclass_bind:
|
fail_uclass_bind:
|
||||||
if (IS_ENABLED(DM_DEVICE_REMOVE)) {
|
if (IS_ENABLED(CONFIG_DM_DEVICE_REMOVE)) {
|
||||||
list_del(&dev->sibling_node);
|
list_del(&dev->sibling_node);
|
||||||
if (dev->flags & DM_FLAG_ALLOC_PARENT_PDATA) {
|
if (dev->flags & DM_FLAG_ALLOC_PARENT_PDATA) {
|
||||||
free(dev->parent_platdata);
|
free(dev->parent_platdata);
|
||||||
|
|
|
@ -277,6 +277,7 @@ int uclass_get_device_tail(struct udevice *dev, int ret,
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
assert(dev);
|
||||||
ret = device_probe(dev);
|
ret = device_probe(dev);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -342,6 +343,8 @@ int uclass_first_device(enum uclass_id id, struct udevice **devp)
|
||||||
|
|
||||||
*devp = NULL;
|
*devp = NULL;
|
||||||
ret = uclass_find_first_device(id, &dev);
|
ret = uclass_find_first_device(id, &dev);
|
||||||
|
if (!dev)
|
||||||
|
return 0;
|
||||||
return uclass_get_device_tail(dev, ret, devp);
|
return uclass_get_device_tail(dev, ret, devp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -352,6 +355,8 @@ int uclass_next_device(struct udevice **devp)
|
||||||
|
|
||||||
*devp = NULL;
|
*devp = NULL;
|
||||||
ret = uclass_find_next_device(&dev);
|
ret = uclass_find_next_device(&dev);
|
||||||
|
if (!dev)
|
||||||
|
return 0;
|
||||||
return uclass_get_device_tail(dev, ret, devp);
|
return uclass_get_device_tail(dev, ret, devp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -255,7 +255,6 @@ void debug_uart_init(void)
|
||||||
*/
|
*/
|
||||||
baud_divisor = calc_divisor(com_port, CONFIG_DEBUG_UART_CLOCK,
|
baud_divisor = calc_divisor(com_port, CONFIG_DEBUG_UART_CLOCK,
|
||||||
CONFIG_BAUDRATE);
|
CONFIG_BAUDRATE);
|
||||||
baud_divisor = 13;
|
|
||||||
serial_out_shift(&com_port->ier, CONFIG_DEBUG_UART_SHIFT,
|
serial_out_shift(&com_port->ier, CONFIG_DEBUG_UART_SHIFT,
|
||||||
CONFIG_SYS_NS16550_IER);
|
CONFIG_SYS_NS16550_IER);
|
||||||
serial_out_shift(&com_port->mcr, CONFIG_DEBUG_UART_SHIFT, UART_MCRVAL);
|
serial_out_shift(&com_port->mcr, CONFIG_DEBUG_UART_SHIFT, UART_MCRVAL);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user