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

Commit 5fc1cdde 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: Added missing bus vectors to match bus load table"

parents 0325dbe9 ed626118

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

+42 −30
Original line number Diff line number Diff line
@@ -4952,14 +4952,16 @@ 
		qcom,msm-bus-clients {

			qcom,msm-bus-client@0 {

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

				qcom,msm-bus,num-cases = <8>;

				qcom,msm-bus,num-cases = <10>;

				qcom,msm-bus,num-paths = <1>;

				qcom,msm-bus,vectors-KBps =

					<63 512 0 0>,

					<63 512 120000 302000>,

					<63 512 364000 302000>,

					<63 512 804000 302000>,

					<63 512 1608000 604000>,

					<63 512 120000 302000>, /* VGA 30 fps */

					<63 512 364000 302000>, /* VGA 60 fps */

					<63 512 364000 302000>, /* 720p 30 fps */

					<63 512 804000 302000>, /* 720p 60 fps */

					<63 512 804000 302000>, /* 1080p 30 fps */

					<63 512 1608000 604000>, /* 1080p 60 fps */

					<63 512 2576000 967000>,

					<63 512 4680000 1404000>,

					<63 512 4988000 1496000>;
@@ -4968,14 +4970,16 @@ 


			qcom,msm-bus-client@1 {

				qcom,msm-bus,name = "vdec-core0-ddr";

				qcom,msm-bus,num-cases = <8>;

				qcom,msm-bus,num-cases = <10>;

				qcom,msm-bus,num-paths = <1>;

				qcom,msm-bus,vectors-KBps =

					<63 512 0 0>,

					<63 512 208000 303000>,

					<63 512 536000 303000>,

					<63 512 1012000 303000>,

					<63 512 2024000 606000>,

					<63 512 208000 303000>, /* VGA 30 fps */

					<63 512 536000 303000>, /* VGA 60 fps */

					<63 512 536000 303000>, /* 720p 30 fps */

					<63 512 1012000 303000>, /* 720p 60 fps */

					<63 512 1012000 303000>, /* 1080p 30 fps */

					<63 512 2024000 606000>, /* 1080p 60 fps */

					<63 512 3240000 970000>,

					<63 512 4048000 1212000>,

					<63 512 4264000 1279000>;
@@ -4984,14 +4988,16 @@ 


			qcom,msm-bus-client@2 {

				qcom,msm-bus,name = "vdec-core1-ddr";

				qcom,msm-bus,num-cases = <8>;

				qcom,msm-bus,num-cases = <10>;

				qcom,msm-bus,num-paths = <1>;

				qcom,msm-bus,vectors-KBps =

					<63 512 0 0>,

					<63 512 208000 303000>,

					<63 512 536000 303000>,

					<63 512 1012000 303000>,

					<63 512 2024000 606000>,

					<63 512 208000 303000>, /* VGA 30 fps */

					<63 512 536000 303000>, /* VGA 60 fps */

					<63 512 536000 303000>, /* 720p 30 fps */

					<63 512 1012000 303000>, /* 720p 60 fps */

					<63 512 1012000 303000>, /* 1080p 30 fps */

					<63 512 2024000 606000>, /* 1080p 60 fps */

					<63 512 3240000 970000>,

					<63 512 4048000 1212000>,

					<63 512 4264000 1279000>;
@@ -5000,14 +5006,16 @@ 


			qcom,msm-bus-client@3 {

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

				qcom,msm-bus,num-cases = <8>;

				qcom,msm-bus,num-cases = <10>;

				qcom,msm-bus,num-paths = <1>;

				qcom,msm-bus,vectors-KBps =

					<68 604 0 0>,

					<68 604 138000 1034000>,

					<68 604 414000 1034000>,

					<68 604 940000 1034000>,

					<68 604 1880000 2068000>,

					<68 604 138000 1034000>, /* VGA 30 fps */

					<68 604 414000 1034000>, /* VGA 60 fps */

					<68 604 414000 1034000>, /* 720p 30 fps */

					<68 604 940000 1034000>, /* 720p 60 fps */

					<68 604 940000 1034000>, /* 1080p 30 fps */

					<68 604 1880000 2068000>, /* 1080p 60 fps */

					<68 604 3008000 3309000>,

					<68 604 3760000 4136000>,

					<68 604 4468000 2457000>;
@@ -5016,14 +5024,16 @@ 


			qcom,msm-bus-client@4 {

				qcom,msm-bus,name = "vdec-core0-ocmem";

				qcom,msm-bus,num-cases = <8>;

				qcom,msm-bus,num-cases = <10>;

				qcom,msm-bus,num-paths = <1>;

				qcom,msm-bus,vectors-KBps =

					<68 604 0 0>,

					<68 604 176000 519000>,

					<68 604 456000 519000>,

					<68 604 864000 519000>,

					<68 604 1728000 1038000>,

					<68 604 176000 519000>, /* VGA 30 fps */

					<68 604 456000 519000>, /* VGA 60 fps */

					<68 604 456000 519000>, /* 720p 30 fps */

					<68 604 864000 519000>, /* 720p 60 fps */

					<68 604 864000 519000>, /* 1080p 30 fps */

					<68 604 1728000 1038000>, /* 1080p 60 fps */

					<68 604 2766000 1661000>,

					<68 604 3456000 2076000>,

					<68 604 3662000 2198000>;
@@ -5032,14 +5042,16 @@ 


			qcom,msm-bus-client@5 {

				qcom,msm-bus,name = "vdec-core1-ocmem";

				qcom,msm-bus,num-cases = <8>;

				qcom,msm-bus,num-cases = <10>;

				qcom,msm-bus,num-paths = <1>;

				qcom,msm-bus,vectors-KBps =

					<68 604 0 0>,

					<68 604 176000 519000>,

					<68 604 456000 519000>,

					<68 604 864000 519000>,

					<68 604 1728000 3640000>,

					<68 604 176000 519000>, /* VGA 30 fps */

					<68 604 456000 519000>, /* VGA 60 fps */

					<68 604 456000 519000>, /* 720p 30 fps */

					<68 604 864000 519000>, /* 720p 60 fps */

					<68 604 864000 519000>, /* 1080p 30 fps */

					<68 604 1728000 3640000>, /* 1080p 60 fps */

					<68 604 2766000 3640000>,

					<68 604 3456000 3640000>,

					<68 604 3662000 3640000>;

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

+12 −8
Original line number Diff line number Diff line
@@ -214,25 +214,29 @@ 
		qcom,msm-bus-clients {

			qcom,msm-bus-client@0 {

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

				qcom,msm-bus,num-cases = <4>;

				qcom,msm-bus,num-cases = <6>;

				qcom,msm-bus,num-paths = <1>;

				qcom,msm-bus,vectors-KBps =

					<63 512 0 0>,

					<63 512 129000 142000>,

					<63 512 384000 422000>,

					<63 512 866000 953000>;

					<63 512 129000 142000>, /* VGA 30 fps */

					<63 512 384000 422000>, /* VGA 60 fps */

					<63 512 384000 422000>, /* 720p 30 fps */

					<63 512 866000 953000>, /* 720p 60 fps */

					<63 512 866000 953000>; /* 1080p 30 fps */

				qcom,bus-configs = <0x1000414>;

			};



			qcom,msm-bus-client@1 {

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

				qcom,msm-bus,num-cases = <4>;

				qcom,msm-bus,num-cases = <6>;

				qcom,msm-bus,num-paths = <1>;

				qcom,msm-bus,vectors-KBps =

					<63 512 0 0>,

					<63 512 103000 134000>,

					<63 512 268000 348000>,

					<63 512 505000 657000>;

					<63 512 103000 134000>, /* VGA 30 fps */

					<63 512 268000 348000>, /* VGA 60 fps */

					<63 512 268000 348000>, /* 720p 30 fps */

					<63 512 505000 657000>, /* 720p 60 fps */

					<63 512 505000 657000>; /* 1080p 30 fps */

				qcom,bus-configs = <0x30fcfff>;

			};

		};

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

+12 −8
Original line number Diff line number Diff line
@@ -1675,25 +1675,29 @@ 
		qcom,msm-bus-clients {

			qcom,msm-bus-client@0 {

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

				qcom,msm-bus,num-cases = <4>;

				qcom,msm-bus,num-cases = <6>;

				qcom,msm-bus,num-paths = <1>;

				qcom,msm-bus,vectors-KBps =

					<63 512 0 0>,

					<63 512 133600 674400>,

					<63 512 400900 1079000>,

					<63 512 908600 1537600>;

					<63 512 133600 674400>, /* VGA 30 fps */

					<63 512 400900 1079000>, /* VGA 60 fps */

					<63 512 400900 1079000>, /* 720p 30 fps */

					<63 512 908600 1537600>, /* 720p 60 fps */

					<63 512 908600 1537600>; /* 1080p 30 fps */

				qcom,bus-configs = <0x01000414>;

			};



			qcom,msm-bus-client@1 {

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

				qcom,msm-bus,num-cases = <4>;

				qcom,msm-bus,num-cases = <6>;

				qcom,msm-bus,num-paths = <1>;

				qcom,msm-bus,vectors-KBps =

					<63 512 0 0>,

					<63 512 99600 831900>,

					<63 512 298900 831900>,

					<63 512 677600 1331000>;

					<63 512 99600 831900>, /* VGA 30 fps */

					<63 512 298900 831900>, /* VGA 60 fps */

					<63 512 298900 831900>, /* 720p 30 fps */

					<63 512 677600 1331000>, /* 720p 60 fps */

					<63 512 677600 1331000>; /* 1080p 30 fps */

				qcom,bus-configs = <0x030fcfff>;

			};

		};

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

+7 −5
Original line number Diff line number Diff line
@@ -1453,13 +1453,15 @@ 
		qcom,msm-bus-clients {

			qcom,msm-bus-client@0 {

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

				qcom,msm-bus,num-cases = <4>;

				qcom,msm-bus,num-cases = <6>;

				qcom,msm-bus,num-paths = <1>;

				qcom,msm-bus,vectors-KBps =

					<63 512 0 0>,

					<63 512 136806 1236684>,

					<63 512 410521 1859686>,

					<63 512 930406 1859686>;

					<63 512 136806 1236684>, /* VGA 30 fps */

					<63 512 410521 1859686>, /* VGA 60 fps */

					<63 512 410521 1859686>, /* 720p 30 fps */

					<63 512 930406 1859686>, /* 720p 60 fps */

					<63 512 930406 1859686>; /* 1080p 30 fps */

				qcom,bus-configs = <0x01000414>;

			};

			qcom,msm-bus-client@1 {

arch/arm/boot/dts/qcom/msm8974-v1.dtsi

+28 −20
Original line number Diff line number Diff line
@@ -146,14 +146,16 @@ 
	qcom,msm-bus-clients {

		qcom,msm-bus-client@0 {

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

			qcom,msm-bus,num-cases = <7>;

			qcom,msm-bus,num-cases = <9>;

			qcom,msm-bus,num-paths = <1>;

			qcom,msm-bus,vectors-KBps =

				<63 512 0 0>,

				<63 512 60000 664950>,

				<63 512 181000 664950>,

				<63 512 403000 664950>,

				<63 512 806000 1329900>,

				<63 512 60000 664950>, /* VGA 30 fps */

				<63 512 181000 664950>, /* VGA 60 fps */

				<63 512 181000 664950>, /* 720p 30fps */

				<63 512 403000 664950>, /* 720p 60fps */

				<63 512 403000 664950>, /* 1080p 30fps */

				<63 512 806000 1329900>, /* 1080p 60fps */

				<63 512 1289600 2127840>,

				<63 512 161200 6400000>;

			qcom,bus-configs = <0x1000414>;
@@ -161,14 +163,16 @@ 


		qcom,msm-bus-client@1 {

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

			qcom,msm-bus,num-cases = <7>;

			qcom,msm-bus,num-cases = <9>;

			qcom,msm-bus,num-paths = <1>;

			qcom,msm-bus,vectors-KBps =

				<63 512 0 0>,

				<63 512 110000 909000>,

				<63 512 268000 909000>,

				<63 512 505000 909000>,

				<63 512 1010000 1818000>,

				<63 512 110000 909000>, /* VGA 30fps */

				<63 512 268000 909000>, /* VGA 60fps */

				<63 512 268000 909000>, /* 720p 30fps */

				<63 512 505000 909000>, /* 720p 60fps */

				<63 512 505000 909000>, /* 1080p 30fps */

				<63 512 1010000 1818000>, /* 1080p 60fps */

				<63 512 1616000 2908800>,

				<63 512 2020000 6400000>;

			qcom,bus-configs = <0x30fcfff>;
@@ -176,14 +180,16 @@ 


		qcom,msm-bus-client@2 {

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

			qcom,msm-bus,num-cases = <7>;

			qcom,msm-bus,num-cases = <9>;

			qcom,msm-bus,num-paths = <1>;

			qcom,msm-bus,vectors-KBps =

				<68 604 0 0>,

				<68 604 138200 1222000>,

				<68 604 414700 1222000>,

				<68 604 940000 2444000>,

				<68 604 1880000 2444000>,

				<68 604 138200 1222000>, /* VGA 30fps */

				<68 604 414700 1222000>, /* VGA 60fps */

				<68 604 414700 1222000>, /* 720p 30fps */

				<68 604 940000 2444000>, /* 720p 60fps */

				<68 604 940000 2444000>, /* 1080p 30fps */

				<68 604 1880000 2444000>, /* 1080p 60fps */

				<68 604 3008000 3910400>,

				<68 604 3760000 4888000>;

			qcom,bus-configs = <0x1000414>;
@@ -191,14 +197,16 @@ 


		qcom,msm-bus-client@3 {

			qcom,msm-bus,name = "vdec-ocmem";

			qcom,msm-bus,num-cases = <7>;

			qcom,msm-bus,num-cases = <9>;

			qcom,msm-bus,num-paths = <1>;

			qcom,msm-bus,vectors-KBps =

				<68 604 0 0>,

				<68 604 176900 1556640>,

				<68 604 456200 1556640>,

				<68 604 864800 1556640>,

				<68 604 1729600 3113280>,

				<68 604 176900 1556640>, /* VGA 30fps */

				<68 604 456200 1556640>, /* VGA 60fps */

				<68 604 456200 1556640>, /* 720p 30fps */

				<68 604 864800 1556640>, /* 720p 60fps */

				<68 604 864800 1556640>, /* 1080p 30fps */

				<68 604 1729600 3113280>, /* 1080p 60fps */

				<68 604 2767360 4981248>,

				<68 604 3459200 6226560>;

			qcom,bus-configs = <0x30fcfff>;