Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b699f0fb authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add GPU coresight support for MSM8953"

parents 07a30fb9 789cfe6d
Loading
Loading
Loading
Loading
+10 −1
Original line number Diff line number Diff line
/*
 * Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
 * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 an
@@ -330,6 +330,15 @@
						<&audio_etm0_out_funnel_mm>;
				};
			};

			port@4 {
				reg = <6>;
				funnel_mm_in_gfx: endpoint {
					slave-mode;
					remote-endpoint =
						<&gfx_out_funnel_mm>;
				};
			};
		};
	};

+19 −8
Original line number Diff line number Diff line
@@ -124,14 +124,6 @@
		qcom,gpu-quirk-dp2clockgating-disable;
		qcom,gpu-quirk-lmloadkill-disable;

		/* Trace bus */
		coresight-id = <67>;
		coresight-name = "coresight-gfx";
		coresight-nr-inports = <0>;
		coresight-outports = <0>;
		coresight-child-list = <&funnel_mm>;
		coresight-child-ports = <6>;

		/* Enable context aware freq. scaling */
		qcom,enable-ca-jump;

@@ -164,6 +156,25 @@
			};
		};

		qcom,gpu-coresights {
			#address-cells = <1>;
			#size-cells = <0>;
			compatible = "qcom,gpu-coresight";

			/* Trace bus */
			qcom,gpu-coresight@0 {
				reg = <0>;
				coresight-name = "coresight-gfx";
				coresight-atid = <67>;
				port {
					gfx_out_funnel_mm: endpoint {
						remote-endpoint =
						<&funnel_mm_in_gfx>;
					};
				};
			};
		};

		/* Power levels */
		qcom,gpu-pwrlevels {
			#address-cells = <1>;