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

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

diff --git a/drivers/hwtracing/coresight/coresight-tmc.c b/drivers/hwtracing/coresight/coresight-tmc.c
index ea249f0bcd73c63e54645aab10dce41e5455c831..2a02da3d630f4e50fa3508dd8e94ef32edd49dae 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-tmc.c
+++ b/drivers/hwtracing/coresight/coresight-tmc.c
@@ -443,7 +443,8 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id)
                desc.type = CORESIGHT_DEV_TYPE_SINK;
                desc.subtype.sink_subtype = CORESIGHT_DEV_SUBTYPE_SINK_BUFFER;
                desc.ops = &tmc_etr_cs_ops;
-               ret = tmc_etr_setup_caps(drvdata, devid, id->data);
+               ret = tmc_etr_setup_caps(drvdata, devid,
+                                        coresight_get_uci_data(id));
                if (ret)
                        goto out;
                break;
@@ -475,26 +476,13 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id)
 }
 
 static const struct amba_id tmc_ids[] = {
-       {
-               .id     = 0x000bb961,
-               .mask   = 0x000fffff,
-       },
-       {
-               /* Coresight SoC 600 TMC-ETR/ETS */
-               .id     = 0x000bb9e8,
-               .mask   = 0x000fffff,
-               .data   = (void *)(unsigned long)CORESIGHT_SOC_600_ETR_CAPS,
-       },
-       {
-               /* Coresight SoC 600 TMC-ETB */
-               .id     = 0x000bb9e9,
-               .mask   = 0x000fffff,
-       },
-       {
-               /* Coresight SoC 600 TMC-ETF */
-               .id     = 0x000bb9ea,
-               .mask   = 0x000fffff,
-       },
+       CS_AMBA_ID(0x000bb961),
+       /* Coresight SoC 600 TMC-ETR/ETS */
+       CS_AMBA_ID_DATA(0x000bb9e8, (unsigned long)CORESIGHT_SOC_600_ETR_CAPS),
+       /* Coresight SoC 600 TMC-ETB */
+       CS_AMBA_ID(0x000bb9e9),
+       /* Coresight SoC 600 TMC-ETF */
+       CS_AMBA_ID(0x000bb9ea),
        { 0, 0},
 };