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

Commit 47bc42a2 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: Remove unused buffer-type-tz-usage-table entry"

parents 4e3285c8 bd19f499

Documentation/devicetree/bindings/media/video/msm-vidc.txt

+0 −5
Original line number Diff line number Diff line
@@ -56,9 +56,6 @@ Optional properties: 
          supports hevc decoder = 0x0c000000

          supports hevc_hybrid encoder = 0x10000000

          supports hevc_hybrid decoder = 0x30000000

- qcom,buffer-type-tz-usage-table : a key-value pair, mapping a buffer type

  (enum hal_buffer) to its corresponding TZ usage. The TZ usages are defined

  as "enum cp_mem_usage" in include/linux/msm_ion.h

- qcom,ocmem-size: ocmem size required by hardware for optimum performance.

  If ocmem is not present then there is no need to specify this property.

- qcom,vidc-iommu-domains: node containing individual domain nodes, each with:
@@ -137,8 +134,6 @@ Example: 
		qcom,clock-configs = <0x3 0x1 0x0>;

		qcom,sw-power-collapse;

		qcom,enable-idle-indicator;

		qcom,buffer-type-tz-usage-table = <0x1 0x1>,

						<0x1fe 0x2>;

		qcom,msm-bus-clients {

			qcom,msm-bus-client@0 {

				qcom,msm-bus,name = "venc-ddr";

arch/arm/boot/dts/qcom/apq8084.dtsi

+0 −3
Original line number Diff line number Diff line
@@ -4932,9 +4932,6 @@ 
			<0xe0020 0x5555556>,

			<0xe0024 0x5555556>,

			<0x80124 0x3>;

		qcom,buffer-type-tz-usage-table = <0x241 0x1>,

			<0x106 0x2>,

			<0x480 0x3>;

		qcom,vidc-iommu-domains {

			qcom,domain-ns {

				qcom,vidc-domain-phandle = <&venus_domain_ns>;

arch/arm/boot/dts/qcom/msm8226.dtsi

+0 −3
Original line number Diff line number Diff line
@@ -197,9 +197,6 @@ 
			<0x800D0 0x00000010>,

			<0x800D4 0x00000010>,

			<0x800D8 0x00000707>;

		qcom,buffer-type-tz-usage-table = <0x1 0x1>,

			<0x6 0x2>,

			<0x7C0 0x3>;

		qcom,max-hw-load = <352800>; /* 720p @ 30 + 1080p @ 30 */

		qcom,vidc-iommu-domains {

			qcom,domain-ns {

arch/arm/boot/dts/qcom/msm8916.dtsi

+0 −3
Original line number Diff line number Diff line
@@ -1664,9 +1664,6 @@ 
		qcom,reg-presets = <0xE0020 0x05555556>,

			<0xE0024 0x05555556>,

			<0x80124 0x00000003>;

		qcom,buffer-type-tz-usage-table = <0x241 0x1>,

			<0x106 0x2>,

			<0x480 0x3>;

		qcom,max-hw-load = <352800>; /* 720p @ 30 + 1080p @ 30 */

		qcom,enable-idle-indicator;

		qcom,vidc-iommu-domains {

arch/arm/boot/dts/qcom/msm8939-common.dtsi

+0 −3
Original line number Diff line number Diff line
@@ -1482,9 +1482,6 @@ 
		qcom,reg-presets = <0xE0020 0x0aaaaaaa>,

			<0xE0024 0x0aaaaaaa>,

			<0x80124 0x00000003>;

		qcom,buffer-type-tz-usage-table = <0x241 0x1>,

			<0x106 0x2>,

			<0x480 0x3>;

		qcom,max-hw-load = <489600>; /* 1080p @ 30 + 1080p @ 30 */

		qcom,enable-idle-indicator;

		qcom,vidc-iommu-domains {