---

yaml --- r: 252361 b: refs/heads/master c: 97ceed1 h: refs/heads/master i: 252359: 00cbcae v: v3
git-mirror · May 26, 2011 · 30238e9 · 30238e9
1 parent b444b07
commit 30238e9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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;