diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-03-02 19:54:34 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-03-03 01:08:31 +0300 |
| commit | ca2dea434d10e3a676482fdf6df17d20cdb3e907 (patch) | |
| tree | 80bc3c0e7ecc1360f44bdbe8deddfd42b3cfcd6f | |
| parent | 332524eaf739296bfc86c26d1b86a8c0040d7818 (diff) | |
| parent | 7e6a69ee954caf8dd8c98f70c8ee894c8ebfdcf0 (diff) | |
| download | linux-ca2dea434d10e3a676482fdf6df17d20cdb3e907.tar.xz | |
Merge tag 'juno-fixes-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into next/late
Merge "ARMv8 Juno DT fix for v4.11" from Sudeep Holla:
Just single patch to fix replicator in order to prevent overflows at
the source and reduce the back pressure by splitting the trace output
to TPIU and ETR.
* tag 'juno-fixes-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
arm64: dts: juno: update definition for programmable replicator
| -rw-r--r-- | arch/arm64/boot/dts/arm/juno-base.dtsi | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi index 9d799d938d2f..df539e865b90 100644 --- a/arch/arm64/boot/dts/arm/juno-base.dtsi +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi @@ -372,12 +372,13 @@ }; }; - coresight-replicator { - /* - * Non-configurable replicators don't show up on the - * AMBA bus. As such no need to add "arm,primecell". - */ - compatible = "arm,coresight-replicator"; + replicator@20120000 { + compatible = "qcom,coresight-replicator1x", "arm,primecell"; + reg = <0 0x20120000 0 0x1000>; + + clocks = <&soc_smc50mhz>; + clock-names = "apb_pclk"; + power-domains = <&scpi_devpd 0>; ports { #address-cells = <1>; |