Merge tag 'sound-5.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[linux.git] / drivers / hwtracing / coresight / coresight-etm4x.c

diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c
index fe76b176974a67d87ef95fbb1170a778ab9d1187..08ce37c9475da79a3d12345a5880fa0f08fc054d 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-etm4x.c
+++ b/drivers/hwtracing/coresight/coresight-etm4x.c
@@ -1068,18 +1068,21 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id)
        return ret;
 }
 
-#define ETM4x_AMBA_ID(pid)                     \
-       {                                       \
-               .id     = pid,                  \
-               .mask   = 0x000fffff,           \
+static struct amba_cs_uci_id uci_id_etm4[] = {
+       {
+               /*  ETMv4 UCI data */
+               .devarch        = 0x47704a13,
+               .devarch_mask   = 0xfff0ffff,
+               .devtype        = 0x00000013,
        }
+};
 
 static const struct amba_id etm4_ids[] = {
-       ETM4x_AMBA_ID(0x000bb95d),              /* Cortex-A53 */
-       ETM4x_AMBA_ID(0x000bb95e),              /* Cortex-A57 */
-       ETM4x_AMBA_ID(0x000bb95a),              /* Cortex-A72 */
-       ETM4x_AMBA_ID(0x000bb959),              /* Cortex-A73 */
-       ETM4x_AMBA_ID(0x000bb9da),              /* Cortex-A35 */
+       CS_AMBA_ID(0x000bb95d),         /* Cortex-A53 */
+       CS_AMBA_ID(0x000bb95e),         /* Cortex-A57 */
+       CS_AMBA_ID(0x000bb95a),         /* Cortex-A72 */
+       CS_AMBA_ID(0x000bb959),         /* Cortex-A73 */
+       CS_AMBA_UCI_ID(0x000bb9da, uci_id_etm4),        /* Cortex-A35 */
        {},
 };