Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-29 16:10:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of git://www.denx.de/git/u-boot-dm

Browse source
This commit is contained in:
Tom Rini 2015-04-28 19:37:20 -04:00
commit 4842c58990
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/core/device.c
View file

@ -135,7 +135,7 @@ int device_bind(struct udevice *parent, const struct driver *drv,
return 0;
fail_child_post_bind:
if (IS_ENABLED(DM_DEVICE_REMOVE)) {
if (IS_ENABLED(CONFIG_DM_DEVICE_REMOVE)) {
if (drv->unbind && drv->unbind(dev)) {
dm_warn("unbind() method failed on dev '%s' on error path\n",
dev->name);
@ -143,14 +143,14 @@ fail_child_post_bind:
}
fail_bind:
if (IS_ENABLED(DM_DEVICE_REMOVE)) {
if (IS_ENABLED(CONFIG_DM_DEVICE_REMOVE)) {
if (uclass_unbind_device(dev)) {
dm_warn("Failed to unbind dev '%s' on error path\n",
dev->name);
}
}
fail_uclass_bind:
if (IS_ENABLED(DM_DEVICE_REMOVE)) {
if (IS_ENABLED(CONFIG_DM_DEVICE_REMOVE)) {
list_del(&dev->sibling_node);
if (dev->flags & DM_FLAG_ALLOC_PARENT_PDATA) {
free(dev->parent_platdata);

5
drivers/core/uclass.c
View file

@ -277,6 +277,7 @@ int uclass_get_device_tail(struct udevice *dev, int ret,
if (ret)
return ret;
assert(dev);
ret = device_probe(dev);
if (ret)
return ret;
@ -342,6 +343,8 @@ int uclass_first_device(enum uclass_id id, struct udevice **devp)
*devp = NULL;
ret = uclass_find_first_device(id, &dev);
if (!dev)
return 0;
return uclass_get_device_tail(dev, ret, devp);
}
@ -352,6 +355,8 @@ int uclass_next_device(struct udevice **devp)
*devp = NULL;
ret = uclass_find_next_device(&dev);
if (!dev)
return 0;
return uclass_get_device_tail(dev, ret, devp);
}

1
drivers/serial/ns16550.c
View file

@ -255,7 +255,6 @@ void debug_uart_init(void)
*/
baud_divisor = calc_divisor(com_port, CONFIG_DEBUG_UART_CLOCK,
CONFIG_BAUDRATE);
baud_divisor = 13;
serial_out_shift(&com_port->ier, CONFIG_DEBUG_UART_SHIFT,
CONFIG_SYS_NS16550_IER);
serial_out_shift(&com_port->mcr, CONFIG_DEBUG_UART_SHIFT, UART_MCRVAL);