regulator: wm8994: Switch to SPDX identifier

[linux-2.6-microblaze.git] / drivers / amba / bus.c

diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index 41b7064..b4dae62 100644 (file)
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -26,19 +26,36 @@
 
 #define to_amba_driver(d)      container_of(d, struct amba_driver, drv)
 
-static const struct amba_id *
-amba_lookup(const struct amba_id *table, struct amba_device *dev)
+/* called on periphid match and class 0x9 coresight device. */
+static int
+amba_cs_uci_id_match(const struct amba_id *table, struct amba_device *dev)
 {
        int ret = 0;
+       struct amba_cs_uci_id *uci;
+
+       uci = table->data;
 
+       /* no table data or zero mask - return match on periphid */
+       if (!uci || (uci->devarch_mask == 0))
+               return 1;
+
+       /* test against read devtype and masked devarch value */
+       ret = (dev->uci.devtype == uci->devtype) &&
+               ((dev->uci.devarch & uci->devarch_mask) == uci->devarch);
+       return ret;
+}
+
+static const struct amba_id *
+amba_lookup(const struct amba_id *table, struct amba_device *dev)
+{
        while (table->mask) {
-               ret = (dev->periphid & table->mask) == table->id;
-               if (ret)
-                       break;
+               if (((dev->periphid & table->mask) == table->id) &&
+                       ((dev->cid != CORESIGHT_CID) ||
+                        (amba_cs_uci_id_match(table, dev))))
+                       return table;
                table++;
        }
-
-       return ret ? table : NULL;
+       return NULL;
 }
 
 static int amba_match(struct device *dev, struct device_driver *drv)
@@ -399,10 +416,22 @@ static int amba_device_try_add(struct amba_device *dev, struct resource *parent)
                        cid |= (readl(tmp + size - 0x10 + 4 * i) & 255) <<
                                (i * 8);
 
+               if (cid == CORESIGHT_CID) {
+                       /* set the base to the start of the last 4k block */
+                       void __iomem *csbase = tmp + size - 4096;
+
+                       dev->uci.devarch =
+                               readl(csbase + UCI_REG_DEVARCH_OFFSET);
+                       dev->uci.devtype =
+                               readl(csbase + UCI_REG_DEVTYPE_OFFSET) & 0xff;
+               }
+
                amba_put_disable_pclk(dev);
 
-               if (cid == AMBA_CID || cid == CORESIGHT_CID)
+               if (cid == AMBA_CID || cid == CORESIGHT_CID) {
                        dev->periphid = pid;
+                       dev->cid = cid;
+               }
 
                if (!dev->periphid)
                        ret = -ENODEV;