diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-06-20 22:04:15 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-06-20 22:04:15 +1000 |
| commit | 7ff39d3e09c9e25504a787a6f526b40df327fef4 (patch) | |
| tree | 36691d3b8a63d38888ef6957daefb17285acce10 /drivers | |
| parent | b61420f05bb218cb02f6d673fa1a941629c5e37b (diff) | |
| parent | 486ea46dfc88f4df79e9bf9e77c8579c1ff29152 (diff) | |
Merge remote-tracking branch 'coresight/next'
Conflicts:
drivers/hwtracing/coresight/coresight-etm3x.c
drivers/hwtracing/coresight/coresight-etm4x.c
drivers/hwtracing/coresight/coresight-replicator-qcom.c
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hwtracing/coresight/coresight-etm3x.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/hwtracing/coresight/coresight-etm3x.c b/drivers/hwtracing/coresight/coresight-etm3x.c index 018a00fda611..cca98a8b2527 100644 --- a/drivers/hwtracing/coresight/coresight-etm3x.c +++ b/drivers/hwtracing/coresight/coresight-etm3x.c @@ -1912,6 +1912,11 @@ static struct amba_id etm_ids[] = { .mask = 0x0003ffff, .data = "PTM 1.1", }, + { /* PTM 1.1 Qualcomm */ + .id = 0x0003006f, + .mask = 0x0003ffff, + .data = "PTM 1.1", + }, { 0, 0}, }; |