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

Commit f0b5b1b7 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: Use the MHZ_TO_MBPS macro for sdm670"

parents 1523751d 9d208ffe

arch/arm64/boot/dts/qcom/sdm670.dtsi

+69 −69
Original line number Diff line number Diff line
@@ -2095,12 +2095,12 @@ 
			<MSM_BUS_MASTER_AMPSS_M0 MSM_BUS_SLAVE_LLCC>;

		qcom,active-only;

		qcom,bw-tbl =

			<  1144 /* 150 MHz */ >,

			<  2288 /* 300 MHz */ >,

			<  3555 /* 466 MHz */ >,

			<  4577 /* 600 MHz */ >,

			<  6149 /* 806 MHz */ >,

			<  7118 /* 933 MHz */ >;

			< MHZ_TO_MBPS(150, 16) >, /*  2288 MB/s */

			< MHZ_TO_MBPS(300, 16) >, /*  4577 MB/s */

			< MHZ_TO_MBPS(466, 16) >, /*  7110 MB/s */

			< MHZ_TO_MBPS(600, 16) >, /*  9155 MB/s */

			< MHZ_TO_MBPS(806, 16) >, /* 12298 MB/s */

			< MHZ_TO_MBPS(933, 16) >; /* 14236 MB/s */

	};



	bwmon: qcom,cpu-bwmon {
@@ -2120,17 +2120,17 @@ 
			<MSM_BUS_MASTER_LLCC MSM_BUS_SLAVE_EBI_CH0>;

		qcom,active-only;

		qcom,bw-tbl =

			<  381 /*  100 MHz */ >,

			<  762 /*  200 MHz */ >,

			< 1144 /*  300 MHz */ >,

			< 1720 /*  451 MHz */ >,

			< 2086 /*  547 MHz */ >,

			< 2597 /*  681 MHz */ >,

			< 2929 /*  768 MHz */ >,

			< 3879 /* 1017 MHz */ >,

			< 5161 /* 1353 MHz */ >,

			< 5931 /* 1555 MHz */ >,

			< 6881 /* 1804 MHz */ >;

			< MHZ_TO_MBPS( 100, 4) >, /* 381 MB/s */

			< MHZ_TO_MBPS( 200, 4) >, /* 762 MB/s */

			< MHZ_TO_MBPS( 300, 4) >, /* 1144 MB/s */

			< MHZ_TO_MBPS( 451, 4) >, /* 1720 MB/s */

			< MHZ_TO_MBPS( 547, 4) >, /* 2086 MB/s */

			< MHZ_TO_MBPS( 681, 4) >, /* 2597 MB/s */

			< MHZ_TO_MBPS( 768, 4) >, /* 2929 MB/s */

			< MHZ_TO_MBPS(1017, 4) >, /* 3879 MB/s */

			< MHZ_TO_MBPS(1353, 4) >, /* 5161 MB/s */

			< MHZ_TO_MBPS(1555, 4) >, /* 5931 MB/s */

			< MHZ_TO_MBPS(1804, 4) >; /* 6881 MB/s */

	};



	llcc_bwmon: qcom,llcc-bwmon {
@@ -2151,17 +2151,17 @@ 
		qcom,src-dst-ports = <1 512>;

		qcom,active-only;

		qcom,bw-tbl =

			<  381 /*  100 MHz */ >,

			<  762 /*  200 MHz */ >,

			< 1144 /*  300 MHz */ >,

			< 1720 /*  451 MHz */ >,

			< 2086 /*  547 MHz */ >,

			< 2597 /*  681 MHz */ >,

			< 2929 /*  768 MHz */ >,

			< 3879 /* 1017 MHz */ >,

			< 5161 /* 1353 MHz */ >,

			< 5931 /* 1555 MHz */ >,

			< 6881 /* 1804 MHz */ >;

			< MHZ_TO_MBPS( 100, 4) >, /* 381 MB/s */

			< MHZ_TO_MBPS( 200, 4) >, /* 762 MB/s */

			< MHZ_TO_MBPS( 300, 4) >, /* 1144 MB/s */

			< MHZ_TO_MBPS( 451, 4) >, /* 1720 MB/s */

			< MHZ_TO_MBPS( 547, 4) >, /* 2086 MB/s */

			< MHZ_TO_MBPS( 681, 4) >, /* 2597 MB/s */

			< MHZ_TO_MBPS( 768, 4) >, /* 2929 MB/s */

			< MHZ_TO_MBPS(1017, 4) >, /* 3879 MB/s */

			< MHZ_TO_MBPS(1353, 4) >, /* 5161 MB/s */

			< MHZ_TO_MBPS(1555, 4) >, /* 5931 MB/s */

			< MHZ_TO_MBPS(1804, 4) >; /* 6881 MB/s */

	};



	memlat_cpu4: qcom,memlat-cpu4 {
@@ -2171,17 +2171,17 @@ 
		qcom,active-only;

		status = "ok";

		qcom,bw-tbl =

			<  381 /*  100 MHz */ >,

			<  762 /*  200 MHz */ >,

			< 1144 /*  300 MHz */ >,

			< 1720 /*  451 MHz */ >,

			< 2086 /*  547 MHz */ >,

			< 2597 /*  681 MHz */ >,

			< 2929 /*  768 MHz */ >,

			< 3879 /* 1017 MHz */ >,

			< 5161 /* 1353 MHz */ >,

			< 5931 /* 1555 MHz */ >,

			< 6881 /* 1804 MHz */ >;

			< MHZ_TO_MBPS( 100, 4) >, /* 381 MB/s */

			< MHZ_TO_MBPS( 200, 4) >, /* 762 MB/s */

			< MHZ_TO_MBPS( 300, 4) >, /* 1144 MB/s */

			< MHZ_TO_MBPS( 451, 4) >, /* 1720 MB/s */

			< MHZ_TO_MBPS( 547, 4) >, /* 2086 MB/s */

			< MHZ_TO_MBPS( 681, 4) >, /* 2597 MB/s */

			< MHZ_TO_MBPS( 768, 4) >, /* 2929 MB/s */

			< MHZ_TO_MBPS(1017, 4) >, /* 3879 MB/s */

			< MHZ_TO_MBPS(1353, 4) >, /* 5161 MB/s */

			< MHZ_TO_MBPS(1555, 4) >, /* 5931 MB/s */

			< MHZ_TO_MBPS(1804, 4) >; /* 6881 MB/s */

	};



	devfreq_memlat_0: qcom,cpu0-memlat-mon {
@@ -2190,11 +2190,11 @@ 
		qcom,target-dev = <&memlat_cpu0>;

		qcom,cachemiss-ev = <0x24>;

		qcom,core-dev-table =

			<  748800 1144 >,

			<  998400 1720 >,

			< 1209600 2086 >,

			< 1497600 2929 >,

			< 1728000 3879 >;

			<  748800 MHZ_TO_MBPS( 300, 4) >,

			<  998400 MHZ_TO_MBPS( 451, 4) >,

			< 1209600 MHZ_TO_MBPS( 547, 4) >,

			< 1497600 MHZ_TO_MBPS( 768, 4) >,

			< 1728000 MHZ_TO_MBPS(1017, 4) >;

	};



	devfreq_memlat_4: qcom,cpu4-memlat-mon {
@@ -2203,11 +2203,11 @@ 
		qcom,target-dev = <&memlat_cpu4>;

		qcom,cachemiss-ev = <0x24>;

		qcom,core-dev-table =

			<  787200 1144 >,

			< 1113600 2086 >,

			< 1344000 3879 >,

			< 1900800 5931 >,

			< 2438400 6881 >;

			<  787200 MHZ_TO_MBPS( 300, 4) >,

			< 1113600 MHZ_TO_MBPS( 547, 4) >,

			< 1344000 MHZ_TO_MBPS(1017, 4) >,

			< 1900800 MHZ_TO_MBPS(1555, 4) >,

			< 2438400 MHZ_TO_MBPS(1804, 4) >;

	};



	l3_cpu0: qcom,l3-cpu0 {
@@ -2257,33 +2257,33 @@ 
		qcom,src-dst-ports = <1 512>;

		qcom,active-only;

		qcom,bw-tbl =

			<  381 /*  100 MHz */ >,

			<  762 /*  200 MHz */ >,

			< 1144 /*  300 MHz */ >,

			< 1720 /*  451 MHz */ >,

			< 2086 /*  547 MHz */ >,

			< 2597 /*  681 MHz */ >,

			< 2929 /*  768 MHz */ >,

			< 3879 /* 1017 MHz */ >,

			< 5161 /* 1353 MHz */ >,

			< 5931 /* 1555 MHz */ >,

			< 6881 /* 1804 MHz */ >;

			< MHZ_TO_MBPS( 100, 4) >, /* 381 MB/s */

			< MHZ_TO_MBPS( 200, 4) >, /* 762 MB/s */

			< MHZ_TO_MBPS( 300, 4) >, /* 1144 MB/s */

			< MHZ_TO_MBPS( 451, 4) >, /* 1720 MB/s */

			< MHZ_TO_MBPS( 547, 4) >, /* 2086 MB/s */

			< MHZ_TO_MBPS( 681, 4) >, /* 2597 MB/s */

			< MHZ_TO_MBPS( 768, 4) >, /* 2929 MB/s */

			< MHZ_TO_MBPS(1017, 4) >, /* 3879 MB/s */

			< MHZ_TO_MBPS(1353, 4) >, /* 5161 MB/s */

			< MHZ_TO_MBPS(1555, 4) >, /* 5931 MB/s */

			< MHZ_TO_MBPS(1804, 4) >; /* 6881 MB/s */

	};



	devfreq-cpufreq {

		mincpubw-cpufreq {

			target-dev = <&mincpubw>;

			cpu-to-dev-map-0 =

				<  748800 1144 >,

				< 1209600 1720 >,

				< 1612000 2086 >,

				< 1728000 2929 >;

				<  748800 MHZ_TO_MBPS( 300, 4) >,

				< 1209600 MHZ_TO_MBPS( 451, 4) >,

				< 1612000 MHZ_TO_MBPS( 547, 4) >,

				< 1728000 MHZ_TO_MBPS( 768, 4) >;

			cpu-to-dev-map-4 =

				< 1113600 1144 >,

				< 1344000 2086 >,

				< 1728000 2929 >,

				< 1900800 3879 >,

				< 2438400 6881 >;

				< 1113600 MHZ_TO_MBPS( 300, 4) >,

				< 1344000 MHZ_TO_MBPS( 547, 4) >,

				< 1728000 MHZ_TO_MBPS( 768, 4) >,

				< 1900800 MHZ_TO_MBPS(1017, 4) >,

				< 2438400 MHZ_TO_MBPS(1804, 4) >;

		};

	};