diff options
-rw-r--r-- | drivers/amba/bus.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c index 7025593a58c8..d74926e0939e 100644 --- a/drivers/amba/bus.c +++ b/drivers/amba/bus.c | |||
@@ -603,6 +603,10 @@ int amba_device_register(struct amba_device *dev, struct resource *parent) | |||
603 | if (ret) | 603 | if (ret) |
604 | goto err_out; | 604 | goto err_out; |
605 | 605 | ||
606 | /* Hard-coded primecell ID instead of plug-n-play */ | ||
607 | if (dev->periphid != 0) | ||
608 | goto skip_probe; | ||
609 | |||
606 | /* | 610 | /* |
607 | * Dynamically calculate the size of the resource | 611 | * Dynamically calculate the size of the resource |
608 | * and use this for iomap | 612 | * and use this for iomap |
@@ -643,6 +647,7 @@ int amba_device_register(struct amba_device *dev, struct resource *parent) | |||
643 | if (ret) | 647 | if (ret) |
644 | goto err_release; | 648 | goto err_release; |
645 | 649 | ||
650 | skip_probe: | ||
646 | ret = device_add(&dev->dev); | 651 | ret = device_add(&dev->dev); |
647 | if (ret) | 652 | if (ret) |
648 | goto err_release; | 653 | goto err_release; |