diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-09 19:59:21 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-09 19:59:21 -0800 |
| commit | cfd61208ea8de5da4db85feb3334fb349ce6acee (patch) | |
| tree | 9029981890ba34dcec2013a0cbdd3ded557b09ba /arch | |
| parent | 6a1ef577f43d9cf6903c3e99b77a03eca43102de (diff) | |
| parent | ac4034d803e0adee0dfa826fadf607f6bf4d148d (diff) | |
Merge "ARM: dts: msm: Add GPU coresight properties for msm8998"
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8998-coresight.dtsi | 8 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8998-gpu.dtsi | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/qcom/msm8998-coresight.dtsi b/arch/arm/boot/dts/qcom/msm8998-coresight.dtsi index aeb6bf6141d8..75a90b0499e1 100644 --- a/arch/arm/boot/dts/qcom/msm8998-coresight.dtsi +++ b/arch/arm/boot/dts/qcom/msm8998-coresight.dtsi @@ -277,6 +277,14 @@ <&funnel_apss_merg_out_funnel_in1>; }; }; + port@6 { + reg = <7>; + funnel_in1_in_gfx: endpoint { + slave-mode; + remote-endpoint = + <&gfx_out_funnel_in1>; + }; + }; }; }; diff --git a/arch/arm/boot/dts/qcom/msm8998-gpu.dtsi b/arch/arm/boot/dts/qcom/msm8998-gpu.dtsi index 8739e8f22549..c85493d54e35 100644 --- a/arch/arm/boot/dts/qcom/msm8998-gpu.dtsi +++ b/arch/arm/boot/dts/qcom/msm8998-gpu.dtsi @@ -122,6 +122,14 @@ vddcx-supply = <&gdsc_gpu_cx>; vdd-supply = <&gdsc_gpu_gx>; + /* Trace bus */ + coresight-name = "coresight-gfx"; + port { + gfx_out_funnel_in1: endpoint { + remote-endpoint = <&funnel_in1_in_gfx>; + }; + }; + /* GPU Mempools */ qcom,gpu-mempools { #address-cells= <1>; |