diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2015-06-05 22:14:04 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-06-05 22:14:04 +1000 |
| commit | c56e5f8ed7d0c0a3ee7a587d492835c17718efb3 (patch) | |
| tree | d10deec98fc323b5917a10004ae30ce54c487207 | |
| parent | f8d627c29d3e8ef6aa620a765d57e3b2eb71341d (diff) | |
| parent | 486ea46dfc88f4df79e9bf9e77c8579c1ff29152 (diff) | |
| download | linux-next-c56e5f8ed7d0c0a3ee7a587d492835c17718efb3.tar.gz | |
Merge remote-tracking branch 'coresight/next'
Conflicts:
drivers/hwtracing/coresight/coresight-etm3x.c
| -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 018a00fda611b3..cca98a8b252739 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}, }; |