ARM: dts: msm: Fix merge error for coresight devices on SDM845

A number of patches went in along with the switch to amba
framework and aop clock for coresight devices. This patch fixes
issues arising from the merge.

Change-Id: Iacb6bcb50aaa18934431e071ed36eea5526537db
Signed-off-by: Satyajit Desai <sadesai@codeaurora.org>