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

Commit 2c113c3a 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: Correct GPU IB vote on MSM8917"

parents 71d64347 5ab4266f

arch/arm/boot/dts/qcom/msm8917-gpu.dtsi

+18 −18
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2017, 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 and
@@ -28,14 +28,14 @@ 
		qcom,active-only;

		qcom,bw-tbl =

			< 0 >,    /* Off */

			< 1538 >, /* 1. DDR:100.80 MHz BIMC: 201.60 MHz */

			< 3222 >, /* 2. DDR:211.20 MHz BIMC: 422.40 MHz */

			< 4541 >, /* 3. DDR:297.60 MHz BIMC: 595.20 MHz */

			< 5859 >, /* 4. DDR:384.00 MHz BIMC: 768.00 MHz */

			< 8496 >, /* 5. DDR:556.80 MHz BIMC: 1113.60 MHz */

			< 9082 >, /* 6. DDR:595.20 MHz BIMC: 1190.40 MHz */

			< 10253>, /* 7. DDR:672.00 MHz BIMC: 1344.00 MHz */

			< 11279>; /* 8. DDR:739.20 MHz BIMC: 1478.40 MHz */

			< 769 >,  /* 1. DDR:100.80 MHz BIMC: 201.60 MHz */

			< 1611 >, /* 2. DDR:211.20 MHz BIMC: 422.40 MHz */

			< 2270 >, /* 3. DDR:297.60 MHz BIMC: 595.20 MHz */

			< 2929 >, /* 4. DDR:384.00 MHz BIMC: 768.00 MHz */

			< 4248 >, /* 5. DDR:556.80 MHz BIMC: 1113.60 MHz */

			< 4541 >, /* 6. DDR:595.20 MHz BIMC: 1190.40 MHz */

			< 5126 >, /* 7. DDR:672.00 MHz BIMC: 1344.00 MHz */

			< 5639 >; /* 8. DDR:739.20 MHz BIMC: 1478.40 MHz */

	};



	msm_gpu: qcom,kgsl-3d0@1c00000 {
@@ -81,14 +81,14 @@ 
		qcom,msm-bus,num-paths = <1>;

		qcom,msm-bus,vectors-KBps =

				<26 512 0 0>,       /*    off        */

				<26 512 0  1612800>, /* 1. 100.80 MHz */

				<26 512 0  3379200>, /* 2. 211.20 MHz */

				<26 512 0  4761600>, /* 3. 297.60 MHz */

				<26 512 0  6144000>, /* 4. 384.00 MHz */

				<26 512 0  8908800>, /* 5. 556.80 MHz */

				<26 512 0  9523200>, /* 6. 595.20 MHz */

				<26 512 0 10752000>, /* 7. 672.00 MHz */

				<26 512 0 11827200>; /* 8. 739.20 MHz */

				<26 512 0 806400>,  /* 1. 100.80 MHz */

				<26 512 0 1689600>, /* 2. 211.20 MHz */

				<26 512 0 2380800>, /* 3. 297.60 MHz */

				<26 512 0 3072000>, /* 4. 384.00 MHz */

				<26 512 0 4454400>, /* 5. 556.80 MHz */

				<26 512 0 4761600>, /* 6. 595.20 MHz */

				<26 512 0 5376000>, /* 7. 672.00 MHz */

				<26 512 0 5913600>; /* 8. 739.20 MHz */



		/* GDSC regulator names */

		regulator-names = "vdd";

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

+0 −31
Original line number Diff line number Diff line
@@ -311,34 +311,3 @@ 
		qcom,inst-id = <11>;

	};

};
 


/* gpubw overrides */

&gpubw {

	/delete-property/ qcom,bw-tbl;

	qcom,bw-tbl =

			< 0 >,    /* Off */

			< 769 >, /* 1. DDR:100.80 MHz BIMC: 201.60 MHz */

			< 1611>, /* 2. DDR:211.20 MHz BIMC: 422.40 MHz */

			< 2270>, /* 3. DDR:297.60 MHz BIMC: 595.20 MHz */

			< 2929>, /* 4. DDR:384.00 MHz BIMC: 768.00 MHz */

			< 4248>, /* 5. DDR:556.80 MHz BIMC: 1113.60 MHz */

			< 4541>, /* 6. DDR:595.20 MHz BIMC: 1190.40 MHz */

			< 5126>, /* 7. DDR:672.00 MHz BIMC: 1344.00 MHz */

			< 5639>; /* 8. DDR:739.20 MHz BIMC: 1478.40 MHz */

};



/* GPU overrides */

&msm_gpu {



	/delete-property/ qcom,msm-bus,vectors-KBps;

	qcom,msm-bus,vectors-KBps =

				<26 512 0 0>,	    /*    off        */

				<26 512 0   806400>, /* 1. 100.80 MHz */

				<26 512 0  1689600>, /* 2. 211.20 MHz */

				<26 512 0  2380800>, /* 3. 297.60 MHz */

				<26 512 0  3072000>, /* 4. 384.00 MHz */

				<26 512 0  4454400>, /* 5. 556.80 MHz */

				<26 512 0  4761600>, /* 6. 595.20 MHz */

				<26 512 0  5376000>, /* 7. 672.00 MHz */

				<26 512 0  5913600>; /* 8. 739.20 MHz */

};