diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2022-10-13 13:57:07 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-10-13 13:57:07 +0200 |
| commit | 3d46afb56fa3c5e3c41a382dc454b5bcda04d5ac (patch) | |
| tree | 957de9cbc6a68e82c84ae26cc4712c3e86dfc964 /drivers | |
| parent | 965a946c49e016bcff5bbfffaa1a468cd74af0db (diff) | |
| parent | 8513703c6c46428908264923260504ce81e3e3a7 (diff) | |
| download | barebox-3d46afb56fa3c5e3c41a382dc454b5bcda04d5ac.tar.gz barebox-3d46afb56fa3c5e3c41a382dc454b5bcda04d5ac.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mfd/axp20x.c | 5 | ||||
| -rw-r--r-- | drivers/of/overlay.c | 4 | ||||
| -rw-r--r-- | drivers/usb/core/usb.c | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c index da1e8ce35a..0a53eaea7c 100644 --- a/drivers/mfd/axp20x.c +++ b/drivers/mfd/axp20x.c @@ -141,6 +141,9 @@ static const struct mfd_cell axp152_cells[] = { { .name = "axp20x-pek", }, + { + .name = "axp20x-regulator", + }, }; static const struct mfd_cell axp288_cells[] = { @@ -337,6 +340,8 @@ int axp20x_device_probe(struct axp20x_dev *axp20x) AXP806_REG_ADDR_EXT_ADDR_SLAVE_MODE); } + axp20x->dev->priv = axp20x; + ret = mfd_add_devices(axp20x->dev, axp20x->cells, axp20x->nr_cells); if (ret) return dev_err_probe(axp20x->dev, ret, "failed to add MFD devices\n"); diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index 0fc440fdcf..9d112b67f1 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -131,12 +131,12 @@ static int of_overlay_apply_symbols(struct device_node *root, if (!overlay_symbols) { pr_debug("overlay doesn't have a __symbols__ node\n"); - return -EINVAL; + return 0; } if (!root_symbols) { pr_info("root doesn't have a __symbols__ node\n"); - return -EINVAL; + return 0; } list_for_each_entry(prop, &overlay_symbols->properties, list) { diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index 34a0f004f7..ed3a96cb9e 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c @@ -599,7 +599,7 @@ int usb_host_detect(struct usb_host *host) return 0; } -void usb_rescan(void) +int usb_rescan(void) { struct usb_host *host; int ret; @@ -613,6 +613,8 @@ void usb_rescan(void) } pr_info("%d USB Device(s) found\n", dev_count); + + return dev_count; } /*------------------------------------------------------------------- |