Skip to content

Commit ffa13d2

Browse files
geertugregkh
authored andcommitted
Revert "usb: musb: convert to devm_platform_ioremap_resource_byname"
This reverts commit 2d30e40. On Beaglebone Black, where each interface has 2 children: musb-dsps 47401c00.usb: can't request region for resource [mem 0x47401800-0x474019ff] musb-hdrc musb-hdrc.1: musb_init_controller failed with status -16 musb-hdrc: probe of musb-hdrc.1 failed with error -16 musb-dsps 47401400.usb: can't request region for resource [mem 0x47401000-0x474011ff] musb-hdrc musb-hdrc.0: musb_init_controller failed with status -16 musb-hdrc: probe of musb-hdrc.0 failed with error -16 Before, devm_ioremap_resource() was called on "dev" ("musb-hdrc.0" or "musb-hdrc.1"), after it is called on "&pdev->dev" ("47401400.usb" or "47401c00.usb"), leading to a duplicate region request, which fails. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Fixes: 2d30e40 ("usb: musb: convert to devm_platform_ioremap_resource_byname") Cc: stable <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20201112135900.3822599-1-geert+renesas@glider.be Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 3681830 commit ffa13d2

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

drivers/usb/musb/musb_dsps.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,10 +429,12 @@ static int dsps_musb_init(struct musb *musb)
429429
struct platform_device *parent = to_platform_device(dev->parent);
430430
const struct dsps_musb_wrapper *wrp = glue->wrp;
431431
void __iomem *reg_base;
432+
struct resource *r;
432433
u32 rev, val;
433434
int ret;
434435

435-
reg_base = devm_platform_ioremap_resource_byname(parent, "control");
436+
r = platform_get_resource_byname(parent, IORESOURCE_MEM, "control");
437+
reg_base = devm_ioremap_resource(dev, r);
436438
if (IS_ERR(reg_base))
437439
return PTR_ERR(reg_base);
438440
musb->ctrl_base = reg_base;

0 commit comments

Comments
 (0)