Merge remote-tracking branch 'lsk/v3.10/topic/hrtimer' into linux-linaro-lsk

[firefly-linux-kernel-4.4.55.git] / drivers / amba / bus.c

diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index cdbad3a454a085a7aa17bf1ae29e4a22b73c5c37..4144a3a999bd72322dea3a1105e5c19323bd1516 100644 (file)
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -506,7 +506,7 @@ int amba_device_add(struct amba_device *dev, struct resource *parent)
 
                amba_put_disable_pclk(dev);
 
-               if (cid == AMBA_CID)
+               if (cid == AMBA_CID || cid == CORESIGHT_CID)
                        dev->periphid = pid;
 
                if (!dev->periphid)