From 30238e9ca2f0d81d375b02d80841a2a3a565c794 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Thu, 24 Mar 2011 16:12:40 +0100 Subject: [PATCH] --- yaml --- r: 252361 b: refs/heads/master c: 97ceed1fc29b601e64af98fd785e25fec4383b12 h: refs/heads/master i: 252359: 00cbcae17ce909f3a160bd2ba1958d5650054b53 v: v3 --- [refs] | 2 +- trunk/drivers/amba/bus.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 199289fffe57..c757ff7e3128 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e536fbe18f803b6bf9f2ea2d54d918e2b09724d8 +refs/heads/master: 97ceed1fc29b601e64af98fd785e25fec4383b12 diff --git a/trunk/drivers/amba/bus.c b/trunk/drivers/amba/bus.c index 7025593a58c8..d74926e0939e 100644 --- a/trunk/drivers/amba/bus.c +++ b/trunk/drivers/amba/bus.c @@ -603,6 +603,10 @@ int amba_device_register(struct amba_device *dev, struct resource *parent) if (ret) goto err_out; + /* Hard-coded primecell ID instead of plug-n-play */ + if (dev->periphid != 0) + goto skip_probe; + /* * Dynamically calculate the size of the resource * and use this for iomap @@ -643,6 +647,7 @@ int amba_device_register(struct amba_device *dev, struct resource *parent) if (ret) goto err_release; + skip_probe: ret = device_add(&dev->dev); if (ret) goto err_release;