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

Commit e8eea729 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 support for QDSS mapping table"

parents 3a31f6fb 0e198caa
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -4937,6 +4937,14 @@
			<0xe0020 0x5555556>,
			<0xe0024 0x5555556>,
			<0x80124 0x3>;
		qcom,qdss-presets = <0xfc325000 0x1000>,
			<0xfc326000 0x1000>,
			<0xfc321000 0x1000>,
			<0xfc322000 0x1000>,
			<0xfc323000 0x1000>,
			<0xfc302000 0x1000>,
			<0xfa180000 0x1000>,
			<0xfa181000 0x1000>;
		qcom,vidc-iommu-domains {
			qcom,domain-ns {
				qcom,vidc-domain-phandle = <&venus_domain_ns>;
+8 −0
Original line number Diff line number Diff line
@@ -197,6 +197,14 @@
			<0x800D0 0x00000010>,
			<0x800D4 0x00000010>,
			<0x800D8 0x00000707>;
		qcom,qdss-presets = <0xfc325000 0x1000>,
			<0xfc326000 0x1000>,
			<0xfc321000 0x1000>,
			<0xfc322000 0x1000>,
			<0xfc323000 0x1000>,
			<0xfc302000 0x1000>,
			<0xfa180000 0x1000>,
			<0xfa181000 0x1000>;
		qcom,max-hw-load = <352800>; /* 720p @ 30 + 1080p @ 30 */
		qcom,vidc-iommu-domains {
			qcom,domain-ns {
+6 −0
Original line number Diff line number Diff line
@@ -468,6 +468,12 @@
		qcom,reg-presets = <0xE0020 0x05555556>,
			<0xE0024 0x05555556>,
			<0x80124 0x00000003>;
		qcom,qdss-presets = <0x826000 0x1000>,
			<0x827000 0x1000>,
			<0x822000 0x1000>,
			<0x803000 0x1000>,
			<0x9180000 0x1000>,
			<0x9181000 0x1000>;
		qcom,buffer-type-tz-usage-table = <0x241 0x1>,
			<0x106 0x2>,
			<0x480 0x3>;
+6 −0
Original line number Diff line number Diff line
@@ -1669,6 +1669,12 @@
		qcom,reg-presets = <0xE0020 0x05555556>,
			<0xE0024 0x05555556>,
			<0x80124 0x00000003>;
		qcom,qdss-presets = <0x826000 0x1000>,
			<0x827000 0x1000>,
			<0x822000 0x1000>,
			<0x803000 0x1000>,
			<0x9180000 0x1000>,
			<0x9181000 0x1000>;
		qcom,max-hw-load = <352800>; /* 720p @ 30 + 1080p @ 30 */
		qcom,enable-idle-indicator;
		qcom,vidc-iommu-domains {
+6 −0
Original line number Diff line number Diff line
@@ -1491,6 +1491,12 @@
		qcom,reg-presets = <0xE0020 0x0aaaaaaa>,
			<0xE0024 0x0aaaaaaa>,
			<0x80124 0x00000003>;
		qcom,qdss-presets = <0x825000 0x1000>,
			<0x826000 0x1000>,
			<0x821000 0x1000>,
			<0x802000 0x1000>,
			<0x9180000 0x1000>,
			<0x9181000 0x1000>;
		qcom,max-hw-load = <489600>; /* 1080p @ 30 + 1080p @ 30 */
		qcom,enable-idle-indicator;
		qcom,vidc-iommu-domains {
Loading