[1/4] amba: add name based matching

Message ID AANLkTinrVeaGXhE8mUqMJCw0fzeEB7Ko+p6ViD3JWePX@mail.gmail.com
State Rejected
Headers show

Commit Message

Linus Walleij March 17, 2011, 8:47 a.m.
2011/3/15 Russell King - ARM Linux <linux@arm.linux.org.uk>:

> I really hate the idea of matching AMBA stuff by name.  Isn't there any
> other solution to this?

What do you think about this:

         * 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;

This way, if we hardcode periphid in the platform, it will take
precedence. Currently hardware will override such hard-codec

There are a few instances using this in the kernel I think, but
to my memory they are all of the type where the hardcoded
number and the ID found in hardware are actually identical,
and eiher make no harm or should be patched away with.

Linus Walleij


diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index 6d2bb25..fcf355c 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)
        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